mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS changehid: several fixes to work with old testtool

Browse Source
This commit is contained in:
Mathias Bauer
2010-09-24 19:54:00 +02:00
parent c8d3b5c7cf
commit fe8bc0c2c2
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
automation/source/server/cmdbasestream.cxx
View File

@@ -68,6 +68,9 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG
{
Write(comm_USHORT(SIReturn));
Write(nRet);
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,6 +80,9 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String
{
Write(comm_USHORT(SIReturn));
Write(nRet);
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,6 +92,9 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL b
{
Write(comm_USHORT(SIReturn));
Write(nRet);
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,6 +104,9 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG
{
Write(comm_USHORT(SIReturn));
Write(nRet);
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);
@@ -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);
}

7
automation/source/server/retstrm.hxx
View File

@@ -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

2
automation/source/server/sta_list.cxx
View File

@@ -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 );
}