To fix unresolved symbols in SalomeApp library

diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
index 026d6a05c93b85ff562f747b548b8a23f72b025f..32eac1375bf48f14b4a19f933e8f39610f18cb5e 100755 (executable)
--- 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 1470e362a8db20b603e6b9376a4538d8da04e480..59edcdc64c118f3c50179bab058531ea0734c28c 100644 (file)
--- 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()