1 files changed, 29 insertions, 24 deletions

diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 1e89d1826ddd..abe79215ddec 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_automation.hxx"
 #include <tools/stream.hxx>
+#include <basic/ttstrhlp.hxx>
 
 #include "retstrm.hxx"
 #include "rcontrol.hxx"
@@ -48,41 +49,50 @@ RetStream::~RetStream()
     delete pSammel;
 }
 
-void RetStream::GenError ( SmartId aUId, String aString )
+void RetStream::GenError ( rtl::OString aUId, String aString )
 {
     CmdBaseStream::GenError ( &aUId, &aString );
 }
 
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
 }
 
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
-{
-    Write(USHORT(SIReturn));
-    Write(nRet);
-    Write(&aUId);
-    Write(USHORT(PARAM_SBXVALUE_1));        // Typ der folgenden Parameter
-    Write(aValue);
-}
-
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
 }
 
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString )
+// MacroRecorder
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString );
 }
 
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool )
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool );
 }
 
 
+void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue )
+{
+    Write(sal_uInt16(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(sal_uInt16(PARAM_SBXVALUE_1));        // Typ der folgenden Parameter
+    Write(aValue);
+}
+
+void RetStream::GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString )
+{
+    CmdBaseStream::GenReturn ( nRet, nMethod, &aString );
+}
+
+
+
+
 void RetStream::Write( String *pString )
 {
     CmdBaseStream::Write( pString->GetBuffer(), pString->Len() );
@@ -90,20 +100,15 @@ void RetStream::Write( String *pString )
 
 void RetStream::Write( SbxValue &aValue )
 {
-    *pSammel << USHORT( BinSbxValue );
+    *pSammel << sal_uInt16( BinSbxValue );
     aValue.Store( *pSammel );
 }
 
-void RetStream::Write( SmartId* pId )
+void RetStream::Write( rtl::OString* pId )
 {
-    DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
-    if ( pId->HasString() )
-    {
-        String aTmp( pId->GetStr() );
-        Write( &aTmp );
-    }
-    else
-        Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit
+    //HELPID BACKWARD (should use ByteString or OString)
+    String aTmp( Id2Str( *pId ) );
+    Write( &aTmp );
 }