diff options
Diffstat (limited to 'automation/source/server/cmdbasestream.cxx')
-rw-r--r-- | automation/source/server/cmdbasestream.cxx | 85 |
1 files changed, 67 insertions, 18 deletions
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 2e15e18794f2..dcb01a44ce5a 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -51,7 +51,7 @@ CmdBaseStream::~CmdBaseStream() { } -void CmdBaseStream::GenError (SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString ) { Write(comm_USHORT(SIReturnError)); Write(pUId); @@ -66,46 +66,95 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId ) Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr ) { 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); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString ) { 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); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool ) { 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); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) { 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); Write(bBool); } +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) + Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(nNr); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) + Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(pString); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) + Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(bBool); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) + Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(nNr); +} + + // MacroRecorder -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -114,7 +163,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(nMethod); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -124,7 +173,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(pString); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -135,7 +184,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -145,7 +194,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -284,10 +333,10 @@ void CmdBaseStream::Read ( comm_String* &pString ) (void) pString; /* avoid warning about unused parameter */ OSL_FAIL("Read ( comm_String* &pString ) Not Implemented"); } -void CmdBaseStream::Read ( SmartId* &pId ) +void CmdBaseStream::Read ( rtl::OString* &pId ) { (void) pId; /* avoid warning about unused parameter */ - OSL_FAIL("Read ( SmartId* &pId ) Not Implemented"); + OSL_FAIL("Read ( rtl::OString* &pId ) Not Implemented"); } void CmdBaseStream::Write( comm_String *pString ) @@ -295,10 +344,10 @@ void CmdBaseStream::Write( comm_String *pString ) (void) pString; /* avoid warning about unused parameter */ OSL_FAIL("Write( comm_String *pString ) Not Implemented"); } -void CmdBaseStream::Write( SmartId* pId ) +void CmdBaseStream::Write( rtl::OString* pId ) { (void) pId; /* avoid warning about unused parameter */ - OSL_FAIL("Write( SmartId* pId ) Not Implemented"); + OSL_FAIL("Write( rtl::OString* pId ) Not Implemented"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |