1 files changed, 17 insertions, 14 deletions
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 888d1717422c..a7033714ba6d 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -28,7 +28,6 @@
 #define _RETSTRM_HXX
 
 #include <basic/sbxvar.hxx>
-#include <vcl/smartid.hxx>
 #include "cmdbasestream.hxx"
 
 class SvStream;
@@ -41,26 +40,30 @@ public:
     ~RetStream();
 
     using CmdBaseStream::GenError;
-//    void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );}
 //  new
-    void GenError( SmartId aUId, String aString );
+    void GenError( rtl::OString aUId, String aString );
 
     using CmdBaseStream::GenReturn;
     void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
 
 //  new
-    void GenReturn( USHORT nRet, SmartId aUId, String aString );
-    void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
-    void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
+    void GenReturn( USHORT nRet, rtl::OString aUId, String aString );
+    void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool );
+
+// needed for RemoteCommand and Profiling
+    void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue );
+    void GenReturn( USHORT nRet, USHORT nMethod, String aString );
+
 // MacroRecorder
-    void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString );
-    void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool );
+    void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
+    void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool );
 
     void Reset();
     SvStream* GetStream();
@@ -75,7 +78,7 @@ public:
     void Write( SbxValue &aValue );
 
 // Complex Datatypes to be handled system dependent
-    virtual void Write( SmartId* pId );
+    virtual void Write( rtl::OString* pId );
     virtual void Write( String *pString );
 
     SvStream *pSammel;