X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_DumpPython.cc;h=1006b30b509f11efac76816658b5ee294ec38091;hb=5d340bb0d6761b4a61913395814a5f18845c96a9;hp=eb79a3ff9ceb6f2df80b70bb33ea5686bf787a43;hpb=bd2042b4d19d69deaf182edda40bbff83e53490a;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc
index eb79a3ff9..1006b30b5 100644
--- a/src/GEOM_I/GEOM_DumpPython.cc
+++ b/src/GEOM_I/GEOM_DumpPython.cc
@@ -83,12 +83,11 @@ void ConvertV6toV7( TCollection_AsciiString& theScript )
 //purpose  : 
 //=======================================================================
 
-Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy, 
-					 CORBA::Boolean isPublished, 
-					 CORBA::Boolean isMultiFile,
+Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Boolean isPublished,
+                                         CORBA::Boolean isMultiFile,
                                          CORBA::Boolean& isValidScript)
 {
-  SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow(theStudy);
+  SALOMEDS::Study_var aStudy = getStudyServant();
   if(CORBA::is_nil(aStudy))
     return new Engines::TMPFile(0);   
 
@@ -134,10 +133,10 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
 	  anAttrStr = SALOMEDS::AttributeString::_narrow(anAttr);
 	  SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(anAttrStr->Value());
 	  ObjectStates* aStates = new ObjectStates();
-	  for(int i = 0; i < aSections->length(); i++) {
+	  for( CORBA::ULong i = 0; i < aSections->length(); i++) {
 	    TState aState;
 	    SALOMEDS::ListOfStrings aListOfVars = aSections[i];
-	    for(int j = 0; j < aListOfVars.length(); j++) {
+	    for( CORBA::ULong j = 0; j < aListOfVars.length(); j++) {
 	      bool isVar = aStudy->IsVariable(aListOfVars[j].in());
 	      TVariable aVar = TVariable( (char*)aListOfVars[j].in(), isVar );
 	      aState.push_back(aVar);
@@ -151,7 +150,7 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
   }
   
   TCollection_AsciiString aScript;
-  aScript += _impl->DumpPython(aStudy->StudyId(), objectDataVec, aVariableMap, isPublished, isMultiFile, isValidScript);
+  aScript += _impl->DumpPython(objectDataVec, aVariableMap, isPublished, isMultiFile, isValidScript);
 
   if (isPublished)
   {
@@ -282,7 +281,7 @@ char* GEOM_Gen_i::GetDumpName (const char* theStudyEntry)
 {
   const char* name = _impl->GetDumpName( theStudyEntry );
   if ( name && strlen( name ) > 0 )
-    return strdup( name );
+    return CORBA::string_dup( name );
 
   return NULL;
 }