[Libreoffice-commits] .: 5 commits - automation/inc automation/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed May 25 00:57:39 PDT 2011
automation/inc/automation/commdefines.hxx | 20 -
automation/inc/automation/commtypes.hxx | 11
automation/source/inc/cmdbasestream.hxx | 42 +--
automation/source/inc/icommstream.hxx | 14 -
automation/source/inc/rcontrol.hxx | 16 -
automation/source/inc/svcommstream.hxx | 14 -
automation/source/server/XMLParser.cxx | 16 -
automation/source/server/cmdbasestream.cxx | 150 ++++++------
automation/source/server/recorder.cxx | 26 +-
automation/source/server/retstrm.cxx | 8
automation/source/server/retstrm.hxx | 22 -
automation/source/server/scmdstrm.cxx | 24 +-
automation/source/server/scmdstrm.hxx | 4
automation/source/server/sta_list.cxx | 2
automation/source/server/statemnt.cxx | 324 +++++++++++++--------------
automation/source/server/statemnt.hxx | 12 -
automation/source/server/svcommstream.cxx | 14 -
automation/source/simplecm/communiio.hxx | 12 -
automation/source/simplecm/packethandler.cxx | 4
automation/source/simplecm/tcpio.cxx | 4
automation/source/simplecm/tcpio.hxx | 4
automation/source/testtool/cmdstrm.cxx | 46 +--
automation/source/testtool/cmdstrm.hxx | 12 -
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/objtest.cxx | 24 +-
25 files changed, 410 insertions(+), 419 deletions(-)
New commits:
commit 1bda336b1afbed573a084eb1b7624c02c0e4a3c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 24 10:39:32 2011 +0100
PARAM_USHORT_->PARAM_UINT16_ && PARAM_ULONG_->PARAM_UINT32_
diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index f24da73..bc756de 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -443,12 +443,12 @@
// Beschreibt die Parametertypen als Bitfeld Reihenfolge immer!
// wie hier Aufgelistet
#define PARAM_NONE 0x0000
-#define PARAM_USHORT_1 0x0001
-#define PARAM_USHORT_2 0x0002
-#define PARAM_USHORT_3 0x0100 // Nicht in der Reihe!!
-#define PARAM_USHORT_4 0x0200 // Nicht in der Reihe!!
-#define PARAM_ULONG_1 0x0004
-#define PARAM_ULONG_2 0x0008
+#define PARAM_UINT16_1 0x0001
+#define PARAM_UINT16_2 0x0002
+#define PARAM_UINT16_3 0x0100 // Nicht in der Reihe!!
+#define PARAM_UINT16_4 0x0200 // Nicht in der Reihe!!
+#define PARAM_UINT32_1 0x0004
+#define PARAM_UINT32_2 0x0008
#define PARAM_STR_1 0x0010
#define PARAM_STR_2 0x0020
#define PARAM_BOOL_1 0x0040
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index b69aef2..595eed4 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -524,7 +524,7 @@ void StatementCommand::HandleSAXParser()
break;
case RC_SAXGetAttributeName:
{
- if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+ if( (nParams & PARAM_UINT16_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
{
String aRet( xAttributeList->getNameByIndex( nNr1-1 ) );
pRet->GenReturn ( RET_Value, nMethodId, aRet );
@@ -536,7 +536,7 @@ void StatementCommand::HandleSAXParser()
case RC_SAXGetAttributeValue:
// Number or String
{
- if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+ if( (nParams & PARAM_UINT16_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
{
String aRet( xAttributeList->getValueByIndex( nNr1-1 ) );
pRet->GenReturn ( RET_Value, nMethodId, aRet );
@@ -578,7 +578,7 @@ void StatementCommand::HandleSAXParser()
{
sal_Bool bCheckOnly = nMethodId == RC_SAXHasElement;
- if( (nParams & PARAM_USHORT_1) && !(nParams & PARAM_STR_1) )
+ if( (nParams & PARAM_UINT16_1) && !(nParams & PARAM_STR_1) )
{
if ( nNr1 == 0 )
{
@@ -623,7 +623,7 @@ void StatementCommand::HandleSAXParser()
else if ( pElementNode )
{
sal_uInt16 nNthOccurrence;
- if( (nParams & PARAM_USHORT_1) )
+ if( (nParams & PARAM_UINT16_1) )
nNthOccurrence = nNr1;
else
nNthOccurrence = 1;
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index fdf9bee..b5a48e0 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -74,7 +74,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32
Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_UINT16(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -110,7 +110,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32
Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_UINT16(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT32_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nNr);
Write(pString);
Write(bBool);
@@ -121,7 +121,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT3
Write(comm_UINT16(SIReturn));
Write(nRet);
Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_UINT16(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -148,7 +148,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT1
Write(comm_UINT16(SIReturn));
Write(nRet);
Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_UINT16(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -159,7 +159,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1)); // Typ der folgenden Parameter
Write(nMethod);
}
@@ -168,7 +168,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_USHORT_1|PARAM_STR_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(pString);
}
@@ -178,7 +178,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(pString);
Write(bBool);
@@ -189,7 +189,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_USHORT_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(bBool);
}
@@ -199,7 +199,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_USHORT_1|PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(nNr);
}
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index a02ff4e..2c99aaa 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -161,8 +161,8 @@ StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemo
pCmdIn->Read( nArt );
pCmdIn->Read( nParams );
- if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nSNr1 );
- if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 );
+ if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nSNr1 );
+ if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1 );
if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );// Should NEVER happen
@@ -170,8 +170,8 @@ StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemo
m_pDbgWin->AddText( "Reading FlowControl: " );
m_pDbgWin->AddText( String::CreateFromInt32( nArt ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nSNr1 ) );}
- if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " l1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nSNr1 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " l1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
m_pDbgWin->AddText( "\n" );
@@ -687,11 +687,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
- if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
- if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
- if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
- if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+ if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+ if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+ if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
@@ -718,11 +718,11 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
pCmdIn->Read( nMethodId );
pCmdIn->Read( nParams );
- if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 );
- if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 );
- if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 );
- if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 );
- if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 );
+ if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nNr1 );
+ if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 );
+ if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 );
+ if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 );
+ if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1 );
if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 );
if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );
@@ -733,11 +733,11 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
- if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
- if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
- if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
- if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+ if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+ if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+ if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
@@ -1365,7 +1365,7 @@ sal_Bool StatementCommand::DisplayHID()
bBool2 = sal_True; // Wir sind initialisiert.
GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich)
- if ( !(nParams & PARAM_ULONG_1) )
+ if ( !(nParams & PARAM_UINT32_1) )
{
if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern
nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
@@ -2465,7 +2465,7 @@ sal_Bool StatementCommand::Execute()
break;
case RC_WaitSlot:
{
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1000; // defaults to 1000 = 1 Sec.
if ( !bBool1 )
{
@@ -2593,7 +2593,7 @@ sal_Bool StatementCommand::Execute()
InitProfile();
}
- if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_USHORT_1) )
+ if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_UINT16_1) )
{ // Autoprofiling: Profile nNr
if ( pProfiler->IsProfilingPerCommand() )
{
@@ -2604,13 +2604,13 @@ sal_Bool StatementCommand::Execute()
// Der Header ist abh�ngig vom Modus
pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
}
- else if ( nParams & PARAM_USHORT_1 )
+ else if ( nParams & PARAM_UINT16_1 )
{ // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
comm_UINT32 nAnzahl=0;
- if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; };
- if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; };
- if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
- if ( nParams & PARAM_USHORT_4 ) { nAnzahl++; };
+ if ( nParams & PARAM_UINT16_1 ) { nAnzahl++; };
+ if ( nParams & PARAM_UINT16_2 ) { nAnzahl++; };
+ if ( nParams & PARAM_UINT16_3 ) { nAnzahl++; };
+ if ( nParams & PARAM_UINT16_4 ) { nAnzahl++; };
// Hier werden die Parameter ans Testtool zur�ck �bertragen.
// Das ist zwar etwas eigenartig, aber ansonsten m�sste man im Testtool
@@ -2618,10 +2618,10 @@ sal_Bool StatementCommand::Execute()
pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl );
// Und die einzelnen Grenzen
- if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_UINT32)nNr1 ); };
- if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_UINT32)nNr2 ); };
- if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_UINT32)nNr3 ); };
- if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_UINT32)nNr4 ); };
+ if ( nParams & PARAM_UINT16_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_UINT32)nNr1 ); };
+ if ( nParams & PARAM_UINT16_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_UINT32)nNr2 ); };
+ if ( nParams & PARAM_UINT16_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_UINT32)nNr3 ); };
+ if ( nParams & PARAM_UINT16_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_UINT32)nNr4 ); };
pProfiler->StartPartitioning();
}
@@ -2940,7 +2940,7 @@ sal_Bool StatementCommand::Execute()
else
{
sal_uInt16 nFlags = 0;
- if ( (nParams & PARAM_USHORT_1) )
+ if ( (nParams & PARAM_UINT16_1) )
nDirFlags = nFlags = nNr1;
else
nDirFlags = nFlags = Sb_ATTR_HIDDEN | Sb_ATTR_SYSTEM | Sb_ATTR_DIRECTORY;
@@ -3109,10 +3109,10 @@ sal_Bool StatementCommand::Execute()
{
bDoTypeKeysDelay = bBool1;
}
- else if( nParams & PARAM_USHORT_1 )
+ else if( nParams & PARAM_UINT16_1 )
{
nMinTypeKeysDelay = nNr1;
- if( nParams & PARAM_USHORT_2 )
+ if( nParams & PARAM_UINT16_2 )
nMaxTypeKeysDelay = nNr2;
else
nMaxTypeKeysDelay = nMinTypeKeysDelay;
@@ -3171,7 +3171,7 @@ sal_Bool StatementCommand::Execute()
case RC_CloseSysDialog:
case RC_ExistsSysDialog:
{
- if( (nParams & PARAM_USHORT_1) )
+ if( (nParams & PARAM_UINT16_1) )
{
Reference < ::com::sun::star::util::XCancellable > xPicker;
switch( nNr1 )
@@ -3247,7 +3247,7 @@ sal_Bool StatementCommand::Execute()
break;
case RC_ActivateDocument :
{
- if( nParams & PARAM_USHORT_1 )
+ if( nParams & PARAM_UINT16_1 )
{
if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) )
{
@@ -3386,11 +3386,11 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
pCmdIn->Read( nMethodId );
pCmdIn->Read( nParams );
- if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 );
- if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 );
- if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 );
- if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 );
- if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 );
+ if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nNr1 );
+ if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 );
+ if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 );
+ if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 );
+ if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1 );
if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 );
if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );
@@ -3402,11 +3402,11 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
- if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
- if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
- if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
- if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+ if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+ if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+ if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
m_pDbgWin->AddText( "\n" );
@@ -3742,12 +3742,12 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
if ( pControl->GetType() == WINDOW_WORKWINDOW )
{
Point aStart = pControl->GetPosPixel();
- if ( !(nParams & PARAM_USHORT_4) )
+ if ( !(nParams & PARAM_UINT16_4) )
{
- nParams |= PARAM_USHORT_1;
- nParams |= PARAM_USHORT_2;
- nParams |= PARAM_USHORT_3;
- nParams |= PARAM_USHORT_4;
+ nParams |= PARAM_UINT16_1;
+ nParams |= PARAM_UINT16_2;
+ nParams |= PARAM_UINT16_3;
+ nParams |= PARAM_UINT16_4;
nNr1 = (sal_uInt16)-aStart.X();
nNr2 = (sal_uInt16)-aStart.Y();
nNr3 = (sal_uInt16)pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X();
@@ -3758,7 +3758,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
nNr3 = std::min((sal_uInt16)(pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X()),nNr3);
nNr4 = std::min((sal_uInt16)(pControl->GetSizePixel().Height() + 2*(sal_uInt16)aStart.Y()),nNr4);
}
- if( nParams & PARAM_USHORT_4 )
+ if( nParams & PARAM_UINT16_4 )
{ // Zuschneiden
Point aPt(-nNr1,-nNr2);
Size aSz(nNr3,nNr4);
@@ -3784,7 +3784,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
break;
case M_GetFixedText:
{
- if( ( nParams & PARAM_USHORT_1 ) == 0 )
+ if( ( nParams & PARAM_UINT16_1 ) == 0 )
nNr1 = 1;
FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True, nNr1-1 );
@@ -3828,7 +3828,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
break;
case M_TypeKeys:
{
- if( !(nParams & PARAM_USHORT_1) ) // Anzahl wiederholungen
+ if( !(nParams & PARAM_UINT16_1) ) // Anzahl wiederholungen
nNr1 = 1;
if( !(nParams & PARAM_BOOL_1) ) // Follow Focus
bBool1 = sal_False; // so bleibt das bisherige Verhalten
@@ -3954,7 +3954,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
#define CalcMouseButton\
sal_uInt16 nButton = MOUSE_LEFT;\
- if ( (nParams & PARAM_USHORT_3) )\
+ if ( (nParams & PARAM_UINT16_3) )\
{\
switch ( nNr3 )\
{\
@@ -4127,7 +4127,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
case M_IsPin:
{
WindowAlign aWindowAlign = WINDOWALIGN_LEFT;
- if ( (nParams & PARAM_USHORT_1) )
+ if ( (nParams & PARAM_UINT16_1) )
{
switch ( nNr1 )
{
@@ -4219,7 +4219,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
{
case M_StatusGetText:
{
- if ( (nParams & PARAM_USHORT_1) )
+ if ( (nParams & PARAM_UINT16_1) )
{
if ( pStatus->AreItemsVisible() )
pRet->GenReturn ( RET_Value, aUId, String(pStatus->GetItemText(nNr1)));
@@ -4265,13 +4265,13 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
case M_HasScrollBar:
case M_IsScrollBarEnabled:
{
- if ( (nParams | PARAM_USHORT_1) != PARAM_USHORT_1 ) // so there are other params
+ if ( (nParams | PARAM_UINT16_1) != PARAM_UINT16_1 ) // so there are other params
{
ReportError( aUId, GEN_RES_STR0( S_INVALID_PARAMETERS ) );
break;
}
- if( !(nParams & PARAM_USHORT_1) )
+ if( !(nParams & PARAM_UINT16_1) )
nNr1 = CONST_ALIGN_RIGHT; // default is right Scrollbar(vertical)
if ( (nNr1 != CONST_ALIGN_RIGHT) && (nNr1 != CONST_ALIGN_BOTTOM) )
@@ -4354,7 +4354,7 @@ sal_Bool StatementControl::Execute()
else
{
sal_Bool bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId));
- bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId);
+ bSearchButtonOnToolbox |= (nParams == PARAM_UINT16_1) && (M_GetState == nMethodId);
if ( nMethodId == M_TypeKeys || nMethodId == M_MouseDown
|| nMethodId == M_MouseUp || nMethodId == M_MouseMove
|| nMethodId == M_SnapShot )
@@ -4399,7 +4399,7 @@ sal_Bool StatementControl::Execute()
{
bBool2 = sal_True;
nNr2 = aSeconds;
- if( !(nParams & PARAM_USHORT_1) )
+ if( !(nParams & PARAM_UINT16_1) )
nNr1 = 0; // defaultm��ig sofort zur�ck
}
if ( aSeconds < nNr2 ) // Falls die Stunde umgesprungen ist
@@ -4531,7 +4531,7 @@ sal_Bool StatementControl::Execute()
switch( nMethodId )
{
case M_GetPageId:
- if ( (nParams & PARAM_USHORT_1) )
+ if ( (nParams & PARAM_UINT16_1) )
{
if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((TabControl*)pControl)->GetPageCount() ) )
pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageId(nNr1-1));
@@ -4567,8 +4567,8 @@ sal_Bool StatementControl::Execute()
sal_uInt16 i,anz;
rtl::OString aID;
rtl::OString aWantedID;
- //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part)
- if ( (nParams & PARAM_ULONG_1) )
+ //HELPID BACKWARD (No numbers please (remove PARAM_UINT32_1 part)
+ if ( (nParams & PARAM_UINT32_1) )
{
ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
}
@@ -4726,7 +4726,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryCount()));
break;
case M_GetSelIndex :
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
{
if ( ((ListBox*)pControl)->GetSelectEntryCount() == 0 )
{
@@ -4739,7 +4739,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
break;
case M_GetSelText :
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1;
pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetSelectEntry(nNr1-1));
break;
@@ -4847,7 +4847,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, (comm_BOOL) !((ComboBox*)pControl)->IsReadOnly() );
break;
case M_Select :
- if( nParams & PARAM_USHORT_1 )
+ if( nParams & PARAM_UINT16_1 )
{
if ( !ValueOK(aUId, MethodString( nMethodId ),nNr1,((ComboBox*)pControl)->GetEntryCount()) )
break;
@@ -4954,7 +4954,7 @@ sal_Bool StatementControl::Execute()
break;
case M_More :
{
- if ( !(nParams & PARAM_USHORT_1) )
+ if ( !(nParams & PARAM_UINT16_1) )
nNr1 = 1;
for (int i = 1; i<= nNr1; i++)
{
@@ -4966,7 +4966,7 @@ sal_Bool StatementControl::Execute()
break;
case M_Less :
{
- if ( !(nParams & PARAM_USHORT_1) )
+ if ( !(nParams & PARAM_UINT16_1) )
nNr1 = 1;
for (int i = 1; i<= nNr1; i++)
{
@@ -5038,7 +5038,7 @@ sal_Bool StatementControl::Execute()
ToolBox *pTB = ((ToolBox*)pControl);
if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So we found a Button on the ToolBox
{
- if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) )
+ if ( (nParams == PARAM_NONE) || (nParams == PARAM_UINT16_1) )
{ // Wir f�lschen einen Parameter
nParams |= PARAM_STR_1;
aString1 = Id2Str( aUId );
@@ -5122,7 +5122,7 @@ sal_Bool StatementControl::Execute()
aSubMenuId3 = 0;
pMenuWindow = NULL;
- new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
+ new StatementCommand( this, RC_MenuSelect, PARAM_UINT16_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
}
else
{
@@ -5283,7 +5283,7 @@ sal_Bool StatementControl::Execute()
{ // should get removed some time
SvTreeListBox *pTree = (SvTreeListBox*)pControl;
SvLBoxEntry *pThisEntry = pTree->GetCurEntry();
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1;
if ( pThisEntry )
{
@@ -5317,7 +5317,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetVisibleCount()) );
break;
case M_GetSelIndex :
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1;
if ( ValueOK(aUId, CUniString("GetSelIndex"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
{
@@ -5343,9 +5343,9 @@ sal_Bool StatementControl::Execute()
}
break;
case M_GetSelText :
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1;
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
nNr2 = 1;
if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
{
@@ -5354,7 +5354,7 @@ sal_Bool StatementControl::Execute()
if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
{
SvLBoxString* pItem = NULL;
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
pItem = (SvLBoxString*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING );
else
{
@@ -5374,12 +5374,12 @@ sal_Bool StatementControl::Execute()
if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((SvLBox*)pControl)->GetVisibleCount()) )
{
SvLBoxEntry *pThisEntry = (SvLBoxEntry*)((SvTreeListBox*)pControl)->GetEntryAtVisPos( nNr1-1 );
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
nNr2 = 1;
if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
{
SvLBoxString* pItem = NULL;
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
pItem = (SvLBoxString*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING );
else
{
@@ -5405,7 +5405,7 @@ sal_Bool StatementControl::Execute()
SvTreeListBox *pTree = (SvTreeListBox*)pControl;
SvLBoxEntry *pThisEntry = NULL;
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
{
pThisEntry = pTree->GetCurEntry();
if ( !pThisEntry )
@@ -5419,7 +5419,7 @@ sal_Bool StatementControl::Execute()
}
}
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
nNr2 = 1;
if ( pThisEntry )
@@ -5427,7 +5427,7 @@ sal_Bool StatementControl::Execute()
if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
{
SvLBoxButton* pItem = NULL;
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
pItem = (SvLBoxButton*)pThisEntry->GetFirstItem( SV_ITEM_ID_LBOXBUTTON );
else
{
@@ -5489,7 +5489,7 @@ sal_Bool StatementControl::Execute()
SvTreeListBox *pTree = (SvTreeListBox*)pControl;
SvLBoxEntry *pThisEntry = NULL;
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
{
pThisEntry = pTree->GetCurEntry();
if ( !pThisEntry )
@@ -5505,7 +5505,7 @@ sal_Bool StatementControl::Execute()
if ( pThisEntry )
{
- if ( ! (nParams & PARAM_USHORT_2) )
+ if ( ! (nParams & PARAM_UINT16_2) )
nNr2 = 1;
if ( ValueOK( aUId, MethodString( nMethodId ),nNr2,pThisEntry->ItemCount() ) )
{
@@ -5718,7 +5718,7 @@ sal_Bool StatementControl::Execute()
}
break;
case M_Select:
- if ( (nParams & PARAM_USHORT_1) )
+ if ( (nParams & PARAM_UINT16_1) )
{
if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pELB->getItemCount() ))
{
@@ -5879,7 +5879,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, comm_UINT16( pTC->GetSelectedRowCount() ));
break;
case M_GetSelIndex :
- if ( ! (nParams & PARAM_USHORT_1) )
+ if ( ! (nParams & PARAM_UINT16_1) )
nNr1 = 1;
if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRowCount() ) )
pRet->GenReturn ( RET_Value, aUId, comm_UINT16( pTC->GetSelectedRowIndex( nNr1-1 ) +1 ) );
@@ -6267,7 +6267,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, pControl->GetText());
break;
case M_Click:
- if ( nParams & PARAM_USHORT_1 )
+ if ( nParams & PARAM_UINT16_1 )
{
if ( pBD->GetPushButton( nNr1 ) )
{
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 57192af..00cb14b 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -193,24 +193,24 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
case SbxINT:
case SbxUINT:
case SbxSINGLE:
- if ( (nParams & PARAM_USHORT_1) == 0 )
+ if ( (nParams & PARAM_UINT16_1) == 0 )
{
- nParams |= PARAM_USHORT_1;
+ nParams |= PARAM_UINT16_1;
nNr1 = rPar->Get( i )->GetUShort();
}
- else if ( (nParams & PARAM_USHORT_2) == 0 )
+ else if ( (nParams & PARAM_UINT16_2) == 0 )
{
- nParams |= PARAM_USHORT_2;
+ nParams |= PARAM_UINT16_2;
nNr2 = rPar->Get( i )->GetUShort();
}
- else if ( (nParams & PARAM_USHORT_3) == 0 )
+ else if ( (nParams & PARAM_UINT16_3) == 0 )
{
- nParams |= PARAM_USHORT_3;
+ nParams |= PARAM_UINT16_3;
nNr3 = rPar->Get( i )->GetUShort();
}
- else if ( (nParams & PARAM_USHORT_4) == 0 )
+ else if ( (nParams & PARAM_UINT16_4) == 0 )
{
- nParams |= PARAM_USHORT_4;
+ nParams |= PARAM_UINT16_4;
nNr4 = rPar->Get( i )->GetUShort();
}
else
@@ -242,11 +242,11 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
}
else if ( pMember->GetType() == SbxULONG )
{
- if ( nParams & PARAM_ULONG_1 )
+ if ( nParams & PARAM_UINT32_1 )
SbxBase::SetError( SbxERR_WRONG_ARGS );
else
{
- nParams |= PARAM_ULONG_1;
+ nParams |= PARAM_UINT32_1;
nLNr1 = pMember->GetULong();
}
}
@@ -297,11 +297,11 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
}
}
Write (nParams);
- if( nParams & PARAM_USHORT_1 ) Write( nNr1 );
- if( nParams & PARAM_USHORT_2 ) Write( nNr2 );
- if( nParams & PARAM_USHORT_3 ) Write( nNr3 );
- if( nParams & PARAM_USHORT_4 ) Write( nNr4 );
- if( nParams & PARAM_ULONG_1 ) Write( nLNr1 );
+ if( nParams & PARAM_UINT16_1 ) Write( nNr1 );
+ if( nParams & PARAM_UINT16_2 ) Write( nNr2 );
+ if( nParams & PARAM_UINT16_3 ) Write( nNr3 );
+ if( nParams & PARAM_UINT16_4 ) Write( nNr4 );
+ if( nParams & PARAM_UINT32_1 ) Write( nLNr1 );
if( nParams & PARAM_STR_1 ) Write( aString1, IsKeyString );
if( nParams & PARAM_STR_2 ) Write( aString2, IsKeyString );
if( nParams & PARAM_BOOL_1 ) Write( bBool1 );
@@ -426,7 +426,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 )
{
Write(sal_uInt16(SIFlow));
Write(nArt);
- Write(sal_uInt16(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(sal_uInt16(PARAM_UINT16_1)); // Typ der folgenden Parameter
Write(nNr1);
}
@@ -434,7 +434,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 )
{
Write(sal_uInt16(SIFlow));
Write(nArt);
- Write(sal_uInt16(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(sal_uInt16(PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nNr1);
}
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index eaffdae..90a484d 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -3183,9 +3183,9 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
sal_Bool bBool1 = sal_False;
SbxValueRef xValue1 = new SbxValue;
- if( nParams & PARAM_USHORT_1 )
+ if( nParams & PARAM_UINT16_1 )
pRetStream->Read( nNr1 );
- if( nParams & PARAM_ULONG_1 )
+ if( nParams & PARAM_UINT32_1 )
pRetStream->Read( nLNr1 );
if( nParams & PARAM_STR_1 )
{
@@ -3222,14 +3222,14 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
{
if ( aNextReturnId.equals( aUId ) )
{
- if( nParams & PARAM_ULONG_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
+ if( nParams & PARAM_UINT32_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
{
if ( nLNr1 > 0x7fffffff )
pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 );
else
pImpl->pNextReturn->PutULong( nLNr1 );
}
- if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 );
+ if( nParams & PARAM_UINT16_1 ) pImpl->pNextReturn->PutUShort( nNr1 );
if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 );
if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 );
if( nParams & PARAM_SBXVALUE_1 ) // FIXME: allow generic datatype
@@ -3368,7 +3368,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
aStrm.Close();
}
}
- if ( nParams & PARAM_ULONG_1 )
+ if ( nParams & PARAM_UINT32_1 )
{
switch ( nUId )
{
@@ -3532,7 +3532,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
}
aULongNames.Erase();
- if( (nParams & PARAM_ULONG_1) && (nNr1 & M_RET_NUM_CONTROL) )
+ if( (nParams & PARAM_UINT32_1) && (nNr1 & M_RET_NUM_CONTROL) )
{
if ( m_pReverseControls )
{
@@ -3729,7 +3729,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
}
aCommand.AppendAscii( "\"" );
}
- if( nParams & PARAM_ULONG_1 )
+ if( nParams & PARAM_UINT32_1 )
{
if ( bWasParam )
aCommand.AppendAscii( ", " );
commit 8754d76d11b54019c296099fb986ce97fb85af0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 24 10:31:42 2011 +0100
BinUSHORT->BinUINT16 && BinULONG->BinUINT32
diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index 67c8fa6..f24da73 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -54,8 +54,8 @@
#define SIReturnError 13
// Typisierung im Stream
-#define BinUSHORT 11
-#define BinULONG 14
+#define BinUINT16 11
+#define BinUINT32 14
#define BinString 12
#define BinBool 13
#define BinSbxValue 15
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index a5f4853..fdf9bee 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -212,7 +212,7 @@ void CmdBaseStream::Read (comm_UINT16 &nNr)
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#if OSL_DEBUG_LEVEL > 1
- if (nId != BinUSHORT) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
+ if (nId != BinUINT16) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
@@ -223,7 +223,7 @@ void CmdBaseStream::Read (comm_UINT32 &nNr)
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#if OSL_DEBUG_LEVEL > 1
- if (nId != BinULONG) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
+ if (nId != BinUINT32) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
@@ -269,13 +269,13 @@ comm_UINT16 CmdBaseStream::GetNextType()
void CmdBaseStream::Write( comm_UINT16 nNr )
{
- *pCommStream << comm_UINT16( BinUSHORT );
+ *pCommStream << comm_UINT16( BinUINT16 );
*pCommStream << nNr;
}
void CmdBaseStream::Write( comm_UINT32 nNr )
{
- *pCommStream << comm_UINT16( BinULONG );
+ *pCommStream << comm_UINT16( BinUINT32 );
*pCommStream << nNr;
}
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index fe929a5..2ab459c 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -86,24 +86,24 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
Read( nType );
switch (nType)
{
- case BinUSHORT:
+ case BinUINT16:
{
comm_UINT16 nNr;
Read (nNr );
pItem = new SfxUInt16Item(nId,nNr);
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "USHORT:" );
+ StatementList::m_pDbgWin->AddText( "UINT16" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
#endif
}
break;
- case BinULONG:
+ case BinUINT32:
{
comm_UINT32 nNr;
Read (nNr );
pItem = new SfxUInt32Item(nId,nNr);
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "ULONG:" );
+ StatementList::m_pDbgWin->AddText( "UINT32" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
#endif
}
@@ -157,24 +157,24 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
nType = GetNextType();
switch (nType)
{
- case BinUSHORT:
+ case BinUINT16:
{
comm_UINT16 nNr;
Read (nNr );
rItem.Value <<= nNr;
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "USHORT:" );
+ StatementList::m_pDbgWin->AddText( "UINT16" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
#endif
}
break;
- case BinULONG:
+ case BinUINT32:
{
comm_UINT32 nNr;
Read (nNr );
rItem.Value <<= nNr;
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "ULONG:" );
+ StatementList::m_pDbgWin->AddText( "UINT32" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
#endif
}
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 52684a2..a02ff4e 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -349,7 +349,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn )
{
switch ( pCmdIn->GetNextType() )
{
- case BinUSHORT: // use old calling method
+ case BinUINT16: // use old calling method
{
nAnzahl++;
pItemArr = new SfxPoolItem*[nAnzahl];
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 3bff14b..57192af 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -344,7 +344,7 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
case SbxUINT:
case SbxSINGLE:
if ( !bWriteUnoSlot )
- Write( (sal_uInt16)BinUSHORT );
+ Write( (sal_uInt16)BinUINT16 );
Write(rPar->Get( 2*n )->GetUShort());
break;
case SbxLONG:
@@ -353,7 +353,7 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
case SbxSALUINT64:
case SbxDOUBLE:
if ( !bWriteUnoSlot )
- Write( (sal_uInt16)BinULONG );
+ Write( (sal_uInt16)BinUINT32 );
Write(rPar->Get( 2*n )->GetULong());
break;
case SbxSTRING:
commit d63833f50fb5e6dae5245f6317d046b19a51920b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 24 10:10:13 2011 +0100
replace comm_ULONG with comm_UINT32
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index 55f5ebf..cb6bdfd 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -39,7 +39,6 @@
/** defines:
comm_BYTE
comm_BOOL
- comm_ULONG
comm_UINT16
comm_UINT32
comm_UniChar
@@ -57,7 +56,6 @@ typedef sal_Unicode comm_UniChar;
#include <tools/solar.h>
typedef sal_uInt8 comm_BYTE;
typedef sal_Bool comm_BOOL;
-typedef sal_uInt32 comm_ULONG;
typedef sal_uInt16 comm_UINT16;
typedef sal_uInt32 comm_UINT32;
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index a49bbb2..8780307 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -51,13 +51,13 @@ public:
void GenError( rtl::OString *pUId, comm_String *pString );
- void GenReturn( comm_UINT16 nRet, comm_ULONG nNr );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr );
+ void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr );
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_String *pString );
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_ULONG nNr );
+ void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr );
void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_String *pString );
void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL bBool );
void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT16 nNr );
@@ -67,16 +67,16 @@ public:
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString );
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool );
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_ULONG nNr );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr );
void Read ( comm_UINT16 &nNr );
- void Read ( comm_ULONG &nNr );
+ void Read ( comm_UINT32 &nNr );
void Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars );
void Read ( comm_BOOL &bBool );
comm_UINT16 GetNextType();
void Write( comm_UINT16 nNr );
- void Write( comm_ULONG nNr );
+ void Write( comm_UINT32 nNr );
void Write( const comm_UniChar* aString, comm_UINT16 nLenInChars );
void Write( comm_BOOL bBool );
diff --git a/automation/source/inc/icommstream.hxx b/automation/source/inc/icommstream.hxx
index e3314c3..147dfe5 100644
--- a/automation/source/inc/icommstream.hxx
+++ b/automation/source/inc/icommstream.hxx
@@ -47,18 +47,18 @@ public:
virtual ~ICommStream(){}
virtual ICommStream& operator>>( comm_UINT16& rUShort )=0;
- virtual ICommStream& operator>>( comm_ULONG& rULong )=0;
+ virtual ICommStream& operator>>( comm_UINT32& rULong )=0;
virtual ICommStream& operator>>( comm_BOOL& rChar )=0;
virtual ICommStream& operator<<( comm_UINT16 nUShort )=0;
- virtual ICommStream& operator<<( comm_ULONG nULong )=0;
+ virtual ICommStream& operator<<( comm_UINT32 nULong )=0;
virtual ICommStream& operator<<( comm_BOOL nChar )=0;
- virtual comm_ULONG Read( void* pData, comm_ULONG nSize )=0;
- virtual comm_ULONG Write( const void* pData, comm_ULONG nSize )=0;
+ virtual comm_UINT32 Read( void* pData, comm_UINT32 nSize )=0;
+ virtual comm_UINT32 Write( const void* pData, comm_UINT32 nSize )=0;
virtual comm_BOOL IsEof() const=0;
- virtual comm_ULONG SeekRel( long nPos )=0;
+ virtual comm_UINT32 SeekRel( long nPos )=0;
};
diff --git a/automation/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx
index e92ea66..70c4a61 100644
--- a/automation/source/inc/svcommstream.hxx
+++ b/automation/source/inc/svcommstream.hxx
@@ -42,18 +42,18 @@ public:
~SvCommStream();
ICommStream& operator>>( comm_UINT16& rUShort );
- ICommStream& operator>>( comm_ULONG& rULong );
+ ICommStream& operator>>( comm_UINT32& rULong );
ICommStream& operator>>( comm_BOOL& rChar );
ICommStream& operator<<( comm_UINT16 nUShort );
- ICommStream& operator<<( comm_ULONG nULong );
+ ICommStream& operator<<( comm_UINT32 nULong );
ICommStream& operator<<( comm_BOOL nChar );
- comm_ULONG Read( void* pData, comm_ULONG nSize );
- comm_ULONG Write( const void* pData, comm_ULONG nSize );
+ comm_UINT32 Read( void* pData, comm_UINT32 nSize );
+ comm_UINT32 Write( const void* pData, comm_UINT32 nSize );
comm_BOOL IsEof() const;
- comm_ULONG SeekRel( long nPos );
+ comm_UINT32 SeekRel( long nPos );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index dc9d112..b69aef2 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -496,7 +496,7 @@ void StatementCommand::HandleSAXParser()
break;
case RC_SAXGetNodeType:
{
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pSAXParser->GetCurrentNode()->GetNodeType() );
}
break;
case RC_SAXGetAttributeCount:
@@ -514,13 +514,13 @@ void StatementCommand::HandleSAXParser()
pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() );
break;
case RC_SAXGetChildCount:
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pElementNode->GetChildCount() );
break;
case RC_SAXGetAttributeCount:
if ( xAttributeList.is() )
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)xAttributeList->getLength() );
else
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)0 );
break;
case RC_SAXGetAttributeName:
{
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 24408a2..a5f4853 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -58,7 +58,7 @@ void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString )
Write(pString);
}
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_ULONG nUId )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT32 nUId )
{
Write(comm_UINT16(SIReturn));
Write(nRet);
@@ -66,12 +66,12 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_ULONG nUId )
Write(comm_UINT16(PARAM_NONE)); // Typ der folgenden Parameter
}
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr )
{
Write(comm_UINT16(SIReturn));
Write(nRet);
if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ Write(comm_UINT32(0));
else
Write(pUId);
Write(comm_UINT16(PARAM_ULONG_1)); // Typ der folgenden Parameter
@@ -83,7 +83,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_String
Write(comm_UINT16(SIReturn));
Write(nRet);
if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ Write(comm_UINT32(0));
else
Write(pUId);
Write(comm_UINT16(PARAM_STR_1)); // Typ der folgenden Parameter
@@ -95,19 +95,19 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL b
Write(comm_UINT16(SIReturn));
Write(nRet);
if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ Write(comm_UINT32(0));
else
Write(pUId);
Write(comm_UINT16(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool )
{
Write(comm_UINT16(SIReturn));
Write(nRet);
if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ Write(comm_UINT32(0));
else
Write(pUId);
Write(comm_UINT16(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
@@ -116,11 +116,11 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_ULONG
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr )
{
Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(comm_UINT16(PARAM_ULONG_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -129,7 +129,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_Strin
{
Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(comm_UINT16(PARAM_STR_1)); // Typ der folgenden Parameter
Write(pString);
}
@@ -138,7 +138,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL
{
Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(comm_UINT16(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
@@ -147,7 +147,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT1
{
Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(comm_UINT16(PARAM_USHORT_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -194,7 +194,7 @@ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16
Write(bBool);
}
-void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr )
{
Write(comm_UINT16(SIReturn));
Write(nRet);
@@ -217,7 +217,7 @@ void CmdBaseStream::Read (comm_UINT16 &nNr)
*pCommStream >> nNr;
}
-void CmdBaseStream::Read (comm_ULONG &nNr)
+void CmdBaseStream::Read (comm_UINT32 &nNr)
{
comm_UINT16 nId;
*pCommStream >> nId;
@@ -239,7 +239,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars )
*pCommStream >> nLenInChars;
aString = new comm_UniChar [nLenInChars];
- pCommStream->Read( aString, ((comm_ULONG)nLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Read( aString, ((comm_UINT32)nLenInChars) * sizeof( comm_UniChar ) );
#ifdef OSL_BIGENDIAN
// we have to change the byteorder
comm_UINT16 n;
@@ -273,7 +273,7 @@ void CmdBaseStream::Write( comm_UINT16 nNr )
*pCommStream << nNr;
}
-void CmdBaseStream::Write( comm_ULONG nNr )
+void CmdBaseStream::Write( comm_UINT32 nNr )
{
*pCommStream << comm_UINT16( BinULONG );
*pCommStream << nNr;
@@ -313,10 +313,10 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_UINT16 nLenInChars
aNewString = new comm_UniChar [nNewLenInChars];
for ( n = 0 ; n < nNewLenInChars ; n++ )
aNewString[ n ] = aNoBiDiString[ n ] >> 8 | aNoBiDiString[ n ] << 8;
- pCommStream->Write( aNewString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Write( aNewString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
delete [] aNewString;
#else
- pCommStream->Write( aNoBiDiString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Write( aNoBiDiString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
#endif
delete [] aNoBiDiString;
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 9cbba78..a88efbe 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -273,7 +273,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_LISTBOX_SELECT:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, comm_UINT32( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
bSendData = sal_True;
}
if ( m_bLog )
@@ -308,7 +308,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Sound::Beep();
else
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, (comm_ULONG) nPos+1 );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, (comm_UINT32) nPos+1 );
bSendData = sal_True;
}
}
@@ -372,7 +372,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
if ( nMethod != M_Click )
StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod );
else
- StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_UINT32)nCurrentButtonId );
bSendData = sal_True;
}
if ( m_bLog )
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 1326e59..8cc639a 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -58,7 +58,7 @@ void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString )
CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
}
-void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
}
@@ -79,7 +79,7 @@ void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValu
{
Write(sal_uInt16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(sal_uInt16(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter
Write(aValue);
}
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 537e3bd..30e2625 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -44,17 +44,17 @@ public:
void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
- void GenReturn( comm_UINT16 nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
// MacroRecorder
void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
- void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
- void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool );
// needed for RemoteCommand and Profiling
void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
@@ -71,7 +71,7 @@ public:
using CmdBaseStream::Write;
void Write( comm_UINT16 nNr ){CmdBaseStream::Write( nNr );}
- void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );}
+ void Write( comm_UINT32 nNr ){CmdBaseStream::Write( nNr );}
void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
void Write( SbxValue &aValue );
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 850265a..fe929a5 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -99,7 +99,7 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
break;
case BinULONG:
{
- comm_ULONG nNr;
+ comm_UINT32 nNr;
Read (nNr );
pItem = new SfxUInt32Item(nId,nNr);
#if OSL_DEBUG_LEVEL > 1
@@ -170,7 +170,7 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
break;
case BinULONG:
{
- comm_ULONG nNr;
+ comm_UINT32 nNr;
Read (nNr );
rItem.Value <<= nNr;
#if OSL_DEBUG_LEVEL > 1
diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx
index d4585a1..5ef7a8c 100644
--- a/automation/source/server/scmdstrm.hxx
+++ b/automation/source/server/scmdstrm.hxx
@@ -48,7 +48,7 @@ public:
using CmdBaseStream::Read;
void Read ( comm_UINT16 &nNr ){CmdBaseStream::Read ( nNr );}
- void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
+ void Read ( comm_UINT32 &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
void Read ( String &aString );
void Read ( SfxPoolItem *&pItem );
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 99906cd..69a0212 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -167,7 +167,7 @@ void StatementList::SendProfile( String aText )
if ( pProfiler->IsPartitioning() )
// FIXME: HELPID
- pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_ULONG on 64bit
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_UINT32>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_UINT32 on 64bit
}
if ( pProfiler->IsAutoProfiling() )
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index bc24e4f..52684a2 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -772,7 +772,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
return;
if ( bFirst )
- pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), sal_True );
+ pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_UINT32)nConf | DH_MODE_DATA_VALID, UniString(), sal_True );
if ( bFirst )
{
@@ -882,7 +882,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
}
rtl::OString aId = pBase->GetUniqueOrHelpId();
- pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(),
+ pRet->GenReturn ( RET_WinInfo, aId, (comm_UINT32)pBase->GetType(),
TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), sal_False );
@@ -903,10 +903,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) )
{
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)WINDOW_BUTTON,
+ pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_UINT32)WINDOW_BUTTON,
TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BUTTON,
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)WINDOW_BUTTON,
TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
}
else
@@ -914,10 +914,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
if ( pItemWin )
{
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)pItemWin->GetType(),
+ pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_UINT32)pItemWin->GetType(),
TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)pItemWin->GetType(),
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)pItemWin->GetType(),
TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
sal_uInt16 ii;
for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ )
@@ -949,10 +949,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
OSL_TRACE( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
}
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
+ pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_UINT32)WINDOW_BASE,
aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE,
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_UINT32)WINDOW_BASE,
aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
}
}
@@ -1003,7 +1003,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
break;
}
- pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So da� der Text angezeigt wird!
+ pRet->GenReturn ( RET_WinInfo, aID, (comm_UINT32)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So da� der Text angezeigt wird!
TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
.AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), sal_False );
}
@@ -1052,10 +1052,10 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
OSL_TRACE( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
}
if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
+ pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_UINT32)0,
aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0,
+ pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_UINT32)0,
aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
}
}
@@ -2606,7 +2606,7 @@ sal_Bool StatementCommand::Execute()
}
else if ( nParams & PARAM_USHORT_1 )
{ // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
- comm_ULONG nAnzahl=0;
+ comm_UINT32 nAnzahl=0;
if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; };
if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; };
if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
@@ -2618,10 +2618,10 @@ sal_Bool StatementCommand::Execute()
pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl );
// Und die einzelnen Grenzen
- if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_ULONG)nNr1 ); };
- if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); };
- if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); };
- if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_ULONG)nNr4 ); };
+ if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_UINT32)nNr1 ); };
+ if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_UINT32)nNr2 ); };
+ if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_UINT32)nNr3 ); };
+ if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_UINT32)nNr4 ); };
pProfiler->StartPartitioning();
}
@@ -2657,7 +2657,7 @@ sal_Bool StatementCommand::Execute()
if ( pProfiler->IsPartitioning() )
{
- pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 );
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_UINT32)0 );
pProfiler->StopPartitioning();
}
@@ -2755,13 +2755,13 @@ sal_Bool StatementCommand::Execute()
{
case RC_MenuGetItemCount:
{
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)nItemCount );
}
break;
case RC_MenuGetItemId:
{
if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)pMenu->GetItemId(nPhysicalIndex-1) );
}
break;
case RC_MenuGetItemPos:
@@ -2783,7 +2783,7 @@ sal_Bool StatementCommand::Execute()
}
}
}
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)(nLogicalPos+1) );
}
break;
case RC_MenuIsSeperator:
@@ -2994,7 +2994,7 @@ sal_Bool StatementCommand::Execute()
if ( FSYS_ERR_OK == nErrorcode )
{
FileStat aFS( aFile );
- pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_ULONG on 64bit
+ pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_UINT32>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_UINT32 on 64bit
nErrorcode = aFS.GetError();
}
}
@@ -3132,7 +3132,7 @@ sal_Bool StatementCommand::Execute()
ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
aPointer = Pointer( POINTER_NULL );
}
- pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_UINT32)aPointer.GetStyle() );
}
break;
case RC_UnpackStorage:
@@ -3364,7 +3364,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdTyp
//HELPID BACKWARD (SIControl is no longer needed)
if ( nControlIdType == SIControl )
{
- comm_ULONG nId;
+ comm_UINT32 nId;
pCmdIn->Read( nId );
aUId = rtl::OString( nId );
if ( nId == 0 )
@@ -3679,10 +3679,10 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
{
Point aPos = pControl->GetPosPixel();
aPos = pControl->GET_REAL_PARENT()->OutputToScreenPixel( aPos );
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)aPos.X() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)aPos.X() );
}
else
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetPosPixel().X() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetPosPixel().X() );
break;
case M_GetPosY:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3698,10 +3698,10 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
{
Point aPos = pControl->GetPosPixel();
aPos = pControl->GET_REAL_PARENT()->OutputToScreenPixel( aPos );
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)aPos.Y() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)aPos.Y() );
}
else
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetPosPixel().Y() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetPosPixel().Y() );
break;
case M_GetSizeX:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3713,7 +3713,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetSizePixel().Width() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetSizePixel().Width() );
break;
case M_GetSizeY:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
@@ -3725,7 +3725,7 @@ sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetSizePixel().Height() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetSizePixel().Height() );
break;
case M_SnapShot:
{
@@ -3823,7 +3823,7 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
break;
case M_GetRT:
{
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pControl->GetType() );
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pControl->GetType() );
}
break;
case M_TypeKeys:
@@ -4251,13 +4251,13 @@ sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
break;
case M_StatusGetItemCount:
if ( pStatus->AreItemsVisible() )
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pStatus->GetItemCount()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pStatus->GetItemCount()));
else
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
break;
case M_StatusGetItemId:
if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,pStatus->GetItemCount()) )
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(pStatus->GetItemId(nNr1-1)));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(pStatus->GetItemId(nNr1-1)));
break;
}
}
@@ -4534,13 +4534,13 @@ sal_Bool StatementControl::Execute()
if ( (nParams & PARAM_USHORT_1) )
{
if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((TabControl*)pControl)->GetPageCount() ) )
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetPageId(nNr1-1));
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageId(nNr1-1));
}
else
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetCurPageId());
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetCurPageId());
break;
case M_GetPageCount:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)((TabControl*)pControl)->GetPageCount());
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)((TabControl*)pControl)->GetPageCount());
break;
case M_SetPageId:
if (((TabControl*)pControl)->GetCurPageId())
@@ -4635,7 +4635,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, comm_BOOL( ((TriStateBox*)pControl)->GetState() == STATE_DONTKNOW) );
break;
case M_GetState :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((TriStateBox*)pControl)->GetState()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((TriStateBox*)pControl)->GetState()));
break;
case M_Check :
((TriStateBox*)pControl)->SetState( STATE_CHECK );
@@ -4723,20 +4723,20 @@ sal_Bool StatementControl::Execute()
AnimateMouse( pControl, MitteOben);
break;
case M_GetSelCount :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetSelectEntryCount()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryCount()));
break;
case M_GetSelIndex :
if ( ! (nParams & PARAM_USHORT_1) )
{
if ( ((ListBox*)pControl)->GetSelectEntryCount() == 0 )
{
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
break;
}
nNr1 = 1;
}
ValueOK(aUId, MethodString( nMethodId ),nNr1,((ListBox*)pControl)->GetSelectEntryCount());
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetSelectEntryPos(nNr1-1)) +1);
break;
case M_GetSelText :
if ( ! (nParams & PARAM_USHORT_1) )
@@ -4744,7 +4744,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetSelectEntry(nNr1-1));
break;
case M_GetItemCount :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ListBox*)pControl)->GetEntryCount()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ListBox*)pControl)->GetEntryCount()));
break;
case M_GetItemText :
pRet->GenReturn ( RET_Value, aUId, ((ListBox*)pControl)->GetEntry(nNr1-1));
@@ -4834,11 +4834,11 @@ sal_Bool StatementControl::Execute()
nPos = 0;
else
nPos++;
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG) nPos);
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32) nPos);
}
break;
case M_GetItemCount :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((ComboBox*)pControl)->GetEntryCount()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((ComboBox*)pControl)->GetEntryCount()));
break;
case M_GetItemText :
pRet->GenReturn ( RET_Value, aUId, ((ComboBox*)pControl)->GetEntry(nNr1-1));
@@ -5210,17 +5210,17 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) );
break;
case 1:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemType(nItemPos));
break;
case 2:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemState(pTB->GetItemId(nItemPos)));
break;
case 3:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemId(nItemPos));
break;
default:
ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(0));
break;
}
}
@@ -5233,7 +5233,7 @@ sal_Bool StatementControl::Execute()
pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetText());
break;
case M_GetItemCount :
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemCount());
+ pRet->GenReturn ( RET_Value, aUId, (comm_UINT32)pTB->GetItemCount());
break;
case M_SetNextToolBox :
if ( (nParams & PARAM_STR_1) )
@@ -5311,10 +5311,10 @@ sal_Bool StatementControl::Execute()
}
break;
case M_GetSelCount :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetSelectionCount()));
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetSelectionCount()));
break;
case M_GetItemCount :
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetVisibleCount()) );
+ pRet->GenReturn ( RET_Value, aUId, comm_UINT32(((SvLBox*)pControl)->GetVisibleCount()) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list