summaryrefslogtreecommitdiff
path: root/automation/source/testtool
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-05-24 10:10:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-05-24 10:10:13 +0100
commitb87fed20f6f832a3bec032364ea2cd7c3da4da0b (patch)
tree2ee74036043d6a333dbadbfe6dabb98990ffae67 /automation/source/testtool
parent1c2d84e8e15031a45a0c5642520befb9320fe271 (diff)
replace comm_ULONG with comm_UINT32
Diffstat (limited to 'automation/source/testtool')
-rw-r--r--automation/source/testtool/cmdstrm.cxx8
-rw-r--r--automation/source/testtool/cmdstrm.hxx8
-rw-r--r--automation/source/testtool/cretstrm.hxx2
-rw-r--r--automation/source/testtool/objtest.cxx10
4 files changed, 14 insertions, 14 deletions
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index d24fa7f232b0..82e36331ee46 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -172,7 +172,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString )
{
sal_uInt16 nParams = PARAM_NONE;
sal_uInt16 nNr1=0,nNr2=0,nNr3=0,nNr4=0;
- comm_ULONG nLNr1=0;
+ comm_UINT32 nLNr1=0;
String aString1,aString2;
sal_Bool bBool1=sal_False,bBool2=sal_False;
@@ -399,7 +399,7 @@ void CmdStream::GenCmdUNOSlot( const String &aURL )
Write( aURL ); // Die UNO URL eben
}
-void CmdStream::GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar )
+void CmdStream::GenCmdControl( comm_UINT32 nUId, sal_uInt16 nMethodId, SbxArray* rPar )
{
Write(sal_uInt16(SIControl));
Write(nUId);
@@ -430,7 +430,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 )
Write(nNr1);
}
-void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 )
+void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 )
{
Write(sal_uInt16(SIFlow));
Write(nArt);
@@ -459,7 +459,7 @@ SvMemoryStream* CmdStream::GetStream()
return pSammel;
}
-void CmdStream::Reset( comm_ULONG nSequence )
+void CmdStream::Reset( comm_UINT32 nSequence )
{
delete pCommStream;
delete pSammel;
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index f23c479d686c..0f4e6eff2c39 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -46,16 +46,16 @@ public:
void GenCmdUNOSlot( const String &aURL );
- void GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar );
+ void GenCmdControl( comm_UINT32 nUId, sal_uInt16 nMethodId, SbxArray* rPar );
void GenCmdControl( String aUId, sal_uInt16 nMethodId, SbxArray* rPar );
void GenCmdFlow( sal_uInt16 nArt );
void GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 );
- void GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 );
+ void GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 );
void GenCmdFlow( sal_uInt16 nArt, String aString1 );
- void Reset(comm_ULONG nSequence);
+ void Reset(comm_UINT32 nSequence);
SvMemoryStream* GetStream();
@@ -67,7 +67,7 @@ private:
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( const comm_UniChar* aString, comm_UINT16 nLenInChars ){CmdBaseStream::Write( aString, nLenInChars );}
void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
// new
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 09c948a36e69..9f1385dae540 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -44,7 +44,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 );}
virtual void Read ( rtl::OString* &pId ){CmdBaseStream::Read ( pId );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
void Read( String &aString );
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 7303b1ee132c..4eda2f3ee04b 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -169,7 +169,7 @@ void ControlDef::Write( SvStream &aStream )
if ( pData->aUId.HasString() )
aStream.WriteByteString( pData->aUId.GetStr(), RTL_TEXTENCODING_UTF8 );
else
- aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_ULONG on 64bit
+ aStream << static_cast<comm_UINT32>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_UINT32 on 64bit
if ( pSons )
for ( sal_uInt16 i = 0 ; pSons->Count() > i ; i++ )
((ControlDef*)(*pSons)[i])->Write(aStream);
@@ -1401,7 +1401,7 @@ sal_Bool TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pC
}
else
{
- comm_ULONG nUId;
+ comm_UINT32 nUId;
aStream >> nUId;
aUId = rtl::OString();// nUId;
}
@@ -3168,7 +3168,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
}
else
{
- comm_ULONG nUId;
+ comm_UINT32 nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
// FIXME: HELPID
#if 0
@@ -3178,7 +3178,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
pRetStream->Read(nParams);
sal_uInt16 nNr1 = 0;
- comm_ULONG nLNr1 = 0;
+ comm_UINT32 nLNr1 = 0;
String aString1;
sal_Bool bBool1 = sal_False;
SbxValueRef xValue1 = new SbxValue;
@@ -3785,7 +3785,7 @@ sal_Bool TestToolObj::ReturnResults( SvStream *pIn )
}
else
{
- comm_ULONG nUId;
+ comm_UINT32 nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
// FIXME: HELPID
#if 0