Merge multi-study removal branch.

[plugins/hybridplugin.git] / src / HYBRIDPlugin / HYBRIDPlugin_HYBRID_i.cxx

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
index 0c671975f6ea1e8c29a4d36d186ae200d4da923e..3a745e1ae46ae767532e32f7db57454aacc980db 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
@@ -41,16 +41,14 @@
 //=============================================================================
 
 HYBRIDPlugin_HYBRID_i::HYBRIDPlugin_HYBRID_i (PortableServer::POA_ptr thePOA,
-                                          int                     theStudyId,
-                                          ::SMESH_Gen*            theGenImpl )
+                                              ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
        SMESH_Algo_i( thePOA ),
        SMESH_3D_Algo_i( thePOA )
 {
   myBaseImpl = new ::HYBRIDPlugin_HYBRID (theGenImpl->GetANewId(),
-                                        theStudyId,
-                                        theGenImpl );
+                                          theGenImpl );
 }
 
 //=============================================================================
@@ -90,8 +88,8 @@ SMESH::SMESH_Mesh_ptr HYBRIDPlugin_HYBRID_i::importGMFMesh(const char* theGMFFil
 {
   SMESH_Gen_i* smeshGen = SMESH_Gen_i::GetSMESHGen();
   SMESH::SMESH_Mesh_ptr theMesh = smeshGen->CreateEmptyMesh();
-  smeshGen->RemoveLastFromPythonScript(smeshGen->GetCurrentStudy()->StudyId());
-  SALOMEDS::SObject_ptr theSMesh = smeshGen->ObjectToSObject(smeshGen->GetCurrentStudy(), theMesh);
+  smeshGen->RemoveLastFromPythonScript();
+  SALOMEDS::SObject_ptr theSMesh = smeshGen->ObjectToSObject(theMesh);
 #ifdef WINNT
 #define SEP '\\'
 #else