From: ouv <ouv@opencascade.com>
Date: Tue, 22 Dec 2009 10:39:30 +0000 (+0000)
Subject: To fix unresolved symbols in SalomeApp library
X-Git-Tag: PHASE_17_Part1_V4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ffba62fc87b1b9829e5512c4fc2ee435386e1fde;p=modules%2Fgui.git

To fix unresolved symbols in SalomeApp library
---

diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
index 026d6a05c..32eac1375 100755
--- a/src/SalomeApp/Makefile.am
+++ b/src/SalomeApp/Makefile.am
@@ -114,7 +114,7 @@ libSalomeApp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES)	\
 	-I$(srcdir)/../Event -I$(srcdir)/../CASCatch				\
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 libSalomeApp_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) 
-libSalomeApp_la_LIBADD  = $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient		\
+libSalomeApp_la_LIBADD  = $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient -lSalomeDS \
 	../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la ../ObjBrowser/libObjBrowser.la	\
 	../Prs/libSalomePrs.la ../SPlot2d/libSPlot2d.la ../GLViewer/libGLViewer.la		\
 	../OCCViewer/libOCCViewer.la ../VTKViewer/libVTKViewer.la ../OBJECT/libSalomeObject.la	\
diff --git a/src/SalomeApp/SalomeApp_Notebook.cxx b/src/SalomeApp/SalomeApp_Notebook.cxx
index 1470e362a..59edcdc64 100644
--- a/src/SalomeApp/SalomeApp_Notebook.cxx
+++ b/src/SalomeApp/SalomeApp_Notebook.cxx
@@ -36,9 +36,11 @@
 
 SalomeApp_Notebook::SalomeApp_Notebook( SalomeApp_Study* theStudy )
 {
-  SALOMEDS_Study* aStudy = dynamic_cast<SALOMEDS_Study*>( theStudy->studyDS().operator->() );
-  if( aStudy )
-    myNotebook = aStudy->GetStudy()->GetNotebook();
+  SALOMEDS_Study* aStudy = _CAST(Study, theStudy->studyDS());
+  if( aStudy ) {
+    SALOMEDS::Study_var studyDS = aStudy->GetStudy();
+    myNotebook = studyDS->GetNotebook();
+  }
 }
 
 SalomeApp_Notebook::~SalomeApp_Notebook()