1 files changed, 17 insertions, 12 deletions
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index 0170b08aefe0..ce3ee45e095f 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -49,20 +49,25 @@ protected:
 
 public:
 
-    void GenError( SmartId *pUId, comm_String *pString );
+    void GenError( rtl::OString *pUId, comm_String *pString );
 
     void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_String *pString );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+
+    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr );
+    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString );
+    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool );
+    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr );
 
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool );
+    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr );
 
     void Read ( comm_USHORT &nNr );
     void Read ( comm_ULONG &nNr );
@@ -77,10 +82,10 @@ public:
 
 // Complex Datatypes to be handled system dependent
     virtual void Read ( comm_String *&pString );
-    virtual void Read ( SmartId* &pId );
+    virtual void Read ( rtl::OString* &pId );
 
     virtual void Write( comm_String *pString );
-    virtual void Write( SmartId* pId );
+    virtual void Write( rtl::OString* pId );
 };
 
 #endif