diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index 471c4c41faec..34857bf8038d 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmdbasestream.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-18 16:03:46 $
+ *  last change: $Author: obo $ $Date: 2004-07-06 12:03:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,35 +78,28 @@ class CmdBaseStream
 protected:
     ICommStream* pCommStream;
     CmdBaseStream();
-    ~CmdBaseStream();
+    virtual ~CmdBaseStream();
 
 public:
 
-    void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars );
+    void GenError( SmartId *pUId, comm_String *pString );
 
     void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_ULONG nNr );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, const comm_UniChar* aString, comm_USHORT nLenInChars );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_ULONG nNr, const comm_UniChar* aString, comm_USHORT nLenInChars, comm_BOOL bBool );
+    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 );
 
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_USHORT nMethod );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_USHORT nMethod, const comm_UniChar* aString, comm_USHORT nLenInChars );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_USHORT nMethod, const comm_UniChar* aString, comm_USHORT nLenInChars, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_USHORT nMethod, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, comm_ULONG nUId, comm_USHORT nMethod, comm_ULONG nNr );
-
-// StringID
-    void GenReturn( comm_USHORT nRet, const comm_UniChar* aUId, comm_USHORT nUIdLenInChars );
-    void GenReturn( comm_USHORT nRet, const comm_UniChar* aUId, comm_USHORT nUIdLenInChars, comm_ULONG nNr );
-    void GenReturn( comm_USHORT nRet, const comm_UniChar* aUId, comm_USHORT nUIdLenInChars, const comm_UniChar* aString, comm_USHORT nLenInChars );
-    void GenReturn( comm_USHORT nRet, const comm_UniChar* aUId, comm_USHORT nUIdLenInChars, comm_ULONG nNr, const comm_UniChar* aString, comm_USHORT nLenInChars, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, const comm_UniChar* aUId, comm_USHORT nUIdLenInChars, comm_BOOL bBool );
+    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 Read ( comm_USHORT &nNr );
     void Read ( comm_ULONG &nNr );
-    void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars );
+    void Read (comm_UniChar* &aString, comm_USHORT &nLenInChars );
     void Read ( comm_BOOL &bBool );
     comm_USHORT GetNextType();
 
@@ -114,6 +107,13 @@ public:
     void Write( comm_ULONG nNr );
     void Write( const comm_UniChar* aString, comm_USHORT nLenInChars );
     void Write( comm_BOOL bBool );
+
+// Complex Datatypes to be handled system dependent
+    virtual void Read ( comm_String *&pString );
+    virtual void Read ( SmartId* &pId );
+
+    virtual void Write( comm_String *pString );
+    virtual void Write( SmartId* pId );
 };
 
 #endif