From 44a3b9afbf23b644351ac8961ebe6a529cefba7f Mon Sep 17 00:00:00 2001 From: srn Date: Mon, 28 Mar 2005 05:58:51 +0000 Subject: [PATCH] Added 2 methods to StudyManger (ConvertObjectToString and ConvertStringToObject), changed a field of Driver from Driver_ptr to Driver_var --- src/SALOMEDS/SALOMEDS_Driver_i.hxx | 5 ++++- src/SALOMEDS/SALOMEDS_StudyManager_i.hxx | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.hxx b/src/SALOMEDS/SALOMEDS_Driver_i.hxx index 218c81a88..06af857ca 100644 --- 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 795ccb9e2..a3ded98f8 100644 --- 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(){}; }; -- 2.39.2