diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-09-24 19:54:00 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-09-24 19:54:00 +0200 |
commit | fe8bc0c2c2a2dec162d9da30bb0684f1d00b842c (patch) | |
tree | 2b349b23aa43fada7b318d2171fb853054f26f13 /automation | |
parent | CWS changehid: debug statements removed (diff) | |
download | core-fe8bc0c2c2a2dec162d9da30bb0684f1d00b842c.tar.gz core-fe8bc0c2c2a2dec162d9da30bb0684f1d00b842c.zip |
CWS changehid: several fixes to work with old testtool
Diffstat (limited to 'automation')
-rw-r--r-- | automation/source/server/cmdbasestream.cxx | 28 | ||||
-rw-r--r-- | automation/source/server/retstrm.hxx | 7 | ||||
-rw-r--r-- | automation/source/server/sta_list.cxx | 2 |
3 files changed, 22 insertions, 15 deletions
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 827ea93a4796..7f867c3a997c 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -68,7 +68,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } @@ -77,7 +80,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } @@ -86,7 +92,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL b { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } @@ -95,7 +104,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter Write(nNr); Write(pString); @@ -106,7 +118,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } @@ -115,7 +127,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_Strin { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } @@ -124,7 +136,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } @@ -133,7 +145,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHOR { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nNr); } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index 0771664e0158..a7033714ba6d 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -40,7 +40,6 @@ 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( rtl::OString aUId, String aString ); @@ -49,10 +48,6 @@ public: 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 );} -// needed for RemoteCommand and Profiling - void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nMethod, nNr );} - void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, nMethod, bBool );} - // MacroRecorder 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 );} @@ -62,8 +57,8 @@ public: 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 ); -// and Profiling void GenReturn( USHORT nRet, USHORT nMethod, String aString ); // MacroRecorder diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index c491e66885cc..f663665c20b6 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -1083,7 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, nType, aMessage ); + pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage ); } |