Added 2 methods to StudyManger (ConvertObjectToString and ConvertStringToObject),

changed a field of Driver from Driver_ptr to Driver_var

diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.hxx b/src/SALOMEDS/SALOMEDS_Driver_i.hxx
index 218c81a88da70c5ab7fa1f3d19d60a92a23df1fd..06af857ca98a7784c91dc3a3d8b7ec142f50c822 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Driver_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Driver_i.hxx
@@ -15,7 +15,7 @@ class SALOMEDS_Driver_i :  public virtual SALOMEDSImpl_Driver
 {
 protected:
   SALOMEDS::Driver_var _driver;
-  CORBA::ORB_ptr _orb;
+  CORBA::ORB_var _orb;
 
 public:
 
@@ -25,6 +25,9 @@ public:
       _orb = CORBA::ORB::_duplicate(theORB);        
     }
 
+  ~SALOMEDS_Driver_i() {
+  }
+
   virtual TCollection_AsciiString GetIOR() 
     {
       CORBA::String_var ior = _orb->object_to_string(_driver);

diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
index 795ccb9e25da57953d9ab87c7bf29c8caa4e6016..a3ded98f878cf78a4ed71c08dc336f23d14c01e0 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
@@ -118,6 +118,9 @@ public:
   virtual CORBA::Boolean Copy(SALOMEDS::SObject_ptr theObject);
   virtual CORBA::Boolean CanPaste(SALOMEDS::SObject_ptr theObject);
   virtual SALOMEDS::SObject_ptr Paste(SALOMEDS::SObject_ptr theObject) throw(SALOMEDS::StudyBuilder::LockProtection);
+
+  virtual char* ConvertObjectToIOR(CORBA::Object_ptr theObject) {return _orb->object_to_string(theObject); }
+  virtual CORBA::Object_ptr ConvertIORToObject(const char* theIOR) { return _orb->string_to_object(theIOR); };  
   
   void ping(){};
 };