diff options
Diffstat (limited to 'automation')
47 files changed, 1463 insertions, 1491 deletions
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index 72a362e5e052..2e035ba91bfa 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -54,42 +54,17 @@ typedef sal_Unicode comm_UniChar; #include "rtl/string.hxx" -// this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them -#ifndef _SOLAR_H -#define NO_SOLAR -#endif - -#ifdef NO_SOLAR -#define BYTE BYTE_hidden -#define BOOL BOOL_hidden -#define ULONG ULONG_hidden -#define USHORT USHORT_hidden -#define UINT16 UINT16_hidden -#define UINT32 UINT32_hidden - -#endif - //#define DBG_ASSERT( cond, text ) //#define DBG_ERROR( text ) #include <tools/debug.hxx> #include <tools/solar.h> -typedef BYTE comm_BYTE; -typedef BOOL comm_BOOL; +typedef sal_uInt8 comm_BYTE; +typedef sal_Bool comm_BOOL; typedef sal_uInt32 comm_ULONG; typedef sal_uInt16 comm_USHORT; -typedef UINT16 comm_UINT16; -typedef UINT32 comm_UINT32; - -#ifdef NO_SOLAR -#undef BYTE -#undef BOOL -#undef ULONG -#undef USHORT -#undef UINT16 -#undef UINT32 - -#endif +typedef sal_uInt16 comm_UINT16; +typedef sal_uInt32 comm_UINT32; typedef sal_uInt16 comm_WORD; typedef sal_uInt32 comm_DWORD; diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index c1ed42a66b48..1590bb9f58fb 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -44,14 +44,14 @@ SV_DECL_PTRARR_SORT( CommunicationLinkList, CommunicationLink*, 1, 10 ) class MultiCommunicationManager : public CommunicationManager { public: - MultiCommunicationManager( BOOL bUseMultiChannel = FALSE ); + MultiCommunicationManager( sal_Bool bUseMultiChannel = sal_False ); virtual ~MultiCommunicationManager(); - virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an - virtual BOOL IsLinkValid( CommunicationLink* pCL ); - virtual USHORT GetCommunicationLinkCount(); - virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr ); + virtual sal_Bool StopCommunication(); // Hält alle CommunicationLinks an + virtual sal_Bool IsLinkValid( CommunicationLink* pCL ); + virtual sal_uInt16 GetCommunicationLinkCount(); + virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr ); - void DoQuickShutdown( BOOL bQuickShutdown = TRUE) { bGracefullShutdown = !bQuickShutdown; } + void DoQuickShutdown( sal_Bool bQuickShutdown = sal_True) { bGracefullShutdown = !bQuickShutdown; } protected: virtual void CallConnectionOpened( CommunicationLink* pCL ); @@ -61,19 +61,19 @@ protected: /// allerdings schon ein StopCommunication gekriegt haben, bzw ein ConnectionTerminated virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus - BOOL bGracefullShutdown; + sal_Bool bGracefullShutdown; }; class CommunicationManagerServer : public MultiCommunicationManager { public: - CommunicationManagerServer( BOOL bUseMultiChannel = FALSE ):MultiCommunicationManager( bUseMultiChannel ){;} + CommunicationManagerServer( sal_Bool bUseMultiChannel = sal_False ):MultiCommunicationManager( bUseMultiChannel ){;} }; class CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient { public: - CommunicationManagerClient( BOOL bUseMultiChannel = FALSE ); + CommunicationManagerClient( sal_Bool bUseMultiChannel = sal_False ); }; class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread @@ -82,14 +82,14 @@ public: CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket ); virtual ~CommunicationLinkViaSocket(); - virtual BOOL IsCommunicationError(); - virtual BOOL DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); + virtual sal_Bool IsCommunicationError(); + virtual sal_Bool DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); // Diese sind Virtuelle Links!!!! virtual long ConnectionClosed( void* = NULL ); virtual long DataReceived( void* = NULL ); - virtual BOOL StopCommunication(); + virtual sal_Bool StopCommunication(); void SetPutDataReceivedHdl( Link lPutDataReceived ){ mlPutDataReceived = lPutDataReceived; } Link GetDataReceivedLink () {Link aLink = LINK( this, CommunicationLinkViaSocket, DataReceived ); return aLink;} @@ -98,17 +98,17 @@ public: protected: virtual void SAL_CALL run(); - virtual BOOL ShutdownCommunication(); - ULONG nConnectionClosedEventId; - ULONG nDataReceivedEventId; + virtual sal_Bool ShutdownCommunication(); + sal_uLong nConnectionClosedEventId; + sal_uLong nDataReceivedEventId; vos::OMutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist vos::OMutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist virtual void WaitForShutdown(); DECL_LINK( ShutdownLink, void* ); Timer aShutdownTimer; - BOOL bShutdownStarted; - BOOL bDestroying; + sal_Bool bShutdownStarted; + sal_Bool bDestroying; Link mlPutDataReceived; }; @@ -118,15 +118,15 @@ class CommunicationManagerServerViaSocket : public CommunicationManagerServer public: using CommunicationManager::StartCommunication; - CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel = FALSE ); + CommunicationManagerServerViaSocket( sal_uLong nPort, sal_uInt16 nMaxCon, sal_Bool bUseMultiChannel = sal_False ); virtual ~CommunicationManagerServerViaSocket(); - virtual BOOL StartCommunication(); - virtual BOOL StopCommunication(); + virtual sal_Bool StartCommunication(); + virtual sal_Bool StopCommunication(); protected: - ULONG nPortToListen; - USHORT nMaxConnections; + sal_uLong nPortToListen; + sal_uInt16 nMaxConnections; private: CommunicationManagerServerAcceptThread *pAcceptThread; @@ -136,7 +136,7 @@ private: class CommunicationManagerServerAcceptThread: public vos::OThread { public: - CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS ); + CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon = CM_UNLIMITED_CONNECTIONS ); virtual ~CommunicationManagerServerAcceptThread(); CommunicationLinkRef GetNewConnection(){ CommunicationLinkRef xTemp = xmNewConnection; xmNewConnection.Clear(); return xTemp; } @@ -146,9 +146,9 @@ protected: private: CommunicationManagerServerViaSocket* pMyServer; vos::OAcceptorSocket *pAcceptorSocket; - ULONG nPortToListen; - USHORT nMaxConnections; - ULONG nAddConnectionEventId; + sal_uLong nPortToListen; + sal_uInt16 nMaxConnections; + sal_uLong nAddConnectionEventId; vos::OMutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); } CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); } @@ -163,16 +163,16 @@ class CommunicationManagerClientViaSocket : public CommunicationManagerClient, C public: using CommunicationManager::StartCommunication; - CommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel = FALSE ); - CommunicationManagerClientViaSocket( BOOL bUseMultiChannel = FALSE ); + CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False ); + CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False ); virtual ~CommunicationManagerClientViaSocket(); - virtual BOOL StartCommunication(){ return StartCommunication( aHostToTalk, nPortToTalk );} - virtual BOOL StartCommunication( ByteString aHost, ULONG nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );} + virtual sal_Bool StartCommunication(){ return StartCommunication( aHostToTalk, nPortToTalk );} + virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );} private: ByteString aHostToTalk; - ULONG nPortToTalk; + sal_uLong nPortToTalk; protected: virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); } }; diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index 8f65e31b3471..657357431f9f 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -39,11 +39,11 @@ // CM steht für CommunicationManager #define CM_UNLIMITED_CONNECTIONS 0xffff -typedef USHORT CM_NameType; +typedef sal_uInt16 CM_NameType; #define CM_DOTTED ( (CM_NameType) 01 ) #define CM_FQDN ( (CM_NameType) 02 ) -typedef USHORT CM_InfoType; +typedef sal_uInt16 CM_InfoType; // nur eines dieser 3 defines darf verwendet werden #define CM_NO_TEXT ( (CM_InfoType) 01 ) #define CM_SHORT_TEXT ( (CM_InfoType) 02 ) @@ -143,8 +143,8 @@ protected: // so daß nur über Ref gelöscht werden kann public: CommunicationLink( CommunicationManager *pMan ); - virtual BOOL StopCommunication()=0; - virtual BOOL IsCommunicationError()=0; + virtual sal_Bool StopCommunication()=0; + virtual sal_Bool IsCommunicationError()=0; CommunicationManager* GetCommunicationManager(){ return pMyManager; } // Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren @@ -159,27 +159,27 @@ public: /** will call virtual function DoTransferDataStream to do actual work Purpos is to allow housekeeping **/ - BOOL TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); + sal_Bool TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); // Liefert die ID, die vom Sender angegeben wurde. // Dadurch lassen sich virtuelle Kommunikationen über einen physikalischen Link realisiren. // Da die Kommunikation zu älteren Versionen kompatibel bleiben muß, muß der Empfänger raten, // die neue oder die alte verwendet wird, da sich der Kopf eines Auftrages dann ändert. - UINT16 GetProtocol(){ return nServiceProtocol; } + sal_uInt16 GetProtocol(){ return nServiceProtocol; } // Der Stream wird hier übergeben. Der Aufrufer ist für dessen Löschung zuständig // Die Methode MUSS gerufen werden, da sonst keine weiteren Daten empfangen werden. SvStream* GetServiceData(){ SvStream *pTemp = pServiceData; pServiceData = NULL; return pTemp; } /// Ermöglicht das Auslösen des nächsten Callbacks. Wird auch Implizit gerufen. - void FinishCallback(){ bIsInsideCallback = FALSE; } + void FinishCallback(){ bIsInsideCallback = sal_False; } /// Syncrones Empfangen der Daten. Nur für Kommandozeile, sonst leer implementiert - virtual BOOL ReceiveDataStream(){ return FALSE; } + virtual sal_Bool ReceiveDataStream(){ return sal_False; } /// Statistics DateTime GetStart() { return aStart; } - ULONG GetTotalBytes() { return nTotalBytes; } + sal_uLong GetTotalBytes() { return nTotalBytes; } DateTime GetLastAccess() { return aLastAccess; } const ByteString& GetApplication() { return maApplication; } virtual void SetApplication( const ByteString& aApp ); @@ -192,23 +192,23 @@ protected: virtual DECL_LINK( ConnectionClosed, void* = NULL ); virtual DECL_LINK( DataReceived, void* = NULL ); - virtual BOOL DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); + virtual sal_Bool DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); SvStream *pServiceData; - UINT16 nServiceProtocol; - UINT16 nServiceHeaderType; + sal_uInt16 nServiceProtocol; + sal_uInt16 nServiceHeaderType; /// Verhindert das vorzeitige Auslösen des nächsten Callbacks. - void StartCallback(){ bIsInsideCallback = TRUE; } - BOOL bIsInsideCallback; + void StartCallback(){ bIsInsideCallback = sal_True; } + sal_Bool bIsInsideCallback; - virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0; + virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0; - virtual BOOL ShutdownCommunication() = 0; /// Really stop the Communication + virtual sal_Bool ShutdownCommunication() = 0; /// Really stop the Communication /// Statistics DateTime aStart; - ULONG nTotalBytes; + sal_uLong nTotalBytes; DateTime aLastAccess; private: @@ -217,8 +217,8 @@ private: #if OSL_DEBUG_LEVEL > 1 public: // misc (debuging) purposes - BOOL bFlag; - ULONG nSomething; + sal_Bool bFlag; + sal_uLong nSomething; #endif }; @@ -231,23 +231,23 @@ class CommunicationManager friend class CommunicationLink; friend class CommonSocketFunctions; public: - CommunicationManager( BOOL bUseMultiChannel = FALSE ); + CommunicationManager( sal_Bool bUseMultiChannel = sal_False ); virtual ~CommunicationManager(); - virtual BOOL StartCommunication()=0; - virtual BOOL StartCommunication( String aApp, String aParams ); - virtual BOOL StartCommunication( ByteString aHost, ULONG nPort ); - virtual BOOL StopCommunication()=0; // Hält alle CommunicationLinks an - virtual BOOL IsCommunicationRunning() { return bIsCommunicationRunning; } -// virtual BOOL IsCommunicationError(); + virtual sal_Bool StartCommunication()=0; + virtual sal_Bool StartCommunication( String aApp, String aParams ); + virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ); + virtual sal_Bool StopCommunication()=0; // Hält alle CommunicationLinks an + virtual sal_Bool IsCommunicationRunning() { return bIsCommunicationRunning; } +// virtual sal_Bool IsCommunicationError(); // Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren virtual ByteString GetMyName( CM_NameType eType ); - virtual BOOL IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor + virtual sal_Bool IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor - virtual USHORT GetCommunicationLinkCount()=0; - virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr )=0; + virtual sal_uInt16 GetCommunicationLinkCount()=0; + virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr )=0; // Liefert den letzten neuen Link oder NULL wenn dieser schon wieder geschlossen ist. CommunicationLinkRef GetLastNewLink() { return xLastNewLink; } @@ -260,8 +260,8 @@ public: void SetInfoType( CM_InfoType nIT ){ nInfoType = nIT; } CM_InfoType GetInfoType(){ return nInfoType; } - BOOL IsMultiChannel(){ return bIsMultiChannel; } - void SetApplication( const ByteString& aApp, BOOL bRunningLinks = FALSE ); + sal_Bool IsMultiChannel(){ return bIsMultiChannel; } + void SetApplication( const ByteString& aApp, sal_Bool bRunningLinks = sal_False ); const ByteString& GetApplication() { return maApplication; } protected: @@ -280,7 +280,7 @@ protected: virtual void DataReceived( CommunicationLink* pCL ){ mlDataReceived.Call( pCL ); } virtual void InfoMsg( InfoString aMsg ){ mlInfoMsg.Call( &aMsg ); } - BOOL bIsCommunicationRunning; + sal_Bool bIsCommunicationRunning; virtual void DestroyingLink( CommunicationLink *pCL )=0; // Link trägt sich im Destruktor aus @@ -292,18 +292,18 @@ private: Link mlInfoMsg; CommunicationLinkRef xLastNewLink; - BOOL bIsMultiChannel; + sal_Bool bIsMultiChannel; }; class SingleCommunicationManager : public CommunicationManager { public: - SingleCommunicationManager( BOOL bUseMultiChannel = FALSE ); + SingleCommunicationManager( sal_Bool bUseMultiChannel = sal_False ); virtual ~SingleCommunicationManager(); - virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an - virtual BOOL IsLinkValid( CommunicationLink* pCL ); - virtual USHORT GetCommunicationLinkCount(); - virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr ); + virtual sal_Bool StopCommunication(); // Hält alle CommunicationLinks an + virtual sal_Bool IsLinkValid( CommunicationLink* pCL ); + virtual sal_uInt16 GetCommunicationLinkCount(); + virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr ); protected: virtual void CallConnectionOpened( CommunicationLink* pCL ); @@ -317,15 +317,15 @@ class ICommunicationManagerClient { friend class CommonSocketFunctions; protected: - virtual BOOL RetryConnect() { return FALSE; } // Kann dann eventuell die Applikation starten + virtual sal_Bool RetryConnect() { return sal_False; } // Kann dann eventuell die Applikation starten }; class TCPIO; class SimpleCommunicationLinkViaSocket : public CommunicationLink { public: - virtual BOOL IsCommunicationError(); - virtual BOOL StopCommunication(); + virtual sal_Bool IsCommunicationError(); + virtual sal_Bool StopCommunication(); virtual ByteString GetCommunicationPartner( CM_NameType eType ); virtual ByteString GetMyName( CM_NameType eType ); @@ -347,10 +347,10 @@ protected: void SetStreamSocket( vos::OStreamSocket* pSocket ); SvStream *pReceiveStream; - BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket - virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL); + sal_Bool DoReceiveDataStream(); /// Recieve DataPacket from Socket + virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL); void SetFinalRecieveTimeout(); - BOOL bIsRequestShutdownPending; + sal_Bool bIsRequestShutdownPending; virtual void WaitForShutdown()=0; void SetNewPacketAsCurrent(); }; @@ -360,16 +360,16 @@ class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommun public: SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket ); ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks(); - virtual BOOL ReceiveDataStream(); + virtual sal_Bool ReceiveDataStream(); protected: - virtual BOOL ShutdownCommunication(); /// Really stop the Communication + virtual sal_Bool ShutdownCommunication(); /// Really stop the Communication virtual void WaitForShutdown(); }; class CommonSocketFunctions { public: - BOOL DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort ); + sal_Bool DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort ); protected: virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS )=0; }; @@ -379,13 +379,13 @@ class SingleCommunicationManagerClientViaSocket : public SingleCommunicationMana public: using CommunicationManager::StartCommunication; - SingleCommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel = FALSE ); - SingleCommunicationManagerClientViaSocket( BOOL bUseMultiChannel = FALSE ); - virtual BOOL StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );} - virtual BOOL StartCommunication( ByteString aHost, ULONG nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );} + SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False ); + SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False ); + virtual sal_Bool StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );} + virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );} private: ByteString aHostToTalk; - ULONG nPortToTalk; + sal_uLong nPortToTalk; protected: virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); } }; diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx index 292cd70b34a4..c2efb51589a4 100644 --- a/automation/source/app/testbasi.cxx +++ b/automation/source/app/testbasi.cxx @@ -58,7 +58,7 @@ TYPEINIT1(TTBasic,MyBasic) /*class MyFactory : public SbxFactory { public: - virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX ); + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); }; static SampleObjectFac aFac1; @@ -67,7 +67,7 @@ static CommunicationFactory aComManFac; static ProcessFactory aProcessFac; static short nInst = 0; -SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr ) +SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr ) { if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC ) return new MyBasic; @@ -102,7 +102,7 @@ void TTBasic::LoadIniFile() ((TestToolObj*)pTestObject)->LoadIniFile(); } -SbTextType TTBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl ) +SbTextType TTBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl ) { return ((TestToolObj*)pTestObject)->GetSymbolType( rSymbol, bWasTTControl ); } @@ -117,7 +117,7 @@ IMPL_LINK( TTBasic, CErrorImpl, ErrorEntry*, pData ) return CError( pData->nError, pData->aText, pData->nLine, pData->nCol1, pData->nCol2 ); } -BOOL TTBasic::Compile( SbModule* p ) +sal_Bool TTBasic::Compile( SbModule* p ) { p->SetComment( ((TestToolObj*)pTestObject)->GetRevision(p->GetSource()) ); SbModule* pOldModule = GetCompileModule(); @@ -125,7 +125,7 @@ BOOL TTBasic::Compile( SbModule* p ) p->SetSource( ((TestToolObj*)pTestObject)->PreCompile(p->GetSource()) ); SetCompileModule( pOldModule ); if ( ((TestToolObj*)pTestObject)->WasPrecompilerError() ) - return FALSE; + return sal_False; return MyBasic::Compile( p ); } @@ -155,7 +155,7 @@ void TTBasic::ReportRuntimeError( AppBasEd *pEditWin ) MyBasic::ReportRuntimeError( pEditWin ); } -void TTBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors ) +void TTBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors ) { ((TestToolObj*)pTestObject)->DebugFindNoErrors( bDebugFindNoErrors ); } diff --git a/automation/source/app/testbasi.hxx b/automation/source/app/testbasi.hxx index 882b697f1cf3..e649dab0950b 100644 --- a/automation/source/app/testbasi.hxx +++ b/automation/source/app/testbasi.hxx @@ -44,7 +44,7 @@ public: TYPEINFO(); TTBasic(); ~TTBasic(); - BOOL Compile( SbModule* ); + sal_Bool Compile( SbModule* ); static MyBasic* CreateMyBasic(); // nicht mit #ifdefs klammern, da diese Headerdatei für testtool und basic @@ -53,10 +53,10 @@ public: // SbxObject *pTestObject; // für das Testtool; ansonsten NULL void LoadIniFile(); - SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl ); // Besimmt den erweiterten Symboltyp für das Syntaxhighlighting + SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl ); // Besimmt den erweiterten Symboltyp für das Syntaxhighlighting virtual const String GetSpechialErrorText(); virtual void ReportRuntimeError( AppBasEd *pEditWin ); - virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors ); + virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors ); }; SV_DECL_IMPL_REF(TTBasic) diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index 4cc944ed9702..36f79bb4fa55 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -51,10 +51,10 @@ #undef SV_IMPL_PTRARR_SORT #define SV_IMPL_PTRARR_SORT( nm,AE )\ _SV_IMPL_SORTAR_ALG( nm,AE )\ - void nm::DeleteAndDestroy( USHORT nP, USHORT nL ) { \ + void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \ if( nL ) {\ DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ - for( USHORT n=nP; n < nP + nL; n++ ) \ + for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ DBG_ERROR("Das Element der Liste wurde nicht gelöscht"); \ SvPtrarr::Remove( nP, nL ); \ } \ @@ -72,8 +72,8 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM : SimpleCommunicationLinkViaSocket( pMan, pSocket ) , nConnectionClosedEventId( 0 ) , nDataReceivedEventId( 0 ) -, bShutdownStarted( FALSE ) -, bDestroying( FALSE ) +, bShutdownStarted( sal_False ) +, bDestroying( sal_False ) { SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl )); if ( !pMPostUserEvent ) @@ -87,7 +87,7 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM CommunicationLinkViaSocket::~CommunicationLinkViaSocket() { - bDestroying = TRUE; + bDestroying = sal_True; StopCommunication(); while ( nConnectionClosedEventId || nDataReceivedEventId ) GetpApp()->Yield(); @@ -116,7 +116,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket() } } -BOOL CommunicationLinkViaSocket::ShutdownCommunication() +sal_Bool CommunicationLinkViaSocket::ShutdownCommunication() { if ( isRunning() ) { @@ -144,10 +144,10 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication() join(); } - return TRUE; + return sal_True; } -BOOL CommunicationLinkViaSocket::StopCommunication() +sal_Bool CommunicationLinkViaSocket::StopCommunication() { if ( !bShutdownStarted ) { @@ -156,7 +156,7 @@ BOOL CommunicationLinkViaSocket::StopCommunication() else { WaitForShutdown(); - return TRUE; + return sal_True; } } @@ -176,7 +176,7 @@ void CommunicationLinkViaSocket::WaitForShutdown() aShutdownTimer.SetTimeout( 30000 ); // Should be 30 Seconds aShutdownTimer.SetTimeoutHdl( LINK( this, CommunicationLinkViaSocket, ShutdownLink ) ); aShutdownTimer.Start(); - bShutdownStarted = TRUE; + bShutdownStarted = sal_True; } if ( bDestroying ) { @@ -190,14 +190,14 @@ void CommunicationLinkViaSocket::WaitForShutdown() } } -BOOL CommunicationLinkViaSocket::IsCommunicationError() +sal_Bool CommunicationLinkViaSocket::IsCommunicationError() { return !isRunning() || SimpleCommunicationLinkViaSocket::IsCommunicationError(); } void CommunicationLinkViaSocket::run() { - BOOL bWasError = FALSE; + sal_Bool bWasError = sal_False; while ( schedule() && !bWasError && GetStreamSocket() ) { if ( bWasError |= !DoReceiveDataStream() ) @@ -226,10 +226,10 @@ void CommunicationLinkViaSocket::run() } } -BOOL CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) +sal_Bool CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) { if ( !isRunning() ) - return FALSE; + return sal_False; return SimpleCommunicationLinkViaSocket::DoTransferDataStream( pDataStream, nProtocol ); } @@ -263,9 +263,9 @@ IMPL_LINK( CommunicationLinkViaSocket, PutDataReceivedHdl, CommunicationLinkViaS -MultiCommunicationManager::MultiCommunicationManager( BOOL bUseMultiChannel ) +MultiCommunicationManager::MultiCommunicationManager( sal_Bool bUseMultiChannel ) : CommunicationManager( bUseMultiChannel ) -, bGracefullShutdown( TRUE ) +, bGracefullShutdown( sal_True ) { ActiveLinks = new CommunicationLinkList; InactiveLinks = new CommunicationLinkList; @@ -280,8 +280,8 @@ MultiCommunicationManager::~MultiCommunicationManager() Timer aTimeout; aTimeout.SetTimeout( 40000 ); aTimeout.Start(); - USHORT nLinkCount = 0; - USHORT nNewLinkCount = 0; + sal_uInt16 nLinkCount = 0; + sal_uInt16 nNewLinkCount = 0; while ( aTimeout.IsActive() ) { GetpApp()->Yield(); @@ -298,7 +298,7 @@ MultiCommunicationManager::~MultiCommunicationManager() // Alles weghauen, was nicht rechtzeitig auf die Bäume gekommen ist // Was bei StopCommunication übrig geblieben ist, da es sich asynchron austragen wollte - USHORT i = ActiveLinks->Count(); + sal_uInt16 i = ActiveLinks->Count(); while ( i-- ) { CommunicationLinkRef rTempLink = ActiveLinks->GetObject( i ); @@ -321,12 +321,12 @@ MultiCommunicationManager::~MultiCommunicationManager() delete InactiveLinks; } -BOOL MultiCommunicationManager::StopCommunication() +sal_Bool MultiCommunicationManager::StopCommunication() { // Alle Verbindungen abbrechen // ConnectionClosed entfernt die Links aus der Liste. Je nach Implementation syncron // oder asyncron. Daher Von oben nach unten Abräumen, so daß sich nichts verschiebt. - USHORT i = ActiveLinks->Count(); + sal_uInt16 i = ActiveLinks->Count(); int nFail = 0; while ( i ) { @@ -338,20 +338,20 @@ BOOL MultiCommunicationManager::StopCommunication() return nFail == 0; } -BOOL MultiCommunicationManager::IsLinkValid( CommunicationLink* pCL ) +sal_Bool MultiCommunicationManager::IsLinkValid( CommunicationLink* pCL ) { if ( ActiveLinks->Seek_Entry( pCL ) ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -USHORT MultiCommunicationManager::GetCommunicationLinkCount() +sal_uInt16 MultiCommunicationManager::GetCommunicationLinkCount() { return ActiveLinks->Count(); } -CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( USHORT nNr ) +CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( sal_uInt16 nNr ) { return ActiveLinks->GetObject( nNr ); } @@ -371,7 +371,7 @@ void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) CommunicationManager::CallConnectionClosed( pCL ); - USHORT nPos; + sal_uInt16 nPos; if ( ActiveLinks->Seek_Entry( pCL, &nPos ) ) { InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL); // Ohne Reference @@ -382,13 +382,13 @@ void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) bIsCommunicationRunning = ActiveLinks->Count() > 0; // delete pCL; #if OSL_DEBUG_LEVEL > 1 - rHold->bFlag = TRUE; + rHold->bFlag = sal_True; #endif } void MultiCommunicationManager::DestroyingLink( CommunicationLink *pCL ) { - USHORT nPos; + sal_uInt16 nPos; if ( InactiveLinks->Seek_Entry( pCL, &nPos ) ) InactiveLinks->Remove( nPos ); pCL->InvalidateManager(); @@ -396,7 +396,7 @@ void MultiCommunicationManager::DestroyingLink( CommunicationLink *pCL ) -CommunicationManagerClient::CommunicationManagerClient( BOOL bUseMultiChannel ) +CommunicationManagerClient::CommunicationManagerClient( sal_Bool bUseMultiChannel ) : MultiCommunicationManager( bUseMultiChannel ) { ByteString aApplication("Something inside "); @@ -406,7 +406,7 @@ CommunicationManagerClient::CommunicationManagerClient( BOOL bUseMultiChannel ) -CommunicationManagerServerViaSocket::CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel ) +CommunicationManagerServerViaSocket::CommunicationManagerServerViaSocket( sal_uLong nPort, sal_uInt16 nMaxCon, sal_Bool bUseMultiChannel ) : CommunicationManagerServer( bUseMultiChannel ) , nPortToListen( nPort ) , nMaxConnections( nMaxCon ) @@ -419,15 +419,15 @@ CommunicationManagerServerViaSocket::~CommunicationManagerServerViaSocket() StopCommunication(); } -BOOL CommunicationManagerServerViaSocket::StartCommunication() +sal_Bool CommunicationManagerServerViaSocket::StartCommunication() { if ( !pAcceptThread ) pAcceptThread = new CommunicationManagerServerAcceptThread( this, nPortToListen, nMaxConnections ); - return TRUE; + return sal_True; } -BOOL CommunicationManagerServerViaSocket::StopCommunication() +sal_Bool CommunicationManagerServerViaSocket::StopCommunication() { // Erst den Acceptor anhalten delete pAcceptThread; @@ -444,7 +444,7 @@ void CommunicationManagerServerViaSocket::AddConnection( CommunicationLink *pNew } -CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon ) +CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon ) : pMyServer( pServer ) , pAcceptorSocket( NULL ) , nPortToListen( nPort ) @@ -575,14 +575,14 @@ IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYAR } -CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel ) +CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel ) : CommunicationManagerClient( bUseMultiChannel ) , aHostToTalk( aHost ) , nPortToTalk( nPort ) { } -CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( BOOL bUseMultiChannel ) +CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel ) : CommunicationManagerClient( bUseMultiChannel ) , aHostToTalk( "" ) , nPortToTalk( 0 ) diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx index 8393019d1605..bf4d35626102 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.hxx @@ -54,10 +54,10 @@ class MyBasic; class ErrorEntry { public: - ErrorEntry(ULONG nNr, String aStr = String()) : nError(nNr),aText(aStr),nLine(0),nCol1(0),nCol2(0) {} - ErrorEntry(ULONG nNr, String aStr, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 ) + ErrorEntry(sal_uLong nNr, String aStr = String()) : nError(nNr),aText(aStr),nLine(0),nCol1(0),nCol2(0) {} + ErrorEntry(sal_uLong nNr, String aStr, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 ) : nError(nNr),aText(aStr),nLine(l),nCol1(c1),nCol2(c2) {} - ULONG nError; + sal_uLong nError; String aText; xub_StrLen nLine; xub_StrLen nCol1; @@ -68,7 +68,7 @@ SV_DECL_PTRARR_DEL(CErrors, ErrorEntry*, 1, 1) struct ControlDefLoad { const char* Kurzname; - ULONG nUId; + sal_uLong nUId; }; class TestToolObj: public SbxObject @@ -80,24 +80,24 @@ public: TestToolObj( String aName, MyBasic* pBas ); // Pfade aus INI, IPC benutzen ~TestToolObj(); void LoadIniFile(); // Laden der IniEinstellungen, die durch den ConfigDialog geändert werden können - void DebugFindNoErrors( BOOL bDebugFindNoErrors ); + void DebugFindNoErrors( sal_Bool bDebugFindNoErrors ); private: - BOOL bWasPrecompilerError; // True wenn beim letzten Precompile ein Fehler auftrat - BOOL CError( ULONG, const String&, xub_StrLen, xub_StrLen, xub_StrLen ); + sal_Bool bWasPrecompilerError; // True wenn beim letzten Precompile ein Fehler auftrat + sal_Bool CError( sal_uLong, const String&, xub_StrLen, xub_StrLen, xub_StrLen ); void CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrLen &l, xub_StrLen &c ); xub_StrLen ImplSearch( const String &aSource, const xub_StrLen nStart, const xub_StrLen nEnd, const String &aSearch, const xub_StrLen nSearchStart = 0 ); - xub_StrLen PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, USHORT &nLabelCount ); + xub_StrLen PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, sal_uInt16 &nLabelCount ); void PreCompileDispatchParts( String &aSource, String aStart, String aEnd, String aFinalLable ); public: String GetRevision(String const &aSourceIn); // find Revision in the sourcecode String PreCompile(String const &aSourceIn); // try catch; testcase endcase .. - BOOL WasPrecompilerError(); // True wenn beim letzten Precompile ein Fehler auftrat + sal_Bool WasPrecompilerError(); // True wenn beim letzten Precompile ein Fehler auftrat void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); virtual SbxVariable* Find( const String&, SbxClassType ); // String aKeyPlusClasses; // Pfad für keycodes & classes & res_type (Aus Configdatei) DECL_LINK( ReturnResultsLink, CommunicationLink* ); - BOOL ReturnResults( SvStream *pIn ); // Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt + sal_Bool ReturnResults( SvStream *pIn ); // Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt void SetLogHdl( const Link& rLink ) { aLogHdl = rLink; } const Link& GetLogHdl() const { return aLogHdl; } @@ -119,25 +119,25 @@ public: private: ImplTestToolObj *pImpl; // Alles was von der Implementation abhängt static const CErrors* GetFehlerListe() { return pFehlerListe; } - BOOL bUseIPC; + sal_Bool bUseIPC; Link aLogHdl; // Zum Logen der Fehlermeldungen im Testtool Link aWinInfoHdl; // Anzeigen der Windows/Controls der zu testenden App Link aModuleWinExistsHdl; // Prüft ob das Modul schon im Editor geladen ist Link aCErrorHdl; // Melden von Compilererror Link aWriteStringHdl; // Schreiben von text (e.g. MakroRecorder) - BOOL bReturnOK; // Bricht WaitForAnswer ab + sal_Bool bReturnOK; // Bricht WaitForAnswer ab CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung - ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren + sal_uLong nSequence; // Sequence um Antwort und Anfrage zu syncronisieren rtl::OString aNextReturnId; // Id des Returnwertes i.e. UId void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder -#define FLAT TRUE +#define FLAT sal_True String ProgPath; // Dateiname der zu Testenden APP; Gesetzt über Start String aLogFileName; // Momentaner Logfilename (Wie Programmdatei aber mit .res) - BOOL IsBlock; // Innerhalb Begin/EndBlock - BOOL SingleCommandBlock; // Implizit um jedes kommando ein Begin/EndBlock + sal_Bool IsBlock; // Innerhalb Begin/EndBlock + sal_Bool SingleCommandBlock; // Implizit um jedes kommando ein Begin/EndBlock CmdStream *In; void AddName(String &aBisher, String &aNeu ); // Name eventuell mit / anhängen @@ -151,31 +151,31 @@ private: CNames *m_pReverseUIds; // Langnamen nach Nummer - USHORT nMyVar; // Wievielte Var aus Pool ist dran + sal_uInt16 nMyVar; // Wievielte Var aus Pool ist dran void InitTestToolObj(); CommunicationManagerClientViaSocketTT *pCommunicationManager; void SendViaSocket(); - BOOL Load( String aFileName, SbModule *pMod ); + sal_Bool Load( String aFileName, SbModule *pMod ); - void ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, BOOL bIsFlat = FALSE ); - void ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ); - BOOL ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls ); - BOOL WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls ); + void ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, sal_Bool bIsFlat = sal_False ); + void ReadFlat( String Filename, CNames *&pNames, sal_Bool bSortByName ); + sal_Bool ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls ); + sal_Bool WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls ); void ReadHidLstByNumber(); - void SortControlsByNumber( BOOL bIncludeActive = FALSE ); + void SortControlsByNumber( sal_Bool bIncludeActive = sal_False ); - String GetMethodName( ULONG nMethodId ); - String GetKeyName( USHORT nKeyCode ); + String GetMethodName( sal_uLong nMethodId ); + String GetKeyName( sal_uInt16 nKeyCode ); void WaitForAnswer (); DECL_LINK( IdleHdl, Application* ); DECL_LINK( CallDialogHandler, Application* ); String aDialogHandlerName; - USHORT nWindowHandlerCallLevel; + sal_uInt16 nWindowHandlerCallLevel; - USHORT nIdleCount; + sal_uInt16 nIdleCount; // wenn DialogHandler gesetzt wird er im IdleHandler inkrementiert und // in WaitForAnswer rückgesetzt. Übersteigt er einen gewissen wert, gehe ich davon aus, // daß WaitForAnswer still ligt und rufe die DialogHander Sub im BASIC auf. @@ -183,7 +183,7 @@ private: void BeginBlock(); void EndBlock(); - SbTextType GetSymbolType( const String &rSymbol, BOOL bWasControl ); + SbTextType GetSymbolType( const String &rSymbol, sal_Bool bWasControl ); static ControlDefLoad const arR_Cmds[]; static CNames *pRCommands; diff --git a/automation/source/inc/testtool.hxx b/automation/source/inc/testtool.hxx index 33c9e225b684..9454f57f05f7 100644 --- a/automation/source/inc/testtool.hxx +++ b/automation/source/inc/testtool.hxx @@ -46,9 +46,9 @@ class ImplRemoteControl { friend class StatementFlow; - BOOL m_bIdleInserted; + sal_Bool m_bIdleInserted; AutoTimer m_aIdleTimer; - BOOL m_bInsideExecutionLoop; + sal_Bool m_bInsideExecutionLoop; #if OSL_DEBUG_LEVEL > 1 EditWindow *m_pDbgWin; #endif @@ -56,7 +56,7 @@ class ImplRemoteControl public: ImplRemoteControl(); ~ImplRemoteControl(); - BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); + sal_Bool QueCommands( sal_uLong nServiceId, SvStream *pIn ); SvStream* GetReturnStream(); DECL_LINK( IdleHdl, Application* ); diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx index f00917e6d2e5..67476c09bf6a 100644 --- a/automation/source/miniapp/editwin.cxx +++ b/automation/source/miniapp/editwin.cxx @@ -35,13 +35,13 @@ #endif -BOOL GHEditWindow::Close() +sal_Bool GHEditWindow::Close() { if (aInhalt.IsModified()) { } delete(this); - return TRUE; + return sal_True; } void GHEditWindow::Resize() @@ -65,7 +65,7 @@ void GHEditWindow::Clear() aInhalt.SetText(String()); } -void GHEditWindow::AddText( String aNew, BOOL bMoveToEnd) +void GHEditWindow::AddText( String aNew, sal_Bool bMoveToEnd) { String aOld = aInhalt.GetText(); @@ -111,11 +111,11 @@ void EditFileWindow::LoadFile() All.ConvertLineEnd(); - AddText(All,FALSE); + AddText(All,sal_False); } -BOOL EditFileWindow::Close() +sal_Bool EditFileWindow::Close() { if (aInhalt.IsModified() && QueryBox(this,WB_DEF_YES | WB_YES_NO_CANCEL, String(aFileName).AppendAscii("\nhas been changed.\n\nSave file?")).Execute()) diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx index 8fbf04227382..9547695fcc9d 100644 --- a/automation/source/miniapp/editwin.hxx +++ b/automation/source/miniapp/editwin.hxx @@ -40,7 +40,7 @@ protected: MultiLineEdit aInhalt; - virtual BOOL Close(); // derived + virtual sal_Bool Close(); // derived void Resize(); public: @@ -49,7 +49,7 @@ public: GHEditWindow(Window * pParent, String aName = CUniString("Neues Fenster"), WinBits iWstyle = WB_STDWORK); void Clear(); - void AddText( String aNew, BOOL bMoveToEnd = TRUE); + void AddText( String aNew, sal_Bool bMoveToEnd = sal_True); }; @@ -58,7 +58,7 @@ class EditFileWindow : public GHEditWindow { String aFileName; - virtual BOOL Close(); // derived + virtual sal_Bool Close(); // derived void LoadFile(); public: diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx index a708e026a2a6..f01d5d8c79b1 100644 --- a/automation/source/miniapp/servres.cxx +++ b/automation/source/miniapp/servres.cxx @@ -34,7 +34,7 @@ #include "servres.hxx" -ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, BOOL bFreeRes ) +ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes ) : ModalDialog( pParent, rResId ), aCheckBox1( this, ResId( 1, *rResId.GetResMgr() ) ), aTriStateBox1( this, ResId( 1, *rResId.GetResMgr() ) ), @@ -52,7 +52,7 @@ ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, cons if( bFreeRes ) FreeResource(); } -MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, BOOL ) +MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, sal_Bool ) : MenuBar( rResId ) { // No subresources, automatic free resource diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx index 848779a39fa7..9262b50d946a 100644 --- a/automation/source/miniapp/servres.hxx +++ b/automation/source/miniapp/servres.hxx @@ -69,13 +69,13 @@ protected: DateBox aDateBox1; FixedText aFixedText1; public: - ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, BOOL bFreeRes = TRUE ); + ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes = sal_True ); }; class MenuMENU_CLIENT : public MenuBar { protected: public: - MenuMENU_CLIENT( const ResId & rResId, BOOL bFreeRes = TRUE ); + MenuMENU_CLIENT( const ResId & rResId, sal_Bool bFreeRes = sal_True ); }; diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index eec1d8ac837b..6711ffe8b333 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.cxx @@ -97,11 +97,11 @@ void MainWindow::TestGross() } -BOOL MainWindow::Close() +sal_Bool MainWindow::Close() { WorkWindow::Close(); FileExit(); - return TRUE; + return sal_True; } void MainWindow::FileExit() @@ -113,7 +113,7 @@ void MainWindow::FileExit() } -void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent) +void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, sal_uInt16 Indent) { String sIndent,aText; sIndent.Expand(5*Indent); @@ -125,7 +125,7 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent) // FIXME: HELPID aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String(rtl::OStringToOUString(pBase->GetHelpId(), RTL_TEXTENCODING_UTF8))).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n")); - USHORT i; + sal_uInt16 i; for (i = 0 ; i < pBase->GetChildCount() ; i++) { Tree(aEditWin,pBase->GetChild(i),Indent+1); @@ -240,7 +240,7 @@ void MyApp::Property( ApplicationProperty& rProp ) } -USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT nMode) +sal_uInt16 MyDispatcher::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs, sal_uInt16 nMode) { (void) ppArgs; /* avoid warning about unused parameter */ (void) nMode; /* avoid warning about unused parameter */ diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx index 31a480a0173e..a3c33ed359d3 100644 --- a/automation/source/miniapp/testapp.hxx +++ b/automation/source/miniapp/testapp.hxx @@ -75,12 +75,12 @@ class MainWindow : public WorkWindow public: MainWindow(MyApp *pAppl); - virtual BOOL Close(); // derived + virtual sal_Bool Close(); // derived void FileExit(); void FileOpen(); void TestGross(); - void Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent); + void Tree(GHEditWindow *aEditWin, Window *pBase, sal_uInt16 Indent); void WinTree(); void SysDlg(); DECL_LINK(MenuSelectHdl,MenuBar*); @@ -94,8 +94,8 @@ class MyDispatcher public: MyDispatcher(MainWindow *MainWin) : pMainWin(MainWin) {}; virtual ~MyDispatcher() {}; - virtual USHORT ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs = 0, USHORT nMode = 0); - virtual void SetExecuteMode( USHORT nMode ) + virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs = 0, sal_uInt16 nMode = 0); + virtual void SetExecuteMode( sal_uInt16 nMode ) { (void) nMode; /* avoid warning about unused parameter */ }; // Ist hier sowieso egal diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index e07f1654ecd5..3e3054bb9073 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.cxx @@ -90,9 +90,9 @@ void SAL_CALL SVInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw (::com::s sal_Int32 SAL_CALL SVInputStream::available( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { - ULONG nCurrent = pStream->Tell(); - ULONG nSize = pStream->Seek( STREAM_SEEK_TO_END ); - ULONG nAvailable = nSize - nCurrent; + sal_uLong nCurrent = pStream->Tell(); + sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END ); + sal_uLong nAvailable = nSize - nCurrent; pStream->Seek( nCurrent ); return nAvailable; } @@ -161,8 +161,8 @@ class ElementNode : public Node public: ElementNode( const String& aName, Reference < XAttributeList > xAttributes ); void AppendNode( NodeRef xNewNode ); - ULONG GetChildCount(){ return aDocumentNodeList.Count(); } - NodeRef GetChild( USHORT nIndex ){ return aDocumentNodeList.GetObject( nIndex ); } + sal_uLong GetChildCount(){ return aDocumentNodeList.Count(); } + NodeRef GetChild( sal_uInt16 nIndex ){ return aDocumentNodeList.GetObject( nIndex ); } Reference < XAttributeList > GetAttributes(){ return xAttributeList; } String GetNodeName() { return aNodeName; } @@ -209,7 +209,7 @@ class SAXParser : public cppu::WeakImplHelper2< XErrorHandler, XDocumentHandler NodeRef xTreeRoot; NodeRef xCurrentNode; - ULONG nTimestamp; + sal_uLong nTimestamp; ParseAction aAction; public: @@ -220,11 +220,11 @@ public: NodeRef GetCurrentNode(){ return xCurrentNode; } void SetCurrentNode( NodeRef xCurrent ){ xCurrentNode = xCurrent; } NodeRef GetRootNode(){ return xTreeRoot; } - ULONG GetTimestamp(){ return nTimestamp; } + sal_uLong GetTimestamp(){ return nTimestamp; } void Touch(){ nTimestamp = Time::GetSystemTicks(); } // Methods SAXParser - BOOL Parse( ParseAction aAct ); + sal_Bool Parse( ParseAction aAct ); String GetErrors(){ return aErrors; } // Methods XErrorHandler @@ -255,13 +255,13 @@ SAXParser::~SAXParser() xParser.clear(); } -BOOL SAXParser::Parse( ParseAction aAct ) +sal_Bool SAXParser::Parse( ParseAction aAct ) { aAction = aAct; Touch(); SvStream* pStream = new SvFileStream( aFilename, STREAM_STD_READ ); if ( pStream->GetError() ) - return FALSE; + return sal_False; InputSource sSource; sSource.aInputStream = new SVInputStream( pStream ); // is refcounted and hence deletet appropriately @@ -297,8 +297,8 @@ BOOL SAXParser::Parse( ParseAction aAct ) xParser->setDocumentHandler( NULL ); // otherwile Object holds itself } else - return FALSE; - return TRUE; + return sal_False; + return sal_True; } @@ -366,13 +366,13 @@ void SAXParser::characters( const ::rtl::OUString& aChars ) throw (::com::sun::s { if ( aAction == COLLECT_DATA_IGNORE_WHITESPACE ) { // check for whitespace - BOOL bAllWhitespace = TRUE; + sal_Bool bAllWhitespace = sal_True; for ( int i = 0 ; bAllWhitespace && i < aChars.getLength() ; i++ ) if ( aChars[i] != 10 // LF && aChars[i] != 13 // CR && aChars[i] != ' ' // Blank && aChars[i] != '\t' ) // Tab - bAllWhitespace = FALSE; + bAllWhitespace = sal_False; if ( bAllWhitespace ) return; } @@ -577,7 +577,7 @@ void StatementCommand::HandleSAXParser() case RC_SAXHasElement: // Number or String { - BOOL bCheckOnly = nMethodId == RC_SAXHasElement; + sal_Bool bCheckOnly = nMethodId == RC_SAXHasElement; if( (nParams & PARAM_USHORT_1) && !(nParams & PARAM_STR_1) ) { @@ -600,14 +600,14 @@ void StatementCommand::HandleSAXParser() if ( aString1.EqualsAscii( "/" ) ) { if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)TRUE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)sal_True ); else pSAXParser->SetCurrentNode( pSAXParser->GetRootNode() ); } else if ( aString1.Copy(0,2).EqualsAscii( "*:" ) ) { - ULONG nTimestamp = (ULONG)aString1.GetToken( 1, ':' ).ToInt64(); - ULONG nPointer = (ULONG)aString1.GetToken( 2, ':' ).ToInt64(); + sal_uLong nTimestamp = (sal_uLong)aString1.GetToken( 1, ':' ).ToInt64(); + sal_uLong nPointer = (sal_uLong)aString1.GetToken( 2, ':' ).ToInt64(); if ( bCheckOnly ) pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) ); else @@ -623,13 +623,13 @@ void StatementCommand::HandleSAXParser() } else if ( pElementNode ) { - USHORT nNthOccurance; + sal_uInt16 nNthOccurance; if( (nParams & PARAM_USHORT_1) ) nNthOccurance = nNr1; else nNthOccurance = 1; - USHORT i; + sal_uInt16 i; NodeRef xNew; for ( i = 0 ; i < pElementNode->GetChildCount() && !xNew.Is() ; i++ ) { @@ -661,7 +661,7 @@ void StatementCommand::HandleSAXParser() } else if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)FALSE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)sal_False ); else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); } @@ -678,7 +678,7 @@ void StatementCommand::HandleSAXParser() aPath.AppendAscii( ":" ); NodeRef xNode=pSAXParser->GetCurrentNode(); Node* pNode = (Node*)(&xNode); - aPath.Append( String::CreateFromInt64( (ULONG)pNode ) ); + aPath.Append( String::CreateFromInt64( (sal_uLong)pNode ) ); pRet->GenReturn ( RET_Value, nMethodId, aPath ); } break; diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 7f867c3a997c..b17bf66c0597 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -118,7 +118,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG { Write(comm_USHORT(SIReturn)); Write(nRet); - Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } @@ -127,7 +127,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_Strin { Write(comm_USHORT(SIReturn)); Write(nRet); - Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } @@ -136,7 +136,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL { Write(comm_USHORT(SIReturn)); Write(nRet); - Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } @@ -145,7 +145,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHOR { Write(comm_USHORT(SIReturn)); Write(nRet); - Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nNr); } diff --git a/automation/source/server/editwin.cxx b/automation/source/server/editwin.cxx index 0bcb35a8b306..b1897152a337 100644 --- a/automation/source/server/editwin.cxx +++ b/automation/source/server/editwin.cxx @@ -62,14 +62,14 @@ void ImpWorkWindow::Resize() m_aInhalt.SetPosSizePixel( Point(), GetOutputSizePixel() ); } -BOOL EditWindow::Close() +sal_Bool EditWindow::Close() { if ( pImpWorkWindow ) { delete pImpWorkWindow; pImpWorkWindow = NULL; } - return TRUE; + return sal_True; } void EditWindow::Show() @@ -77,7 +77,7 @@ void EditWindow::Show() if ( Check() ) pImpWorkWindow->Show(); else - bShowWin = TRUE; + bShowWin = sal_True; } void EditWindow::Hide() @@ -85,7 +85,7 @@ void EditWindow::Hide() if ( Check() ) pImpWorkWindow->Hide(); else - bShowWin = FALSE; + bShowWin = sal_False; } EditWindow::EditWindow( WorkWindow *pParent, const String &rName, WinBits iWstyle ) @@ -94,7 +94,7 @@ EditWindow::EditWindow( WorkWindow *pParent, const String &rName, WinBits iWstyl , aMemName(rName) , iMemWstyle(iWstyle) , nTextLen(0) -, bQuiet(FALSE) +, bQuiet(sal_False) { } @@ -103,7 +103,7 @@ EditWindow::~EditWindow() Close(); } -BOOL EditWindow::Check() +sal_Bool EditWindow::Check() { if ( ! pImpWorkWindow && Application::IsInExecute() ) { @@ -113,7 +113,7 @@ BOOL EditWindow::Check() aMemPreWinText.Erase(); if ( bShowWin ) pImpWorkWindow->Show(); - return TRUE; + return sal_True; } return pImpWorkWindow != NULL; } diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx index 021982333d39..d02e96276507 100644 --- a/automation/source/server/editwin.hxx +++ b/automation/source/server/editwin.hxx @@ -43,14 +43,14 @@ class EditWindow { protected: ImpWorkWindow *pImpWorkWindow; - BOOL check(); + sal_Bool check(); WorkWindow *pMemParent; String aMemName; WinBits iMemWstyle; String aMemPreWinText; - BOOL bShowWin; + sal_Bool bShowWin; xub_StrLen nTextLen; // aus Performanzgründen eigene Länge mitführen @@ -64,9 +64,9 @@ public: void AddText( const String &rNew ); void AddText( const sal_Char* rNew ); - virtual BOOL Close(); // derived - BOOL bQuiet; - BOOL Check(); + virtual sal_Bool Close(); // derived + sal_Bool bQuiet; + sal_Bool Check(); }; #endif diff --git a/automation/source/server/prof_nul.cxx b/automation/source/server/prof_nul.cxx index c8f70eb06821..314b2d0c41e5 100644 --- a/automation/source/server/prof_nul.cxx +++ b/automation/source/server/prof_nul.cxx @@ -82,7 +82,7 @@ String TTProfiler::GetSysdepProfileHeader() // Zustand merken -void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *, USHORT ) +void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *, sal_uInt16 ) {}; diff --git a/automation/source/server/prof_usl.cxx b/automation/source/server/prof_usl.cxx index 91048e0c6c75..cccf196b795b 100644 --- a/automation/source/server/prof_usl.cxx +++ b/automation/source/server/prof_usl.cxx @@ -85,7 +85,7 @@ String TTProfiler::GetSysdepProfileHeader() // Zustand merken -void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT ) +void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, sal_uInt16 ) { SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! if ( aStream.IsOpen() ) @@ -122,8 +122,8 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepPr aProfile += Pad( String::CreateFromInt64(DIFF_MS( pStart, pStop, mprusage.pr_rtime ) / AVER( pStart, pStop, mprusage.pr_count )), 7 ); - ULONG d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime ); - ULONG d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime ); + sal_uLong d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime ); + sal_uLong d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime ); aProfile += Pad( String::CreateFromInt64(d_utime), 7 ); aProfile += Pad( String::CreateFromInt64(d_stime), 7 ); diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx index 150b0d1ec5ef..8bd4e76401fe 100644 --- a/automation/source/server/profiler.cxx +++ b/automation/source/server/profiler.cxx @@ -44,10 +44,10 @@ TTProfiler::TTProfiler() : mpStart( NULL ) , mpEnd( NULL ) -, bIsProfileIntervalStarted( FALSE ) -, bIsProfilingPerCommand( FALSE ) -, bIsPartitioning( FALSE ) -, bIsAutoProfiling( FALSE ) +, bIsProfileIntervalStarted( sal_False ) +, bIsProfilingPerCommand( sal_False ) +, bIsPartitioning( sal_False ) +, bIsAutoProfiling( sal_False ) , pSysDepStatic( NULL ) { InitSysdepProfiler(); @@ -95,13 +95,13 @@ String TTProfiler::GetProfileHeader() } -void TTProfiler::StartProfileInterval( BOOL bReadAnyway ) +void TTProfiler::StartProfileInterval( sal_Bool bReadAnyway ) { if ( !bIsProfileIntervalStarted || bReadAnyway ) { GetProfileSnapshot( mpStart ); GetSysdepProfileSnapshot( mpStart->pSysdepProfileSnapshot, PROFILE_START ); - bIsProfileIntervalStarted = TRUE; + bIsProfileIntervalStarted = sal_True; } } @@ -109,10 +109,10 @@ String TTProfiler::GetProfileLine( ProfileSnapshot *pStart, ProfileSnapshot *pEn { String aProfileString; - aProfileString += Pad(GetpApp()->GetAppLocaleDataWrapper().getDuration( DIFF( pStart, pEnd, aTime) , TRUE, TRUE ), 12); + aProfileString += Pad(GetpApp()->GetAppLocaleDataWrapper().getDuration( DIFF( pStart, pEnd, aTime) , sal_True, sal_True ), 12); - ULONG nProcessTicks = DIFF( pStart, pEnd, nProcessTicks ); - ULONG nSystemTicks = DIFF( pStart, pEnd, nSystemTicks ); + sal_uLong nProcessTicks = DIFF( pStart, pEnd, nProcessTicks ); + sal_uLong nSystemTicks = DIFF( pStart, pEnd, nSystemTicks ); if ( nSystemTicks ) { aProfileString += Pad(UniString::CreateFromInt32( (100 * nProcessTicks) / nSystemTicks ), 11); @@ -147,7 +147,7 @@ void TTProfiler::EndProfileInterval() { GetProfileSnapshot( mpEnd ); GetSysdepProfileSnapshot( mpEnd->pSysdepProfileSnapshot, PROFILE_END ); - bIsProfileIntervalStarted = FALSE; + bIsProfileIntervalStarted = sal_False; } @@ -161,32 +161,32 @@ void TTProfiler::GetProfileSnapshot( ProfileSnapshot *pProfileSnapshot ) void TTProfiler::StartProfilingPerCommand() // Jeden Befehl mitschneiden { - bIsProfilingPerCommand = TRUE; + bIsProfilingPerCommand = sal_True; } void TTProfiler::StopProfilingPerCommand() { - bIsProfilingPerCommand = FALSE; + bIsProfilingPerCommand = sal_False; } void TTProfiler::StartPartitioning() { - bIsPartitioning = TRUE; + bIsPartitioning = sal_True; } void TTProfiler::StopPartitioning() { - bIsPartitioning = TRUE; + bIsPartitioning = sal_True; } -ULONG TTProfiler::GetPartitioningTime() +sal_uLong TTProfiler::GetPartitioningTime() { return DIFF( mpStart, mpEnd, nSystemTicks ); } -void TTProfiler::StartAutoProfiling( ULONG nMSec ) +void TTProfiler::StartAutoProfiling( sal_uLong nMSec ) { if ( !bIsAutoProfiling ) { @@ -197,7 +197,7 @@ void TTProfiler::StartAutoProfiling( ULONG nMSec ) GetProfileSnapshot( pAutoStart ); GetSysdepProfileSnapshot( pAutoStart->pSysdepProfileSnapshot, PROFILE_START ); SetTimeout( nMSec ); - bIsAutoProfiling = TRUE; + bIsAutoProfiling = sal_True; Start(); } @@ -234,14 +234,14 @@ void TTProfiler::StopAutoProfiling() if ( bIsAutoProfiling ) { Stop(); - bIsAutoProfiling = FALSE; + bIsAutoProfiling = sal_False; } } -//String TTProfiler::Hex( ULONG nNr ) -String TTProfiler::Dec( ULONG nNr ) +//String TTProfiler::Hex( sal_uLong nNr ) +String TTProfiler::Dec( sal_uLong nNr ) { String aRet(UniString::CreateFromInt32(nNr)); if ( nNr < 100 ) diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx index e5c3b6d02a15..3903ac5fee42 100644 --- a/automation/source/server/profiler.hxx +++ b/automation/source/server/profiler.hxx @@ -47,8 +47,8 @@ struct ProfileSnapshot { Time aTime; SysdepProfileSnapshot *pSysdepProfileSnapshot; - ULONG nProcessTicks; - ULONG nSystemTicks; + sal_uLong nProcessTicks; + sal_uLong nSystemTicks; }; @@ -59,24 +59,24 @@ public: ~TTProfiler(); String GetProfileHeader(); // Titelzeile für Logdatei - void StartProfileInterval( BOOL bReadAnyway = FALSE ); // Zustand merken + void StartProfileInterval( sal_Bool bReadAnyway = sal_False ); // Zustand merken void EndProfileInterval(); // Informationszeile zusammenbauen String GetProfileLine( String &aPrefix ); void StartProfilingPerCommand(); // Jeden Befehl mitschneiden void StopProfilingPerCommand(); - BOOL IsProfilingPerCommand() { return bIsProfilingPerCommand; } + sal_Bool IsProfilingPerCommand() { return bIsProfilingPerCommand; } void StartPartitioning(); void StopPartitioning(); - BOOL IsPartitioning() { return bIsPartitioning; } - ULONG GetPartitioningTime(); + sal_Bool IsPartitioning() { return bIsPartitioning; } + sal_uLong GetPartitioningTime(); - void StartAutoProfiling( ULONG nMSec ); // Automatisch alle nMSec Milisekunden sampeln + void StartAutoProfiling( sal_uLong nMSec ); // Automatisch alle nMSec Milisekunden sampeln String GetAutoProfiling(); // Aktuelle `Sammlung` abholen void StopAutoProfiling(); // Sampeln beenden - BOOL IsAutoProfiling() { return bIsAutoProfiling; } + sal_Bool IsAutoProfiling() { return bIsAutoProfiling; } private: @@ -88,20 +88,20 @@ private: ProfileSnapshot *mpStart; ProfileSnapshot *mpEnd; - BOOL bIsProfileIntervalStarted; + sal_Bool bIsProfileIntervalStarted; // - BOOL bIsProfilingPerCommand; - BOOL bIsPartitioning; + sal_Bool bIsProfilingPerCommand; + sal_Bool bIsPartitioning; // Für das Automatische Profiling in festen Intervallen ProfileSnapshot *pAutoStart; ProfileSnapshot *pAutoEnd; - BOOL bIsAutoProfiling; + sal_Bool bIsAutoProfiling; String aAutoProfileBuffer; virtual void Timeout(); @@ -109,8 +109,8 @@ private: // Einige Hilfsfunktionen -// String Hex( ULONG nNr ); - String Dec( ULONG nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen +// String Hex( sal_uLong nNr ); + String Dec( sal_uLong nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen String Pad( const String aS, xub_StrLen nLen ); // Fügt blanks links an den String an /* Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert @@ -129,7 +129,7 @@ private: String GetSysdepProfileHeader(); // Zustand merken - void GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT nMode = PROFILE_START | PROFILE_END ); + void GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, sal_uInt16 nMode = PROFILE_START | PROFILE_END ); // Informationszeile zusammenbauen String GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepProfileSnapshot *pStop ); diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index ac0b9db9aaf8..4546ba966a1d 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -56,9 +56,9 @@ MacroRecorder::MacroRecorder() , pActionParent( NULL ) , aKeyUniqueID() , pKeyWin( NULL ) -, bKeyFollowFocus( FALSE ) -, m_bRecord( FALSE ) -, m_bLog( FALSE ) +, bKeyFollowFocus( sal_False ) +, m_bRecord( sal_False ) +, m_bLog( sal_False ) { aHookRefresh.SetTimeout( 500 ); aHookRefresh.SetTimeoutHdl( LINK( this, MacroRecorder, HookRefreshHdl) ); @@ -105,12 +105,12 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG ) return 0; } -void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam ) +void MacroRecorder::LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod, sal_uInt16 nParam ) { ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam ); } -void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ) +void MacroRecorder::LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod ) { ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod ); } @@ -133,13 +133,13 @@ rtl::OString MacroRecorder::GetParentID( Window* pThis ) IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { - BOOL bSendData = FALSE; + sal_Bool bSendData = sal_False; if ( pEvent->ISA( VclWindowEvent ) ) { VclWindowEvent* pWinEvent = ( VclWindowEvent* ) pEvent; Window* pWin = pWinEvent->GetWindow(); - ULONG nEventID = pWinEvent->GetId(); + sal_uLong nEventID = pWinEvent->GetId(); #if OSL_DEBUG_LEVEL > 1 if ( nEventID >= 1001 && nEventID != VCLEVENT_WINDOW_KEYUP ) nEventID = pWinEvent->GetId(); // Just something to set a breakpoint @@ -167,13 +167,13 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { // we cannot access pKeyWin since it might have dissapeared if ( bKeyFollowFocus ) - StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString, bKeyFollowFocus ); + StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString, bKeyFollowFocus ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString ); + StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString ); #if OSL_DEBUG_LEVEL > 1 - StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, String::CreateFromInt32( nEventID ) ); + StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, String::CreateFromInt32( nEventID ) ); #endif - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -182,7 +182,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // cleanup aKeyString.Erase(); pKeyWin = NULL; - bKeyFollowFocus = FALSE; + bKeyFollowFocus = sal_False; } switch ( pWin->GetType() ) @@ -194,7 +194,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -214,7 +214,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -244,7 +244,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -278,7 +278,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -305,7 +305,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) pEditModify = NULL; aEditModifyString.Erase(); - USHORT nPos = ((ComboBox*)pWin)->GetEntryPos(((ComboBox*)pWin)->GetText()); + sal_uInt16 nPos = ((ComboBox*)pWin)->GetEntryPos(((ComboBox*)pWin)->GetText()); if ( m_bRecord ) { if ( nPos == COMBOBOX_ENTRY_NOTFOUND ) @@ -313,7 +313,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) else { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); - bSendData = TRUE; + bSendData = sal_True; } } if ( m_bLog ) @@ -333,7 +333,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) @@ -350,8 +350,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) ButtonDialog* pBD = (ButtonDialog*)pParent; // we have to find the current Button ID ourselves since it is not generated at this point :-( - USHORT nCurrentButtonId = 0xffff; // Some wild value to wak up people - USHORT i; + sal_uInt16 nCurrentButtonId = 0xffff; // Some wild value to wak up people + sal_uInt16 i; for ( i = 0; i < pBD->GetButtonCount() ; i++ ) { if ( pBD->GetPushButton( pBD->GetButtonId(i) ) == pWin ) @@ -377,7 +377,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod ); else StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -385,7 +385,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); - bDone = TRUE; + bDone = sal_True; } } break; @@ -404,12 +404,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); - bDone = TRUE; + bDone = sal_True; } } break; @@ -420,7 +420,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); - bSendData = TRUE; + bSendData = sal_True; } } if ( m_bLog ) @@ -440,10 +440,10 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) ((MoreButton*)pControl)->Click(); break; case M_Open : - ((MoreButton*)pControl)->SetState(TRUE); + ((MoreButton*)pControl)->SetState(sal_True); break; case M_Close : - ((MoreButton*)pControl)->SetState(FALSE); + ((MoreButton*)pControl)->SetState(sal_False); break; default: ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MoreButton" ) ); @@ -481,7 +481,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -503,7 +503,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -518,8 +518,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) aMEvnt = MouseEvent( aPt,1,MOUSE_SIMPLECLICK,MOUSE_LEFT ); ImplMouseButtonDown( pControl, aMEvnt ); - ULONG nStart = Time::GetSystemTicks(); - ULONG nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay(); + sal_uLong nStart = Time::GetSystemTicks(); + sal_uLong nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay(); while ( ( Time::GetSystemTicks() - nStart ) < nDelay + 100 ) SafeReschedule(); @@ -546,7 +546,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) else // access via Toolbox StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) ); - bSendData = TRUE; + bSendData = sal_True; } /* not needed if ( m_bLog ) { @@ -569,8 +569,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); // else // // access via Toolbox -// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit -// bSendData = TRUE; +// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() sal_uLong != comm_ULONG on 64bit +// bSendData = sal_True; // } // if ( m_bLog ) // { @@ -611,21 +611,21 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( !pTB->IsItemEnabled( pTB->GetItemId(nNr1) ) && nMethodId != _M_IsEnabled )\ {\ ReportError( nUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\ - bBool1 = FALSE;\ + bBool1 = sal_False;\ }\ else if ( !pTB->IsItemVisible( pTB->GetItemId(nNr1) ) )\ {\ ReportError( nUId, GEN_RES_STR1( S_BUTTON_HIDDEN_ON_TOOLBOX, MethodString( nMethodId ) ) );\ - bBool1 = FALSE;\ + bBool1 = sal_False;\ }\ else\ {\ if ( pTB->GetItemRect(pTB->GetItemId(nNr1)).IsEmpty() )\ {\ - USHORT nLine = pTB->GetCurLine();\ + sal_uInt16 nLine = pTB->GetCurLine();\ do\ {\ - pTB->ShowLine( FALSE );\ + pTB->ShowLine( sal_False );\ for ( int i = 1 ; i < 30 ; i++ )\ SafeReschedule();\ }\ @@ -635,7 +635,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( pTB->GetItemRect(pTB->GetItemId(nNr1)).IsEmpty() )\ {\ ReportError( nUId, GEN_RES_STR1( S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX, MethodString( nMethodId ) ) );\ - bBool1 = FALSE;\ + bBool1 = sal_False;\ }\ }\ }\ @@ -675,7 +675,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) pKeyWin = pWin; Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) - bKeyFollowFocus = TRUE; + bKeyFollowFocus = sal_True; aKeyUniqueID = pIdWin->GetUniqueOrHelpId(); if ( m_bLog ) { @@ -726,17 +726,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { // case 1 .. 0xffff: DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin ); -// BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode(); +// sal_Bool bx = ((DockingWindow*)pWin)->IsFloatingMode(); // break; /* case M_Dock : if ( ((DockingWindow*)pControl)->IsFloatingMode() ) - ((DockingWindow*)pControl)->SetFloatingMode(FALSE); + ((DockingWindow*)pControl)->SetFloatingMode(sal_False); else ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) ); break; case M_Undock : if ( !((DockingWindow*)pControl)->IsFloatingMode() ) - ((DockingWindow*)pControl)->SetFloatingMode(TRUE); + ((DockingWindow*)pControl)->SetFloatingMode(sal_True); else ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) ); break; @@ -794,7 +794,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) else // access via Toolbox StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetUniqueOrHelpId(), (comm_USHORT)(M_OpenMenu|M_RET_NUM_CONTROL), pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ); - bSendData = TRUE; + bSendData = sal_True; } break; @@ -935,7 +935,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case C_ErrorBox: case C_QueryBox: { - BOOL bDone = TRUE; + sal_Bool bDone = sal_True; MessBox* pMB = (MessBox*)pControl; switch( nEventID ) { @@ -959,7 +959,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) break; default: - bDone = FALSE; + bDone = sal_False; break; } if ( bDone ) @@ -1025,7 +1025,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); - bSendData = TRUE; + bSendData = sal_True; } if ( m_bLog ) { @@ -1087,7 +1087,7 @@ MacroRecorder* MacroRecorder::GetMacroRecorder() return pMacroRecorder; } -BOOL MacroRecorder::HasMacroRecorder() +sal_Bool MacroRecorder::HasMacroRecorder() { ::osl::MutexGuard aGuard( getRecorderMutex() ); return pMacroRecorder != NULL; diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx index 5a409513cacc..cb59f02b76cc 100644 --- a/automation/source/server/recorder.hxx +++ b/automation/source/server/recorder.hxx @@ -52,15 +52,15 @@ private: String aKeyString; rtl::OString aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed Window* pKeyWin; - BOOL bKeyFollowFocus; + sal_Bool bKeyFollowFocus; AutoTimer aHookRefresh; void AddEventHooks(); void RemoveEventHooks(); DECL_LINK( HookRefreshHdl, void* ); - void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT aParam ); - void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ); + void LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod, sal_uInt16 aParam ); + void LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod ); static MacroRecorder *pMacroRecorder; @@ -69,15 +69,15 @@ private: void CheckDelete(); // Actions to perform - BOOL m_bRecord; - BOOL m_bLog; + sal_Bool m_bRecord; + sal_Bool m_bLog; public: - void SetActionRecord( BOOL bRecord = TRUE ) { m_bRecord = bRecord; CheckDelete(); }; - void SetActionLog( BOOL bLog = TRUE ) { m_bLog = bLog; CheckDelete(); }; + void SetActionRecord( sal_Bool bRecord = sal_True ) { m_bRecord = bRecord; CheckDelete(); }; + void SetActionLog( sal_Bool bLog = sal_True ) { m_bLog = bLog; CheckDelete(); }; static MacroRecorder* GetMacroRecorder(); - static BOOL HasMacroRecorder(); + static sal_Bool HasMacroRecorder(); }; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 951237dbcd2f..7fb3c6dd8949 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -53,38 +53,38 @@ void RetStream::GenError ( rtl::OString aUId, String aString ) CmdBaseStream::GenError ( &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString ) +void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ) +void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } // MacroRecorder -void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) +void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); } -void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ) +void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool ); } -void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue ) +void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue ) { - Write(USHORT(SIReturn)); + Write(sal_uInt16(SIReturn)); Write(nRet); - Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) - Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed) + Write(sal_uInt16(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter Write(aValue); } -void RetStream::GenReturn( USHORT nRet, USHORT nMethod, String aString ) +void RetStream::GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, nMethod, &aString ); } @@ -99,7 +99,7 @@ void RetStream::Write( String *pString ) void RetStream::Write( SbxValue &aValue ) { - *pSammel << USHORT( BinSbxValue ); + *pSammel << sal_uInt16( BinSbxValue ); aValue.Store( *pSammel ); } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index a7033714ba6d..e8220a5848e4 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -54,16 +54,16 @@ public: void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} // new - void GenReturn( USHORT nRet, rtl::OString aUId, String aString ); - void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ); + 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 ); // needed for RemoteCommand and Profiling - void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue ); - void GenReturn( USHORT nRet, USHORT nMethod, String aString ); + void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue ); + void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString ); // MacroRecorder - void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ); - void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ); + void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ); + void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool ); void Reset(); SvStream* GetStream(); diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx index 0c4485f46a6b..de9eb9c38015 100644 --- a/automation/source/server/scmdstrm.cxx +++ b/automation/source/server/scmdstrm.cxx @@ -56,7 +56,7 @@ void SCmdStream::Read (String* &pString) if ( !pString ) pString = new String(); comm_UniChar* pStr; - USHORT nLenInChars; + sal_uInt16 nLenInChars; CmdBaseStream::Read( pStr, nLenInChars ); *pString = String( pStr, nLenInChars ); @@ -66,7 +66,7 @@ void SCmdStream::Read (String* &pString) void SCmdStream::Read (String &aString) { comm_UniChar* pStr; - USHORT nLenInChars; + sal_uInt16 nLenInChars; CmdBaseStream::Read( pStr, nLenInChars ); aString = String( pStr, nLenInChars ); @@ -75,8 +75,8 @@ void SCmdStream::Read (String &aString) void SCmdStream::Read ( SfxPoolItem *&pItem ) { - USHORT nType; - USHORT nId; + sal_uInt16 nType; + sal_uInt16 nId; Read(nId); #if OSL_DEBUG_LEVEL > 1 StatementList::m_pDbgWin->AddText( "Parameter: " ); @@ -145,7 +145,7 @@ void SCmdStream::Read ( SfxPoolItem *&pItem ) void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem ) { - USHORT nType; + sal_uInt16 nType; String aId; Read(aId); rItem.Name = rtl::OUString( aId ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 00d2aaabd197..7c7c8282e3ba 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -89,16 +89,16 @@ void SAL_CALL osl_TestToolDebugPrint( const sal_Char *pString ) #endif -ULONG RemoteControlCommunicationManager::nPortIs = TT_PORT_NOT_INITIALIZED; -USHORT RemoteControlCommunicationManager::nComm = 0; -BOOL RemoteControlCommunicationManager::bQuiet = FALSE; +sal_uLong RemoteControlCommunicationManager::nPortIs = TT_PORT_NOT_INITIALIZED; +sal_uInt16 RemoteControlCommunicationManager::nComm = 0; +sal_Bool RemoteControlCommunicationManager::bQuiet = sal_False; #if OSL_DEBUG_LEVEL > 1 RemoteControlCommunicationManager::RemoteControlCommunicationManager( EditWindow * pDbgWin ) #else RemoteControlCommunicationManager::RemoteControlCommunicationManager() #endif -: CommunicationManagerServerViaSocket( GetPort(), 1, TRUE ) +: CommunicationManagerServerViaSocket( GetPort(), 1, sal_True ) #if OSL_DEBUG_LEVEL > 1 , m_pDbgWin( pDbgWin ) #endif @@ -174,20 +174,20 @@ void RemoteControlCommunicationManager::InfoMsg( InfoString aMsg ) #endif } -ULONG RemoteControlCommunicationManager::GetPort() +sal_uLong RemoteControlCommunicationManager::GetPort() { if ( TT_PORT_NOT_INITIALIZED == nPortIs ) { // Read Config - USHORT i; + sal_uInt16 i; // are we to be automated at all? - BOOL bAutomate = FALSE; + sal_Bool bAutomate = sal_False; for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { if ( Application::GetCommandLineParam( i ).EqualsIgnoreCaseAscii("/enableautomation") || Application::GetCommandLineParam( i ).EqualsIgnoreCaseAscii("-enableautomation")) { - bAutomate = TRUE; + bAutomate = sal_True; break; } } @@ -234,7 +234,7 @@ ULONG RemoteControlCommunicationManager::GetPort() if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" ) nPortIs = 0; - nComm = (USHORT)aConf.ReadKey("Comm","0").ToInt32(); + nComm = (sal_uInt16)aConf.ReadKey("Comm","0").ToInt32(); if ( nComm ) aConf.DeleteKey("Comm"); @@ -253,7 +253,7 @@ class ExtraIdle : public AutoTimer { virtual void Timeout(); - USHORT nStep; + sal_uInt16 nStep; ImplRemoteControl *pRemoteControl; public: ExtraIdle( ImplRemoteControl *pRC ); @@ -284,8 +284,8 @@ void ExtraIdle::Timeout() // Müssen wir selbst idlen? #if OSL_DEBUG_LEVEL > 1 - ULONG nLastInputInterval = Application::GetLastInputInterval(); - BOOL bIsInModalMode = Application::IsInModalMode(); + sal_uLong nLastInputInterval = Application::GetLastInputInterval(); + sal_Bool bIsInModalMode = Application::IsInModalMode(); if ( bIsInModalMode || nLastInputInterval < MIN_IDLE ) #else if ( Application::IsInModalMode() || Application::GetLastInputInterval() < MIN_IDLE ) @@ -323,7 +323,7 @@ void ExtraIdle::Timeout() { case 0: { - SfxPoolItem *pItem = new SfxStringItem((USHORT)StatementList::pTTProperties->nSidNewDocDirect, CUniString("swriter/web") ); + SfxPoolItem *pItem = new SfxStringItem((sal_uInt16)StatementList::pTTProperties->nSidNewDocDirect, CUniString("swriter/web") ); new StatementSlot( StatementList::pTTProperties->nSidNewDocDirect, pItem ); SetTimeout(30000); return; @@ -384,7 +384,7 @@ void ExtraIdle::Timeout() #endif #ifdef TT_CODE - for ( USHORT i = 0 ; i < aStr.Len() ; i++ ) + for ( sal_uInt16 i = 0 ; i < aStr.Len() ; i++ ) { if ( aStr.GetChar(i) < 32 || aStr.GetChar(i) > 126 ) { @@ -535,7 +535,7 @@ void ExtraIdle::Timeout() } /*********************************************************************** -// USHORT nBC = pBmp->GetBitCount(); +// sal_uInt16 nBC = pBmp->GetBitCount(); // pBmp->Scale( 0.02, 0.02 ); // nBC = pBmp->GetBitCount(); // SvMemoryStream aStream; @@ -610,7 +610,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) if ( StatementList::MaybeResetSafeReschedule() ) { - StatementList::bExecuting = FALSE; // Wird nacher im SafeReschedule wieder zurückgesetzt + StatementList::bExecuting = sal_False; // Wird nacher im SafeReschedule wieder zurückgesetzt #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "SafeReschedule has been reset\n" ); #endif @@ -644,7 +644,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) // Schleift hier bis Befehl nicht zurückkommt, // Wird dann rekursiv über IdleHdl und PostUserEvent aufgerufen. { - m_bInsideExecutionLoop = TRUE; + m_bInsideExecutionLoop = sal_True; #ifdef TIMERIDLE m_aIdleTimer.Stop(); m_aIdleTimer.Start(); @@ -689,7 +689,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) pDlg->Show(); DBG_ERROR("GPF"); pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) ); - StatementList::bDying = TRUE; + StatementList::bDying = sal_True; while ( StatementList::pFirst ) // Kommandos werden übersprungen StatementList::NormalReschedule(); delete pDlg; @@ -706,7 +706,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) for (int xx = 1;xx < 20;xx++) StatementList::NormalReschedule(); */ - m_bInsideExecutionLoop = FALSE; + m_bInsideExecutionLoop = sal_False; } StatementList::aWindowWaitUId = rtl::OString(); // Warten rücksetzen, da handler sowieso verlassen wird @@ -734,10 +734,10 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL ) return 0; } -BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) +sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn ) { -// return TRUE; - USHORT nId; +// return sal_True; + sal_uInt16 nId; if( !m_bIdleInserted ) { @@ -748,11 +748,11 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) #else GetpApp()->InsertIdleHdl( LINK( this, ImplRemoteControl, IdleHdl ), 1 ); #endif - m_bIdleInserted = TRUE; + m_bIdleInserted = sal_True; } - StatementList::bReadingCommands = TRUE; + StatementList::bReadingCommands = sal_True; #if OSL_DEBUG_LEVEL > 1 if (!m_pDbgWin->bQuiet) @@ -765,7 +765,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) if( nServiceId != SI_IPCCommandBlock && nServiceId != SI_DirectCommandBlock ) { DBG_ERROR1( "Ungültiger Request :%i", (int)nServiceId ); - return FALSE; + return sal_False; } SCmdStream *pCmdStream = new SCmdStream(pIn); @@ -812,7 +812,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) } } - StatementList::bReadingCommands = FALSE; + StatementList::bReadingCommands = sal_False; delete pCmdStream; #if OSL_DEBUG_LEVEL > 1 @@ -830,10 +830,10 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) } #ifdef DEBUG else - m_bInsideExecutionLoop = TRUE; + m_bInsideExecutionLoop = sal_True; #endif - return TRUE; -} // BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) + return sal_True; +} // sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn ) SvStream* ImplRemoteControl::GetReturnStream() @@ -844,8 +844,8 @@ SvStream* ImplRemoteControl::GetReturnStream() } ImplRemoteControl::ImplRemoteControl() -: m_bIdleInserted( FALSE ) -, m_bInsideExecutionLoop( FALSE ) +: m_bIdleInserted( sal_False ) +, m_bInsideExecutionLoop( sal_False ) #if OSL_DEBUG_LEVEL > 1 , m_pDbgWin(NULL) #endif @@ -855,9 +855,9 @@ ImplRemoteControl::ImplRemoteControl() if ( RemoteControlCommunicationManager::GetPort() != TT_NO_PORT_DEFINED || RemoteControlCommunicationManager::nComm ) { m_pDbgWin = new EditWindow( NULL, CUniString("Debug Window"), WB_VSCROLL ); - m_pDbgWin->bQuiet = TRUE; + m_pDbgWin->bQuiet = sal_True; m_pDbgWin->Hide(); - m_pDbgWin->bQuiet = FALSE; + m_pDbgWin->bQuiet = sal_False; m_pDbgWin->Show(); StatementList::m_pDbgWin = m_pDbgWin; @@ -890,13 +890,13 @@ ImplRemoteControl::ImplRemoteControl() ImplRemoteControl::~ImplRemoteControl() { if ( MacroRecorder::HasMacroRecorder() ) - MacroRecorder::GetMacroRecorder()->SetActionRecord( FALSE ); // Will delete MacroRecorder if necessary + MacroRecorder::GetMacroRecorder()->SetActionRecord( sal_False ); // Will delete MacroRecorder if necessary - StatementList::bDying = TRUE; + StatementList::bDying = sal_True; #if OSL_DEBUG_LEVEL > 1 if ( m_pDbgWin ) - m_pDbgWin->bQuiet = TRUE; // Keine Ausgabe mehr im Debugwindow + m_pDbgWin->bQuiet = sal_True; // Keine Ausgabe mehr im Debugwindow #endif #ifdef DBG_UTIL @@ -935,7 +935,7 @@ ImplRemoteControl::~ImplRemoteControl() #else GetpApp()->RemoveIdleHdl( LINK( this, ImplRemoteControl, IdleHdl ) ); #endif - m_bIdleInserted = FALSE; + m_bIdleInserted = sal_False; } delete pServiceMgr; } @@ -976,6 +976,6 @@ extern "C" void CreateEventLogger() extern "C" void DestroyEventLogger() { - MacroRecorder::GetMacroRecorder()->SetActionLog( FALSE ); // Will delete MacroRecorder if necessary + MacroRecorder::GetMacroRecorder()->SetActionLog( sal_False ); // Will delete MacroRecorder if necessary } diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx index 099973bee6bb..abca26fc2a5f 100644 --- a/automation/source/server/server.hxx +++ b/automation/source/server/server.hxx @@ -41,7 +41,7 @@ namespace vos #include "editwin.hxx" #include <automation/communi.hxx> -#define TT_PORT_NOT_INITIALIZED ULONG(0xFFFFFFFF) // Eigentlich ja noch mehr, aber soll mal reichen +#define TT_PORT_NOT_INITIALIZED sal_uLong(0xFFFFFFFF) // Eigentlich ja noch mehr, aber soll mal reichen #define TT_NO_PORT_DEFINED 0 class RemoteControlCommunicationManager : public CommunicationManagerServerViaSocket @@ -51,12 +51,12 @@ class RemoteControlCommunicationManager : public CommunicationManagerServerViaSo #endif String aOriginalWinCaption; String aAdditionalWinCaption; - BOOL bIsPortValid; + sal_Bool bIsPortValid; DECL_LINK( SetWinCaption, Timer* = NULL); Timer* pTimer; virtual void InfoMsg( InfoString aMsg ); - static ULONG nPortIs; - static BOOL bQuiet; + static sal_uLong nPortIs; + static sal_Bool bQuiet; public: #if OSL_DEBUG_LEVEL > 1 @@ -69,8 +69,8 @@ public: virtual void ConnectionOpened( CommunicationLink* pCL ); virtual void ConnectionClosed( CommunicationLink* pCL ); - static ULONG GetPort(); - static USHORT nComm; + static sal_uLong GetPort(); + static sal_uInt16 nComm; #if OSL_DEBUG_LEVEL > 1 // virtual void DataReceived( CommunicationLink* pCL ); diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index f663665c20b6..3164c5729466 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -60,19 +60,19 @@ TTProfiler *StatementList::pProfiler = NULL; StatementList *StatementList::pFirst = NULL; -BOOL StatementList::bReadingCommands = FALSE; -BOOL StatementList::bIsInReschedule = FALSE; -USHORT StatementList::nModalCount = 0; +sal_Bool StatementList::bReadingCommands = sal_False; +sal_Bool StatementList::bIsInReschedule = sal_False; +sal_uInt16 StatementList::nModalCount = 0; Window *StatementList::pLastFocusWindow = NULL; -BOOL StatementList::bWasDragManager = FALSE; -BOOL StatementList::bWasPopupMenu = FALSE; -BOOL StatementList::bBasicWasRunning = FALSE; +sal_Bool StatementList::bWasDragManager = sal_False; +sal_Bool StatementList::bWasPopupMenu = sal_False; +sal_Bool StatementList::bBasicWasRunning = sal_False; RetStream *StatementList::pRet = NULL; -BOOL StatementList::IsError = FALSE; -BOOL StatementList::bDying = FALSE; -BOOL StatementList::bExecuting = FALSE; +sal_Bool StatementList::IsError = sal_False; +sal_Bool StatementList::bDying = sal_False; +sal_Bool StatementList::bExecuting = sal_False; StatementList *StatementList::pCurrentProfileStatement = NULL; -BOOL StatementList::bUsePostEvents = TRUE; +sal_Bool StatementList::bUsePostEvents = sal_True; #if OSL_DEBUG_LEVEL > 1 EditWindow *StatementList::m_pDbgWin; #endif @@ -82,23 +82,23 @@ rtl::OString StatementList::aWindowWaitUId = rtl::OString(); Window *StatementList::pWindowWaitPointer = NULL; rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString(); rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString(); -USHORT StatementList::nUseBindings = 0; +sal_uInt16 StatementList::nUseBindings = 0; -USHORT StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus -USHORT StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig -USHORT StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512# +sal_uInt16 StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus +sal_uInt16 StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig +sal_uInt16 StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; -USHORT StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys -USHORT StatementList::nMaxTypeKeysDelay = 0; -BOOL StatementList::bDoTypeKeysDelay = FALSE; +sal_uInt16 StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys +sal_uInt16 StatementList::nMaxTypeKeysDelay = 0; +sal_Bool StatementList::bDoTypeKeysDelay = sal_False; Window* StatementList::pFirstDocFrame = NULL; -BOOL StatementList::bIsSlotInExecute = FALSE; +sal_Bool StatementList::bIsSlotInExecute = sal_False; -BOOL StatementList::bCatchGPF = TRUE; +sal_Bool StatementList::bCatchGPF = sal_True; IMPL_GEN_RES_STR; @@ -121,7 +121,7 @@ TTSettings* GetTTSettings() // Translate pTTSettings->pTranslateWin = NULL; - pTTSettings->bToTop = TRUE; + pTTSettings->bToTop = sal_True; } return pTTSettings; @@ -134,14 +134,14 @@ TTSettings* GetTTSettings() #define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" )) /* -UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } -UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } -UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } -UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );} +UniString GEN_RES_STR0( sal_uLong nResId ) { return ResString( nResId ); } +UniString GEN_RES_STR1( sal_uLong nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } +UniString GEN_RES_STR2( sal_uLong nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } +UniString GEN_RES_STR3( sal_uLong nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );} */ StatementList::StatementList() : nRetryCount(MAX_RETRIES) -, bStatementInQue(FALSE) +, bStatementInQue(sal_False) { if (!pRet) pRet = new RetStream; // so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist. @@ -176,7 +176,7 @@ void StatementList::SendProfile( String aText ) if ( pProfiler->IsPartitioning() ) // FIXME: HELPID - pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) @@ -196,7 +196,7 @@ void StatementList::QueStatement(StatementList *pAfterThis) if ( bStatementInQue ) return; - bStatementInQue = TRUE; + bStatementInQue = sal_True; if ( pAfterThis ) { if ( pAfterThis->bStatementInQue ) @@ -229,7 +229,7 @@ void StatementList::QueStatement(StatementList *pAfterThis) void StatementList::Advance() { // pFirst ist static! pFirst = pNext; - bStatementInQue = FALSE; + bStatementInQue = sal_False; pNext = NULL; } @@ -242,7 +242,7 @@ StatementList::~StatementList() DBG_ASSERT(!bReadingCommands,"Deleting commands while reading them!"); } -Window* StatementList::GetDocWin( USHORT nNr ) +Window* StatementList::GetDocWin( sal_uInt16 nNr ) { Window* pBase = Application::GetFirstTopLevelWindow(); @@ -259,10 +259,10 @@ Window* StatementList::GetDocWin( USHORT nNr ) return NULL; } -USHORT StatementList::GetDocFrameCount() +sal_uInt16 StatementList::GetDocFrameCount() { Window* pBase = Application::GetFirstTopLevelWindow(); - USHORT nCount = 0; + sal_uInt16 nCount = 0; while ( pBase ) { @@ -273,10 +273,10 @@ USHORT StatementList::GetDocFrameCount() return nCount; } -USHORT StatementList::GetDocWinCount() +sal_uInt16 StatementList::GetDocWinCount() { Window* pBase = Application::GetFirstTopLevelWindow(); - USHORT nCount = 0; + sal_uInt16 nCount = 0; while ( pBase ) { @@ -287,12 +287,12 @@ USHORT StatementList::GetDocWinCount() return nCount; } -Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeBase ) +Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase ) { if ( !pBase && !aSearch.HasSearchFlag( SEARCH_NO_TOPLEVEL_WIN ) ) { - BOOL bSearchFocusFirst = aSearch.HasSearchFlag( SEARCH_FOCUS_FIRST ); + sal_Bool bSearchFocusFirst = aSearch.HasSearchFlag( SEARCH_FOCUS_FIRST ); Window *pControl = NULL; if ( bSearchFocusFirst ) @@ -372,7 +372,7 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB } -Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase ) +Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase ) { if ( !pBase ) return NULL; @@ -382,7 +382,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May Window *pResult = NULL; - USHORT i; + sal_uInt16 i; for( i = 0 ; i < pBase->GetChildCount() && !pResult; i++ ) pResult = SearchClientWin( pBase->GetChild(i), aSearch ); @@ -390,23 +390,23 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May } -BOOL SearchUID::IsWinOK( Window *pWin ) +sal_Bool SearchUID::IsWinOK( Window *pWin ) { if ( aUId.equals( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) - return TRUE; + return sal_True; else { if ( !pMaybeResult ) pMaybeResult = pWin; - return FALSE; + return sal_False; } } else if ( pWin->GetType() == WINDOW_TOOLBOX ) // Buttons and Controls on ToolBox. { ToolBox *pTB = ((ToolBox*)pWin); - USHORT i; + sal_uInt16 i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) ) @@ -421,17 +421,17 @@ BOOL SearchUID::IsWinOK( Window *pWin ) { // We got a Button, see if its valid also. if ( ( pTB->IsItemEnabled(pTB->GetItemId(i)) || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pTB->IsItemVisible(pTB->GetItemId(i)) ) - return TRUE; // We got a Button. + return sal_True; // We got a Button. else { // better a disabled Button on a valid ToolBox than an invalid ToolBox as below pMaybeResult = pTB; - return FALSE; + return sal_False; } } else if ( !pMaybeResult ) { // invalid ToolBox pMaybeResult = pTB; - return FALSE; + return sal_False; } } if ( pItemWin ) @@ -441,23 +441,23 @@ BOOL SearchUID::IsWinOK( Window *pWin ) { if ( !pAlternateResult ) // only take the first found ItemWindow #i35365 pAlternateResult = pItemWin; // since we cannot return a Window here - return FALSE; // continue searching to prefer a window with the right ID #i32292 + return sal_False; // continue searching to prefer a window with the right ID #i32292 } else if ( !pMaybeResult ) { pMaybeResult = pItemWin; - return FALSE; + return sal_False; } } } } - return FALSE; + return sal_False; } else - return FALSE; + return sal_False; } -Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox ) +Window* StatementList::SearchTree( rtl::OString aUId ,sal_Bool bSearchButtonOnToolbox ) { SearchUID aSearch(aUId,bSearchButtonOnToolbox); @@ -471,19 +471,19 @@ Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbo } -BOOL SearchWinPtr::IsWinOK( Window *pWin ) +sal_Bool SearchWinPtr::IsWinOK( Window *pWin ) { return pWin == pTest; } -BOOL StatementList::WinPtrValid(Window *pTest) +sal_Bool StatementList::WinPtrValid(Window *pTest) { SearchWinPtr aSearch( pTest ); return SearchAllWin( NULL, aSearch ) != NULL; } -BOOL SearchRT::IsWinOK( Window *pWin ) +sal_Bool SearchRT::IsWinOK( Window *pWin ) { if ( pWin->IsVisible() && pWin->GetType() == mnRT ) { @@ -491,15 +491,15 @@ BOOL SearchRT::IsWinOK( Window *pWin ) if ( mnSkip ) { mnSkip--; - return FALSE; + return sal_False; } else - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase, USHORT nSkip, BOOL bSearchAll ) +Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase, sal_uInt16 nSkip, sal_Bool bSearchAll ) { SearchRT aSearch( nRT, 0, nSkip ); if ( bSearchAll ) @@ -510,7 +510,7 @@ Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase return SearchAllWin( pBase, aSearch, MaybeBase ); } -USHORT StatementList::CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase ) +sal_uInt16 StatementList::CountWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase ) { SearchRT aSearch( nRT, SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN, 0xFFFF ); @@ -518,7 +518,7 @@ USHORT StatementList::CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBas return aSearch.GetCount(); } -BOOL SearchScroll::IsWinOK( Window *pWin ) +sal_Bool SearchScroll::IsWinOK( Window *pWin ) { if ( SearchRT::IsWinOK( pWin ) ) { @@ -526,10 +526,10 @@ BOOL SearchScroll::IsWinOK( Window *pWin ) return (( pWin->GetStyle() & WB_HORZ ) && ( nDirection == CONST_ALIGN_BOTTOM )) || (( pWin->GetStyle() & WB_VERT ) && ( nDirection == CONST_ALIGN_RIGHT )); } - return FALSE; + return sal_False; } -ScrollBar* StatementList::GetScrollBar( Window *pBase, USHORT nDirection, BOOL MaybeBase ) +ScrollBar* StatementList::GetScrollBar( Window *pBase, sal_uInt16 nDirection, sal_Bool MaybeBase ) { SearchScroll aSearch( nDirection, SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN ); @@ -537,12 +537,12 @@ ScrollBar* StatementList::GetScrollBar( Window *pBase, USHORT nDirection, BOOL M } -BOOL SearchPopupFloatingWin::IsWinOK( Window *pWin ) +sal_Bool SearchPopupFloatingWin::IsWinOK( Window *pWin ) { return pWin->IsVisible() && pWin->GetType() == WINDOW_FLOATINGWINDOW && ((FloatingWindow*)pWin)->IsInPopupMode(); } -Window* StatementList::GetPopupFloatingWin( BOOL MaybeBase ) +Window* StatementList::GetPopupFloatingWin( sal_Bool MaybeBase ) { SearchPopupFloatingWin aSearch; @@ -557,7 +557,7 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) if ( pBaseMenu->GetWindow() == pWin ) return pBaseMenu; - USHORT i; + sal_uInt16 i; // while ( pBaseMenu ) // { i = 0; @@ -588,16 +588,16 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) return pMenu; } - USHORT nSkip = 0; + sal_uInt16 nSkip = 0; Window* pMenuBarWin = NULL; - while ( (pMenuBarWin = GetWinByRT( NULL, WINDOW_MENUBARWINDOW, TRUE, nSkip++, TRUE )) != NULL ) + while ( (pMenuBarWin = GetWinByRT( NULL, WINDOW_MENUBARWINDOW, sal_True, nSkip++, sal_True )) != NULL ) { Window* pParent = pMenuBarWin->GET_REAL_PARENT(); if ( pParent && pParent->GetType() == WINDOW_BORDERWINDOW && pParent->IsVisible() ) { Menu* pMenu = NULL; // find Menu of MenuBarWindow - USHORT nCount; + sal_uInt16 nCount; for ( nCount = 0 ; nCount < pParent->GetChildCount() ; nCount++ ) { if ( pParent->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW ) @@ -621,26 +621,26 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) } -BOOL SearchActive::IsWinOK( Window *pWin ) +sal_Bool SearchActive::IsWinOK( Window *pWin ) { // return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive()); // only matches ResID due to problems with UNIX Window Managers return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ); } -Window* StatementList::GetActive( WindowType nRT, BOOL MaybeBase ) +Window* StatementList::GetActive( WindowType nRT, sal_Bool MaybeBase ) { SearchActive aSearch( nRT ); return SearchAllWin( NULL, aSearch, MaybeBase ); } -BOOL SearchFadeSplitWin::IsWinOK( Window *pWin ) +sal_Bool SearchFadeSplitWin::IsWinOK( Window *pWin ) { #if OSL_DEBUG_LEVEL > 1 if ( pWin->GetType() == WINDOW_SPLITWINDOW ) { - BOOL bResult; + sal_Bool bResult; WindowAlign aAlign; bResult = pWin->IsVisible(); bResult = ((SplitWindow*)pWin)->IsFadeInButtonVisible(); @@ -654,7 +654,7 @@ BOOL SearchFadeSplitWin::IsWinOK( Window *pWin ) /*&& ((SplitWindow*)pWin)->IsAutoHideButtonVisible()*/ && ((SplitWindow*)pWin)->GetAlign() == nAlign; } -Window* StatementList::GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase ) +Window* StatementList::GetFadeSplitWin( Window *pBase, WindowAlign nAlign, sal_Bool MaybeBase ) { SearchFadeSplitWin aSearch( nAlign ); @@ -682,13 +682,13 @@ Window* StatementList::GetMouseWin() return NULL; } -Window* StatementList::GetFocus( WindowType nRT, BOOL MaybeBase ) +Window* StatementList::GetFocus( WindowType nRT, sal_Bool MaybeBase ) { if ( nRT == WINDOW_TABCONTROL ) { Window *pResult = GetActive( WINDOW_TABDIALOG, MaybeBase); - for( USHORT i = 0 ; pResult && i < pResult->GetChildCount(); i++ ) + for( sal_uInt16 i = 0 ; pResult && i < pResult->GetChildCount(); i++ ) if ( pResult->GetChild(i)->GetType() == nRT ) return pResult->GetChild(i); } @@ -696,7 +696,7 @@ Window* StatementList::GetFocus( WindowType nRT, BOOL MaybeBase ) return NULL; } -Window* StatementList::GetAnyActive( BOOL MaybeBase ) +Window* StatementList::GetAnyActive( sal_Bool MaybeBase ) { Window *pControl; @@ -785,7 +785,7 @@ Window* StatementList::GetFirstDocFrame() return pFirstDocFrame; } -BOOL StatementList::IsFirstDocFrame( Window* pWin ) +sal_Bool StatementList::IsFirstDocFrame( Window* pWin ) { return pWin && ( pWin == GetFirstDocFrame() || ( GetFirstDocFrame() && pWin == GetFirstDocFrame()->GetWindow( WINDOW_CLIENT ) ) ) && ( GetFirstDocFrame() && IsDocFrame( GetFirstDocFrame() ) ); } @@ -794,7 +794,7 @@ MenuBar* StatementList::GetDocFrameMenuBar( Window* pWin ) { if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW ) { - USHORT nCount; + sal_uInt16 nCount; for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ ) { if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW ) @@ -805,35 +805,35 @@ MenuBar* StatementList::GetDocFrameMenuBar( Window* pWin ) } // a Doc Frame is a Document or the Backing Window -BOOL StatementList::IsDocFrame( Window* pWin ) +sal_Bool StatementList::IsDocFrame( Window* pWin ) { if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW ) { - USHORT nCount; - BOOL bHasWorkWindow = FALSE; - BOOL bHasMenuBar = FALSE; + sal_uInt16 nCount; + sal_Bool bHasWorkWindow = sal_False; + sal_Bool bHasMenuBar = sal_False; // #91724# it is now necessary to sort out the IME WIndow in Solaris as well. // so now we check for existence of WINDOW_WORKWINDOW and newly for // WINDOW_MENUBARWINDOW which contains the Menu and the close/min/max buttons for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ ) { if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW ) - bHasWorkWindow = TRUE; + bHasWorkWindow = sal_True; if ( pWin->GetChild( nCount )->GetType() == WINDOW_MENUBARWINDOW ) - bHasMenuBar = TRUE; + bHasMenuBar = sal_True; } return bHasWorkWindow && bHasMenuBar; } - return FALSE; + return sal_False; } // a Doc Win is a real document (not the Backing Window) -BOOL StatementList::IsDocWin( Window* pWin ) +sal_Bool StatementList::IsDocWin( Window* pWin ) { if ( pWin && IsDocFrame( pWin ) ) { if ( GetDocFrameCount() != 1 ) - return TRUE; + return sal_True; else { // check for the close button to see if we are the last one or only the backing Window @@ -841,28 +841,28 @@ BOOL StatementList::IsDocWin( Window* pWin ) return GetDocFrameMenuBar( pWin )->HasCloser(); } } - return FALSE; + return sal_False; } -BOOL StatementList::IsIMEWin( Window* pWin ) // Input Window for CJK under Solaris +sal_Bool StatementList::IsIMEWin( Window* pWin ) // Input Window for CJK under Solaris { if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW ) { - USHORT nCount; - BOOL bHasWorkWindow = FALSE; - BOOL bHasWindow = FALSE; + sal_uInt16 nCount; + sal_Bool bHasWorkWindow = sal_False; + sal_Bool bHasWindow = sal_False; // #91724# it is now necessary to sort out the IME WIndow in Solaris as well. // so now we check for existence of WINDOW_WORKWINDOW and newly for // WINDOW_WINDOW which contains the Menu and the close/min/max buttons for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ ) if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW ) - bHasWorkWindow = TRUE; + bHasWorkWindow = sal_True; for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ ) if ( pWin->GetChild( nCount )->GetType() == WINDOW_WINDOW ) - bHasWindow = TRUE; + bHasWindow = sal_True; return bHasWorkWindow && !bHasWindow; } - return FALSE; + return sal_False; } UniString StatementList::Tree(Window *pBase, int Indent) @@ -1010,7 +1010,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITEc("\n"); aReturn.ConvertLineEnd(); - USHORT i; + sal_uInt16 i; for (i = 0 ; i < pBase->GetChildCount() ; i++) { aReturn += ClientTree(pBase->GetChild(i),Indent+1); @@ -1019,7 +1019,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) } -BOOL StatementList::CheckWindowWait() +sal_Bool StatementList::CheckWindowWait() { static Time StartTime = Time(0L); // Abbruch wenn Fenster absolut nicht schliesst. if ( StartTime == Time(0L) ) @@ -1049,10 +1049,10 @@ BOOL StatementList::CheckWindowWait() aWindowWaitUId = rtl::OString(); pWindowWaitPointer = NULL; StartTime = Time(0L); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } pWindowWaitPointer = NULL; aWindowWaitUId = rtl::OString(); @@ -1061,7 +1061,7 @@ BOOL StatementList::CheckWindowWait() #endif } StartTime = Time(0L); - return TRUE; + return sal_True; } void StatementList::ReportError(String aMessage) @@ -1072,18 +1072,18 @@ void StatementList::ReportError(String aMessage) void StatementList::ReportError(rtl::OString aUId, String aMessage) { pRet->GenError ( aUId, aMessage ); - IsError = TRUE; + IsError = sal_True; } -void StatementList::ReportError(String aMessage, ULONG nWhatever) +void StatementList::ReportError(String aMessage, sal_uLong nWhatever) { ReportError ( aMessage.AppendAscii(" ").Append(UniString::CreateFromInt32(nWhatever))); } -void StatementList::DirectLog( ULONG nType, String aMessage ) +void StatementList::DirectLog( sal_uLong nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage ); + pRet->GenReturn( RET_DirectLoging, (sal_uInt16) nType, aMessage ); } @@ -1097,15 +1097,15 @@ void StatementList::DirectLog( ULONG nType, String aMessage ) } \ } -void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect ) +void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, sal_Bool bForceDirect ) { if ( StatementList::bUsePostEvents && !bForceDirect ) { if ( StatementList::WinPtrValid( pWin ) ) { - ULONG nID1; - ULONG nID2; + sal_uLong nID1; + sal_uLong nID2; nID1 = Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, pWin, &aKEvnt ); nID2 = Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, pWin, &aKEvnt ); // wait after posting both events so deleting pWin will remove the second event also @@ -1129,7 +1129,7 @@ void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect ) Size aSize = pWin->GetOutputSize(); aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 ); - CommandEvent aEvent( aPos, COMMAND_CONTEXTMENU, FALSE ); + CommandEvent aEvent( aPos, COMMAND_CONTEXTMENU, sal_False ); ImplCommand( pWin, aEvent ); } } @@ -1139,13 +1139,13 @@ void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect ) } }; -void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) +void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect ) { if ( StatementList::bUsePostEvents && !bForceDirect ) { if ( StatementList::WinPtrValid( pWin ) ) { - ULONG nID; + sal_uLong nID; nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, pWin, &aMEvnt ); ImplEventWait( nID ); } @@ -1166,13 +1166,13 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } }; -void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) +void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect ) { if ( StatementList::bUsePostEvents && !bForceDirect ) { if ( StatementList::WinPtrValid( pWin ) ) { - ULONG nID; + sal_uLong nID; nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pWin, &aMEvnt ); ImplEventWait( nID ); } @@ -1183,13 +1183,13 @@ void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } }; -void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) +void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect ) { if ( StatementList::bUsePostEvents && !bForceDirect ) { if ( StatementList::WinPtrValid( pWin ) ) { - ULONG nID; + sal_uLong nID; nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, pWin, &aMEvnt ); ImplEventWait( nID ); } @@ -1215,7 +1215,7 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } }; -void ImplEventWait( ULONG nID ) +void ImplEventWait( sal_uLong nID ) { while ( !Application::IsProcessedMouseOrKeyEvent( nID ) ) Application::Yield(); diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index a288c3d4d3a7..841961778a28 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -143,11 +143,11 @@ SV_DECL_REF(SbxValue) SV_IMPL_REF(SbxValue) CommunicationLink *StatementFlow::pCommLink = NULL; -BOOL StatementFlow::bUseIPC = TRUE; -BOOL StatementFlow::bSending = FALSE; +sal_Bool StatementFlow::bUseIPC = sal_True; +sal_Bool StatementFlow::bSending = sal_False; ImplRemoteControl *StatementFlow::pRemoteControl = NULL; -USHORT StatementCommand::nDirPos = 0; +sal_uInt16 StatementCommand::nDirPos = 0; Dir *StatementCommand::pDir = NULL; pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = NULL; @@ -165,24 +165,24 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -StatementFlow::StatementFlow( StatementList *pAfterThis, USHORT nArtP ) +StatementFlow::StatementFlow( StatementList *pAfterThis, sal_uInt16 nArtP ) : nArt(nArtP) , nParams(0) , nSNr1(0) , nLNr1(0) , aString1() -, bBool1(FALSE) +, bBool1(sal_False) { QueStatement( pAfterThis ); } -StatementFlow::StatementFlow( ULONG nServiceId, SCmdStream *pCmdIn, ImplRemoteControl *pRC ) +StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemoteControl *pRC ) : nArt(0) , nParams(0) , nSNr1(0) , nLNr1(0) , aString1() -, bBool1(FALSE) +, bBool1(sal_False) { QueStatement( NULL ); bUseIPC = (nServiceId == SI_IPCCommandBlock); @@ -217,7 +217,7 @@ void StatementFlow::SendViaSocket() DBG_ERROR("SendViaSocket called recursively. Aborted!!!"); return; } - bSending = TRUE; + bSending = sal_True; if ( pCommLink ) { if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gelöscht ... @@ -230,11 +230,11 @@ void StatementFlow::SendViaSocket() } pRet->Reset(); - bSending = FALSE; - IsError = FALSE; + bSending = sal_False; + IsError = sal_False; } -BOOL StatementFlow::Execute() +sal_Bool StatementFlow::Execute() { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Executing Flow: " ); @@ -248,16 +248,16 @@ BOOL StatementFlow::Execute() if ( !bUseIPC ) { - // bBool1 wurde im CTOR auf FALSE initialisiert + // bBool1 wurde im CTOR auf sal_False initialisiert if ( !bBool1 ) // also erster Durchlauf { pRemoteControl->pRetStream = pRet->GetStream(); - bBool1 = TRUE; // wurde im CTOR auf FALSE initialisiert + bBool1 = sal_True; // wurde im CTOR auf sal_False initialisiert nRetryCount = nRetryCount * 4; } if ( pRemoteControl->pRetStream && (nRetryCount--) ) // also solange nicht abgeholt { - return FALSE; // Bitte einmal vom Callstack runter + return sal_False; // Bitte einmal vom Callstack runter } } @@ -272,7 +272,7 @@ BOOL StatementFlow::Execute() if ( !bUseIPC ) { // wird oben abgehandelt pRet->Reset(); - IsError = FALSE; + IsError = sal_False; } else SendViaSocket(); @@ -296,7 +296,7 @@ BOOL StatementFlow::Execute() } delete this; - return TRUE; + return sal_True; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -394,7 +394,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn ) { nAnzahl++; pItemArr = new SfxPoolItem*[nAnzahl]; - for (USHORT i = 0 ; i+1 < nAnzahl ; i++) + for (sal_uInt16 i = 0 ; i+1 < nAnzahl ; i++) pCmdIn->Read( pItemArr[i] ); pItemArr[nAnzahl-1] = NULL; } @@ -403,7 +403,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn ) { aArgs.realloc(nAnzahl); PropertyValue* pArg = aArgs.getArray(); - for (USHORT i = 0 ; i < nAnzahl ; i++) + for (sal_uInt16 i = 0 ; i < nAnzahl ; i++) pCmdIn->Read( pArg[i] ); } break; @@ -416,15 +416,15 @@ StatementSlot::StatementSlot() : nAnzahl( 0 ) , pItemArr(NULL) , nFunctionId( 0 ) -, bMenuClosed(FALSE) +, bMenuClosed(sal_False) {} -StatementSlot::StatementSlot( ULONG nSlot, SfxPoolItem* pItem ) +StatementSlot::StatementSlot( sal_uLong nSlot, SfxPoolItem* pItem ) : pItemArr(NULL) -, bMenuClosed(FALSE) +, bMenuClosed(sal_False) { QueStatement( NULL ); - nFunctionId = USHORT(nSlot); + nFunctionId = sal_uInt16(nSlot); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Slot: " ); m_pDbgWin->AddText( String::CreateFromInt32( nFunctionId ) ); @@ -447,7 +447,7 @@ StatementSlot::~StatementSlot() { if ( pItemArr ) { - for (USHORT i = 0 ; i+1 < nAnzahl ; i++) + for (sal_uInt16 i = 0 ; i+1 < nAnzahl ; i++) delete pItemArr[i]; delete[] pItemArr; } @@ -477,7 +477,7 @@ void StatementSlot::AddReferer() aArgs.realloc(nAnzahl); pArg = aArgs.getArray(); pArg[nAnzahl-1].Name = rtl::OUString::createFromAscii("SynchronMode"); - pArg[nAnzahl-1].Value <<= sal_Bool( TRUE ); + pArg[nAnzahl-1].Value <<= sal_Bool( sal_True ); } class SlotStatusListener : public cppu::WeakImplHelper1< XStatusListener > @@ -491,8 +491,8 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // local Members - BOOL bDisposed; - BOOL bEnabled; + sal_Bool bDisposed; + sal_Bool bEnabled; }; /* struct FeatureStateEvent : public ::com::sun::star::lang::EventObject @@ -506,8 +506,8 @@ struct FeatureStateEvent : public ::com::sun::star::lang::EventObject */ SlotStatusListener::SlotStatusListener() -: bDisposed( FALSE ) -, bEnabled( TRUE ) +: bDisposed( sal_False ) +, bEnabled( sal_True ) {} // XStatusListener @@ -523,10 +523,10 @@ void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame:: // XEventListener void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { - bDisposed = TRUE; + bDisposed = sal_True; } -BOOL StatementSlot::Execute() +sal_Bool StatementSlot::Execute() { if ( IsError ) { @@ -538,7 +538,7 @@ BOOL StatementSlot::Execute() Advance(); delete this; - return TRUE; + return sal_True; } InitProfile(); @@ -562,18 +562,18 @@ BOOL StatementSlot::Execute() aSubMenuId2 = 0; aSubMenuId3 = 0; pMenuWindow = NULL; - bMenuClosed = TRUE; + bMenuClosed = sal_True; #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Closed contextmenu\n" ); #endif - return FALSE; + return sal_False; } else if ( nRetryCount-- ) { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Waiting for contextmenu to close\n" ); #endif - return FALSE; + return sal_False; } else ReportError( GEN_RES_STR0( S_MENU_NOT_CLOSING ) ); @@ -659,9 +659,9 @@ BOOL StatementSlot::Execute() ReportError( GEN_RES_STR0( S_SLOT_IN_EXECUTE ) ); else { - bIsSlotInExecute = TRUE; + bIsSlotInExecute = sal_True; xDisp->dispatch( aTargetURL, aArgs ); - bIsSlotInExecute = FALSE; + bIsSlotInExecute = sal_False; } } else @@ -703,7 +703,7 @@ BOOL StatementSlot::Execute() SendProfile( SlotString( nFunctionId ) ); delete this; - return TRUE; + return sal_True; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -724,7 +724,7 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 ) +StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 MethodId, sal_uInt16 Params, sal_uInt16 Nr1 ) : nMethodId( MethodId ) , nParams(Params) , nNr1(Nr1) @@ -734,8 +734,8 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , nLNr1(0) , aString1() , aString2() -, bBool1(FALSE) -, bBool2(FALSE) +, bBool1(sal_False) +, bBool2(sal_False) { QueStatement( pAfterThis ); @@ -768,8 +768,8 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) , nLNr1(0) , aString1() , aString2() -, bBool1(FALSE) -, bBool2(FALSE) +, bBool1(sal_False) +, bBool2(sal_False) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); @@ -807,14 +807,14 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "*Deleting all Commands:\n" ); #endif - bReadingCommands = FALSE; + bReadingCommands = sal_False; while ( StatementList::pFirst != this ) // Alles Löschen außer mich selbst { StatementList *pDeQue = StatementList::pFirst; pDeQue->Advance(); delete pDeQue; } - bReadingCommands = TRUE; + bReadingCommands = sal_True; #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "*Done deleting all Commands:\n" ); #endif @@ -822,14 +822,14 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) } -void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst ) +void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Bool bFirst ) { if ( IsDialog(pBase) && !bFirst ) return; if ( bFirst ) - pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE ); + pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), sal_True ); if ( bFirst ) { @@ -840,7 +840,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt String aName; - BOOL bSkip = FALSE; + sal_Bool bSkip = sal_False; switch ( pBase->GetType() ) { @@ -907,7 +907,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) ) - bSkip = TRUE; + bSkip = sal_True; break; } @@ -940,13 +940,13 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst rtl::OString aId = pBase->GetUniqueOrHelpId(); pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(), - TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); + TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), sal_False ); if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. { ToolBox *pTB = ((ToolBox*)pBase); - USHORT i; + sal_uInt16 i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { aName = String(); @@ -963,10 +963,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst { 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, - TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); + 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, - TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); + TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False ); } else { @@ -974,13 +974,13 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst { 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(), - TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); + 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(), - TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); - USHORT ii; + TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False ); + sal_uInt16 ii; for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ ) - WriteControlData( pItemWin->GetChild(ii), nConf, FALSE ); + WriteControlData( pItemWin->GetChild(ii), nConf, sal_False ); } else { @@ -1009,10 +1009,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst } 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, - aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); + 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, - aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); + aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False ); } } } @@ -1030,7 +1030,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst || pBase->GetType() == WINDOW_QUERYBOX ) { ButtonDialog *pBD = ((ButtonDialog*)pBase); - USHORT i; + sal_uInt16 i; for ( i = 0; i < pBD->GetButtonCount() ; i++ ) { aName = String(); @@ -1064,7 +1064,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)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() ), FALSE ); + .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), sal_False ); } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1075,10 +1075,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst if ( pMenu ) // Menus { - USHORT i; + sal_uInt16 i; for ( i = 0; i < pMenu->GetItemCount() ; i++ ) { - USHORT nID = pMenu->GetItemId( i ); + sal_uInt16 nID = pMenu->GetItemId( i ); aName = String(); if ( aName.Len() == 0 ) @@ -1112,10 +1112,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst } if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, - aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); + 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, - aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); + aMenuItemType.AppendAscii(": ").Append(aName), sal_False ); } } @@ -1124,8 +1124,8 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst } } - for( USHORT i = 0 ; i < pBase->GetChildCount(); i++ ) - WriteControlData( pBase->GetChild(i), nConf, FALSE ); + for( sal_uInt16 i = 0 ; i < pBase->GetChildCount(); i++ ) + WriteControlData( pBase->GetChild(i), nConf, sal_False ); } class SysWinContainer : public WorkWindow @@ -1146,7 +1146,7 @@ SysWinContainer::SysWinContainer( ToolBox *pClient ) { pDock = new DockingWindow( this ); pClientWin->SetParent( pDock ); - pClientWin->SetFloatingMode( FALSE ); + pClientWin->SetFloatingMode( sal_False ); SetText( pClient->GetText() ); SetPosPixel( Point( 1,40 ) ); Resize(); @@ -1178,10 +1178,10 @@ void SysWinContainer::Resizing( Size& rSize ) { Size aSize; Size aBestSize; - USHORT i; - BOOL bHasValue = FALSE; - ULONG nBestValue = 0; - ULONG nThisValue; + sal_uInt16 i; + sal_Bool bHasValue = sal_False; + sal_uLong nBestValue = 0; + sal_uLong nThisValue; for ( i=1 ; i<=1 ; i++ ) { aSize = pClientWin->CalcWindowSizePixel( i ); @@ -1190,7 +1190,7 @@ void SysWinContainer::Resizing( Size& rSize ) { nBestValue = nThisValue; aBestSize = aSize; - bHasValue = TRUE; + bHasValue = sal_True; } } rSize = aBestSize; @@ -1201,15 +1201,15 @@ class DisplayHidWin : public ToolBox { Edit *pEdit; Size aMinEditSize; - USHORT nLastItemID; - BOOL bIsDraging; - BOOL bIsPermanentDraging; - void SetDraging( BOOL bNewDraging ); + sal_uInt16 nLastItemID; + sal_Bool bIsDraging; + sal_Bool bIsPermanentDraging; + void SetDraging( sal_Bool bNewDraging ); Image *pShow, *pShow2; - BOOL bConfigChanged; - void EnableButtons( ULONG nConf ); + sal_Bool bConfigChanged; + void EnableButtons( sal_uLong nConf ); - ULONG nEventHookID; + sal_uLong nEventHookID; static long stub_VCLEventHookProc( NotifyEvent& rEvt, void* pData ) { return ((DisplayHidWin*)pData)->VCLEventHook( rEvt ); @@ -1221,9 +1221,9 @@ class DisplayHidWin : public ToolBox SysWinContainer *pContainer; // aborting by pressing shist twice - BOOL bOldShift; + sal_Bool bOldShift; Time aLatest; - USHORT nShiftCount; + sal_uInt16 nShiftCount; public: DisplayHidWin(); @@ -1236,27 +1236,27 @@ public: void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); } String GetDisplayText() const { return pEdit->GetText(); } - BOOL IsDisplayTextModified() const { return pEdit->IsModified(); } + sal_Bool IsDisplayTextModified() const { return pEdit->IsModified(); } void ClearDisplayTextModified() const { pEdit->ClearModifyFlag(); } - void SetConfig( ULONG nConf ); - ULONG GetConfig(); + void SetConfig( sal_uLong nConf ); + sal_uLong GetConfig(); - BOOL IsConfigChanged() { return bConfigChanged; } - void ConfigSent() { bConfigChanged = FALSE; } + sal_Bool IsConfigChanged() { return bConfigChanged; } + void ConfigSent() { bConfigChanged = sal_False; } - BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; } -// BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; } + sal_Bool IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; } +// sal_Bool IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; } - BOOL IsDraging() { return bIsDraging; } + sal_Bool IsDraging() { return bIsDraging; } Window* LastMouseMoveWin() { return pLastMouseMoveWin; } }; DisplayHidWin::DisplayHidWin() : ToolBox( StatementList::GetFirstDocFrame(), TTProperties::GetSvtResId(DisplayHidToolBox) ) -, bIsDraging( FALSE ) -, bIsPermanentDraging( FALSE ) +, bIsDraging( sal_False ) +, bIsPermanentDraging( sal_False ) , pShow( NULL ) , pShow2( NULL ) , pLastMouseMoveWin( NULL ) @@ -1285,7 +1285,7 @@ DisplayHidWin::~DisplayHidWin() delete pEdit; } -void DisplayHidWin::SetDraging( BOOL bNewDraging ) +void DisplayHidWin::SetDraging( sal_Bool bNewDraging ) { if ( !pShow ) pShow = new Image( GetItemImage( TT_SHOW ) ); @@ -1300,9 +1300,9 @@ void DisplayHidWin::SetDraging( BOOL bNewDraging ) bIsDraging = bNewDraging; } -void DisplayHidWin::EnableButtons( ULONG nConf ) +void DisplayHidWin::EnableButtons( sal_uLong nConf ) { - BOOL bSend = BOOL(nConf & DH_MODE_SEND_DATA); + sal_Bool bSend = sal_Bool(nConf & DH_MODE_SEND_DATA); EnableItem( TT_ALLWIN, bSend ); EnableItem( TT_KURZNAME, bSend ); EnableItem( TT_LANGNAME, bSend ); @@ -1311,7 +1311,7 @@ void DisplayHidWin::EnableButtons( ULONG nConf ) void DisplayHidWin::Tracking( const TrackingEvent& rTEvt ) { // if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) ) -// SetDraging( FALSE ); +// SetDraging( sal_False ); if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK ) EndTracking( ENDTRACK_CANCEL ); ToolBox::Tracking( rTEvt); @@ -1322,7 +1322,7 @@ void DisplayHidWin::Click() nLastItemID = GetCurItemId(); if ( nLastItemID == TT_SHOW ) { - SetDraging( TRUE ); + SetDraging( sal_True ); } ToolBox::Click(); } @@ -1334,8 +1334,8 @@ void DisplayHidWin::Select() SetItemState( GetCurItemId(), STATE_CHECK ); if ( GetCurItemId() == TT_SHOW ) { - bIsPermanentDraging = TRUE; - SetDraging( TRUE ); + bIsPermanentDraging = sal_True; + SetDraging( sal_True ); } } else @@ -1343,8 +1343,8 @@ void DisplayHidWin::Select() SetItemState( GetCurItemId(), STATE_NOCHECK ); if ( GetCurItemId() == TT_SHOW ) { - bIsPermanentDraging = FALSE; - SetDraging( FALSE ); + bIsPermanentDraging = sal_False; + SetDraging( sal_False ); } } if ( GetCurItemId() == TT_SEND_DATA ) @@ -1353,7 +1353,7 @@ void DisplayHidWin::Select() } } -void DisplayHidWin::SetConfig( ULONG nConf ) +void DisplayHidWin::SetConfig( sal_uLong nConf ) { SetItemState( TT_KURZNAME, ( nConf & DH_MODE_KURZNAME ) ? STATE_CHECK : STATE_NOCHECK ); SetItemState( TT_LANGNAME, ( nConf & DH_MODE_LANGNAME ) ? STATE_CHECK : STATE_NOCHECK ); @@ -1362,9 +1362,9 @@ void DisplayHidWin::SetConfig( ULONG nConf ) EnableButtons( nConf ); } -ULONG DisplayHidWin::GetConfig() +sal_uLong DisplayHidWin::GetConfig() { - ULONG nConf = 0; + sal_uLong nConf = 0; if ( GetItemState( TT_KURZNAME ) == STATE_CHECK ) nConf |= DH_MODE_KURZNAME; if ( GetItemState( TT_LANGNAME ) == STATE_CHECK ) @@ -1405,8 +1405,8 @@ long DisplayHidWin::VCLEventHook( NotifyEvent& rEvt ) nShiftCount++; if ( nShiftCount == 4 && aLatest > Time() ) { - bIsPermanentDraging = FALSE; - SetDraging( FALSE ); + bIsPermanentDraging = sal_False; + SetDraging( sal_False ); SetItemState( TT_SHOW, STATE_NOCHECK ); } } @@ -1414,18 +1414,18 @@ long DisplayHidWin::VCLEventHook( NotifyEvent& rEvt ) } if ( ( ( EVENT_MOUSEBUTTONUP == rEvt.GetType() && rEvt.GetMouseEvent()->GetButtons() == MOUSE_LEFT) || ( EVENT_MOUSEMOVE == rEvt.GetType() && !rEvt.GetMouseEvent()->GetButtons() ) ) && IsDraging() && !bIsPermanentDraging ) - SetDraging( FALSE ); + SetDraging( sal_False ); return 0; } -BOOL StatementCommand::DisplayHID() +sal_Bool StatementCommand::DisplayHID() { - // Return TRUE -> reexecute command + // Return sal_True -> reexecute command - if ( !bBool2 ) // Wird auf FALSE initialisiert + if ( !bBool2 ) // Wird auf sal_False initialisiert { - bBool2 = TRUE; // Wir sind initialisiert. + bBool2 = sal_True; // Wir sind initialisiert. GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich) if ( !(nParams & PARAM_ULONG_1) ) @@ -1448,7 +1448,7 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this ) { DBG_WARNING("Mehrere DisplayHID am laufen"); - return FALSE; // Noch eine andere Instanz macht das gleiche! + return sal_False; // Noch eine andere Instanz macht das gleiche! } if ( !GetTTSettings()->pDisplayHidWin ) @@ -1466,8 +1466,8 @@ BOOL StatementCommand::DisplayHID() } else { - GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE ); - GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE ); + GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->Enable( sal_True, sal_True ); + GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->EnableInput( sal_True, sal_True ); } @@ -1487,8 +1487,8 @@ BOOL StatementCommand::DisplayHID() RasterOp aROp = WinPtr->GetRasterOp(); \ WinPtr->SetRasterOp( ROP_XOR ); \ Size aSz = WinPtr->PixelToLogic( WinPtr->GetSizePixel() );\ - ULONG nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\ - ULONG iCorner = std::max ((ULONG) 8, (ULONG) std::min( nMaxCornerRadius, (ULONG) std::min((ULONG) (aSz.Width() / 6), (ULONG)(aSz.Height() / 6))));\ + sal_uLong nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\ + sal_uLong iCorner = std::max ((sal_uLong) 8, (sal_uLong) std::min( nMaxCornerRadius, (sal_uLong) std::min((sal_uLong) (aSz.Width() / 6), (sal_uLong)(aSz.Height() / 6))));\ WinPtr->DrawRect(Rectangle(Point(),aSz), iCorner, iCorner);\ WinPtr->SetLineColor( aLineColMem ); \ WinPtr->SetFillColor( aFillColMem ); \ @@ -1625,15 +1625,15 @@ private: Window *Old; Window *Act; Window *pTranslateWin; - BOOL bSelecting; + sal_Bool bSelecting; - BOOL bAvailable; - BOOL bNext; + sal_Bool bAvailable; + sal_Bool bNext; - BOOL TestChangedDataSaved(); + sal_Bool TestChangedDataSaved(); - ULONG nEventHookID; + sal_uLong nEventHookID; static long stub_VCLEventHookProc( NotifyEvent& rEvt, void* pData ) { return ((TranslateWin*)pData)->VCLEventHook( rEvt ); @@ -1645,11 +1645,11 @@ public: TranslateWin(); ~TranslateWin(); - static String MarkShortcutErrors( Window* pBase, BOOL bMark ); + static String MarkShortcutErrors( Window* pBase, sal_Bool bMark ); - BOOL IsTranslationAvailable(){ return bAvailable; } - BOOL IsNextDialog(){ return bNext; } - void ResetNextDialog(){ bNext = FALSE; } + sal_Bool IsTranslationAvailable(){ return bAvailable; } + sal_Bool IsNextDialog(){ return bNext; } + void ResetNextDialog(){ bNext = sal_False; } Window* GetTranslationWindow(){ return pTranslateWin; } String GetOriginalText(){ return FixedTextTT_FT_OLD.GetText(); } @@ -1673,9 +1673,9 @@ TranslateWin::TranslateWin() , Old( NULL ) , Act( NULL ) , pTranslateWin( NULL ) -, bSelecting( FALSE ) -, bAvailable( FALSE ) -, bNext( FALSE ) +, bSelecting( sal_False ) +, bAvailable( sal_False ) +, bNext( sal_False ) { FreeResource(); PushButtonTT_PB_NEXT.SetClickHdl( LINK( this, TranslateWin, DoNext ) ); @@ -1694,7 +1694,7 @@ TranslateWin::~TranslateWin() Application::RemoveEventHook( nEventHookID ); } -BOOL TranslateWin::TestChangedDataSaved() +sal_Bool TranslateWin::TestChangedDataSaved() { if ( ( EditTT_E_NEW.GetText().CompareTo( FixedTextTT_FT_OLD.GetText() ) != COMPARE_EQUAL || EditTT_E_COMMENT.GetText().Len() ) @@ -1703,7 +1703,7 @@ BOOL TranslateWin::TestChangedDataSaved() return MessBox( this, TTProperties::GetSvtResId( TT_DISCARD_CHANGED_DATA ) ).Execute() == RET_YES; } else - return TRUE; + return sal_True; } IMPL_LINK( TranslateWin, DoAccept, PushButton*, EMPTYARG ) @@ -1714,7 +1714,7 @@ IMPL_LINK( TranslateWin, DoAccept, PushButton*, EMPTYARG ) EditTT_E_NEW.Disable(); EditTT_E_COMMENT.Disable(); PushButtonTT_PB_ACCEPT.Disable(); - bAvailable = TRUE; + bAvailable = sal_True; return 0; } @@ -1728,7 +1728,7 @@ IMPL_LINK( TranslateWin, DoNext, PushButton*, EMPTYARG ) EditTT_E_NEW.Disable(); EditTT_E_COMMENT.Disable(); PushButtonTT_PB_ACCEPT.Disable(); - bNext = TRUE; + bNext = sal_True; } return 0; } @@ -1738,7 +1738,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG ) if ( bSelecting ) { // ReleaseMouse(); - bSelecting = FALSE; + bSelecting = sal_False; } else { @@ -1746,7 +1746,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG ) { PushButtonTT_PB_RESTORE.Disable(); // CaptureMouse(); - bSelecting = TRUE; + bSelecting = sal_True; } } return 0; @@ -1772,7 +1772,7 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG ) PushButtonTT_PB_RESTORE.Disable(); } if ( StatementList::WinPtrValid( pTranslateWin ) ) - MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE ); + MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True ); return 0; } @@ -1796,7 +1796,7 @@ IMPL_LINK( TranslateWin, ShowInplace, Timer*, EMPTYARG ) sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") ); pTranslateWin->SetText( sTT_E_NEW ); - MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE ); + MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True ); } return 0; } @@ -1814,7 +1814,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) if ( Act ) { Window *pWin = Act; - USHORT i; + sal_uInt16 i; for ( i = 0 ; i < Act->GetChildCount() ; i++ ) { pWin = Act->GetChild(i); @@ -1878,7 +1878,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) pTranslateWin = Act; if ( pTranslateWin ) { - MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE ); + MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True ); // alle CRs quoten (NF) String sTT_E_NEW( pTranslateWin->GetText()); sTT_E_NEW.SearchAndReplaceAll( CUniString("\n"), CUniString("\\n") ); @@ -1894,7 +1894,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) PushButtonTT_PB_ACCEPT.Enable(); } // ReleaseMouse(); - bSelecting = FALSE; + bSelecting = sal_False; } } @@ -1908,11 +1908,11 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) class FindShortcutErrors: public Search { String aShortcuts,aDoubleShortcuts; - USHORT nAction; + sal_uInt16 nAction; public: FindShortcutErrors(); - virtual BOOL IsWinOK( Window *pWin ); - void SetAction( USHORT nA ); + virtual sal_Bool IsWinOK( Window *pWin ); + void SetAction( sal_uInt16 nA ); String GetDoubleShortcuts() { return aDoubleShortcuts; } }; @@ -1922,7 +1922,7 @@ FindShortcutErrors::FindShortcutErrors() SetAction( FDS_ACTION_COLLECT ); // Wir fange immer mit sammeln an, ODER?? } -void FindShortcutErrors::SetAction( USHORT nA ) +void FindShortcutErrors::SetAction( sal_uInt16 nA ) { nAction = nA; if ( FDS_ACTION_COLLECT == nAction ) @@ -1932,14 +1932,14 @@ void FindShortcutErrors::SetAction( USHORT nA ) } } -BOOL FindShortcutErrors::IsWinOK( Window *pWin ) +sal_Bool FindShortcutErrors::IsWinOK( Window *pWin ) { if ( pWin->IsReallyVisible() ) { String aText = pWin->GetText(); xub_StrLen nPos = aText.Search('~'); String aShortcut; - BOOL bHasAccel = FALSE; + sal_Bool bHasAccel = sal_False; if ( nPos != STRING_NOTFOUND ) { aShortcut = aText.Copy( nPos+1, 1 ); @@ -1959,7 +1959,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin ) break; case FDS_ACTION_MARK: { - BOOL bMissing = FALSE; + sal_Bool bMissing = sal_False; if ( !bHasAccel && aText.Len() ) // should there be an accelarator defined { @@ -1973,7 +1973,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin ) (pChild->GetType() == WINDOW_PUSHBUTTON) ) { if ( !pChild->GetText().EqualsAscii( "..." ) ) - bMissing = TRUE; + bMissing = sal_True; } if ( pChild->GetType() == WINDOW_FIXEDTEXT ) @@ -2003,7 +2003,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin ) (pTempChild->GetType() == WINDOW_DATEBOX) || (pTempChild->GetType() == WINDOW_TIMEBOX) ) { - bMissing = TRUE; + bMissing = sal_True; } } } @@ -2051,22 +2051,22 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin ) pWin->SetControlBackground(); } - return FALSE; + return sal_False; } -String TranslateWin::MarkShortcutErrors( Window* pBase, BOOL bMark ) +String TranslateWin::MarkShortcutErrors( Window* pBase, sal_Bool bMark ) { if ( pBase ) { FindShortcutErrors aFinder; if ( bMark ) { - StatementList::SearchAllWin( pBase, aFinder, TRUE ); // collect Shortcuts first + StatementList::SearchAllWin( pBase, aFinder, sal_True ); // collect Shortcuts first aFinder.SetAction( FDS_ACTION_MARK ); } else aFinder.SetAction( FDS_ACTION_UNMARK ); - StatementList::SearchAllWin( pBase, aFinder, TRUE ); + StatementList::SearchAllWin( pBase, aFinder, sal_True ); return aFinder.GetDoubleShortcuts(); } return UniString(); @@ -2076,8 +2076,8 @@ void TranslateWin::EnableTranslation() { PushButtonTT_PB_SELECT.Enable(); PushButtonTT_PB_NEXT.Enable(); - bAvailable = FALSE; - bNext = FALSE; + bAvailable = sal_False; + bNext = sal_False; } void StatementCommand::Translate() @@ -2086,11 +2086,11 @@ void StatementCommand::Translate() if( (nParams & PARAM_STR_1) && nLNr1 ) { String aDouble; - Window *pWin = SearchTree( Str2Id( aString1 ) ,FALSE ); + Window *pWin = SearchTree( Str2Id( aString1 ) ,sal_False ); if ( pWin ) { pWin = pWin->GetWindow( WINDOW_OVERLAP ); - aDouble = TranslateWin::MarkShortcutErrors( pWin, TRUE ); + aDouble = TranslateWin::MarkShortcutErrors( pWin, sal_True ); } pRet->GenReturn ( RET_Value, nMethodId, aDouble ); return; @@ -2099,18 +2099,18 @@ void StatementCommand::Translate() if ( !GetTTSettings()->pTranslateWin ) { GetTTSettings()->pTranslateWin = new TranslateWin; - GetTTSettings()->bToTop = TRUE; + GetTTSettings()->bToTop = sal_True; } GetTTSettings()->pTranslateWin->Show(); if ( GetTTSettings()->bToTop ) { GetTTSettings()->pTranslateWin->ToTop(); - GetTTSettings()->bToTop = FALSE; + GetTTSettings()->bToTop = sal_False; } -// GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE ); - GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE ); +// GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( sal_True, sal_True ); + GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( sal_True, sal_True ); if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() ) { @@ -2177,7 +2177,7 @@ void StatementCommand::Translate() pRet->GenReturn ( RET_Value, nMethodId, aTranslation ); GetTTSettings()->pTranslateWin->EnableTranslation(); - GetTTSettings()->bToTop = TRUE; + GetTTSettings()->bToTop = sal_True; } else { @@ -2185,7 +2185,7 @@ void StatementCommand::Translate() GetTTSettings()->pTranslateWin->EnableTranslation(); ErrorBox err( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL )); err.Execute(); - GetTTSettings()->bToTop = TRUE; + GetTTSettings()->bToTop = sal_True; } } @@ -2194,7 +2194,7 @@ void StatementCommand::Translate() pRet->GenReturn ( RET_Value, nMethodId, CUniString("1") ); GetTTSettings()->pTranslateWin->ResetNextDialog(); GetTTSettings()->pTranslateWin->LoseFocus(); - GetTTSettings()->bToTop = TRUE; + GetTTSettings()->bToTop = sal_True; } else { @@ -2281,7 +2281,7 @@ Window* StatementCommand::GetNextRecoverWin() return NULL; } -BOOL StatementCommand::Execute() +sal_Bool StatementCommand::Execute() { if ( IsError ) { @@ -2293,7 +2293,7 @@ BOOL StatementCommand::Execute() Advance(); delete this; - return TRUE; + return sal_True; } InitProfile(); @@ -2336,29 +2336,29 @@ BOOL StatementCommand::Execute() if ( !bBool1 ) { nLNr1 = Time().GetTime() + nNr1/10; - bBool1 = TRUE; + bBool1 = sal_True; } if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit - return FALSE; + return sal_False; break; case RC_DisplayHid: if ( DisplayHID() ) - return FALSE; + return sal_False; break; case RC_ResetApplication: { if ( !bBool1 ) { nRetryCount = 150; // das sollte reichen. - bBool1 = TRUE; // Nur beim ersten mal! + bBool1 = sal_True; // Nur beim ersten mal! nNr1 = 1; // Welcher Button ist dran? nLNr1 = 0; // Speichern des AppWin aString1 = UniString(); // Liste der geschlossenen Fenster // So daß nacher auch wieder alles auf Default steht nUseBindings = 0; - bCatchGPF = TRUE; - bUsePostEvents = TRUE; + bCatchGPF = sal_True; + bUsePostEvents = sal_True; aSubMenuId1 = 0; aSubMenuId2 = 0; @@ -2372,7 +2372,7 @@ BOOL StatementCommand::Execute() if ( pControl ) { - bBool2 = FALSE; // flag for wait when all windows are closed + bBool2 = sal_False; // flag for wait when all windows are closed pControl->GrabFocus(); if ( pControl->GetType() != WINDOW_DOCKINGWINDOW @@ -2453,7 +2453,7 @@ BOOL StatementCommand::Execute() break; default: { - USHORT nID = pBD->GetButtonId( nNr1-10 ); + sal_uInt16 nID = pBD->GetButtonId( nNr1-10 ); if ( nID != BUTTONID_HELP ) { REPORT_WIN_CLOSED(pControl, CUniString("Message Box (").Append( UniString::CreateFromInt32(nID) ).AppendAscii(")")); @@ -2474,7 +2474,7 @@ BOOL StatementCommand::Execute() #endif break; } - return FALSE; + return sal_False; } else { @@ -2489,9 +2489,9 @@ BOOL StatementCommand::Execute() // Eigentlich nur bei TaskWindows! Hoffen wir mal, daß keine anderen DockingWindows dazwischen hauen. if ( (Window*)nLNr1 != pControl ) nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen - nLNr1 = (ULONG)pControl; + nLNr1 = (sal_uLong)pControl; - return FALSE; + return sal_False; } } if ( nRetryCount-- @@ -2521,9 +2521,9 @@ BOOL StatementCommand::Execute() // nur bei TaskWindows! if ( (Window*)nLNr1 != pControl ) nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen - nLNr1 = (ULONG)pControl; + nLNr1 = (sal_uLong)pControl; - return FALSE; + return sal_False; } } } @@ -2538,9 +2538,9 @@ BOOL StatementCommand::Execute() // Eigentlich nur bei TaskWindows! if ( (Window*)nLNr1 != pControl ) nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen - nLNr1 = (ULONG)pControl; + nLNr1 = (sal_uLong)pControl; - return FALSE; + return sal_False; } } } @@ -2551,10 +2551,10 @@ BOOL StatementCommand::Execute() if ( !bBool2 ) { nLNr1 = Time().GetTime() + 100; // 100 = 1 Second - bBool2 = TRUE; + bBool2 = sal_True; } if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit - return FALSE; + return sal_False; else pRet->GenReturn ( RET_Value, nMethodId, aString1); } @@ -2566,7 +2566,7 @@ BOOL StatementCommand::Execute() if ( !bBool1 ) { nLNr1 = Time().GetTime() + nNr1/10; - bBool1 = TRUE; + bBool1 = sal_True; } if ( !bIsSlotInExecute ) @@ -2574,7 +2574,7 @@ BOOL StatementCommand::Execute() else { if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit - return FALSE; + return sal_False; pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSTimeout) ); } } @@ -2623,7 +2623,7 @@ BOOL StatementCommand::Execute() break; case RC_ApplicationBusy: { - BOOL bWait = FALSE; + sal_Bool bWait = sal_False; ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) ); // if ( Application::GetAppWindow() ) // bWait = Application::GetAppWindow()->IsWait(); @@ -2645,12 +2645,12 @@ BOOL StatementCommand::Execute() break; #if OSL_DEBUG_LEVEL > 1 case RC_NoDebug: - m_pDbgWin->bQuiet = TRUE; + m_pDbgWin->bQuiet = sal_True; m_pDbgWin->Hide(); m_pDbgWin->Clear(); break; case RC_Debug: - m_pDbgWin->bQuiet = FALSE; + m_pDbgWin->bQuiet = sal_False; m_pDbgWin->Show(); break; #endif @@ -2778,7 +2778,7 @@ BOOL StatementCommand::Execute() MenuBar *pMenuBar = NULL; Menu *pMenu; - USHORT nErr = GetCurrentMenues( pPopup, pMenuBar, pMenu ); + sal_uInt16 nErr = GetCurrentMenues( pPopup, pMenuBar, pMenu ); if ( !pMenu ) { @@ -2789,7 +2789,7 @@ BOOL StatementCommand::Execute() break; } - USHORT nItemCount = 0; + sal_uInt16 nItemCount = 0; switch ( nMethodId ) { case RC_MenuGetItemCount: @@ -2799,8 +2799,8 @@ BOOL StatementCommand::Execute() nItemCount = pMenu->GetItemCount(); if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) { // jep, we have to adjust the count - BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top - for ( USHORT i = 0 ; i < pMenu->GetItemCount() ; i++ ) + sal_Bool bLastWasSeperator = sal_True; // sal_True for Separator at the top + for ( sal_uInt16 i = 0 ; i < pMenu->GetItemCount() ; i++ ) { if ( !pMenu->IsItemEnabled( pMenu->GetItemId( i ) ) ) nItemCount--; @@ -2819,7 +2819,7 @@ BOOL StatementCommand::Execute() } // for certain methods calculate the physical index (reinserting the hidden entries) - USHORT nPhysicalIndex = 0; + sal_uInt16 nPhysicalIndex = 0; switch ( nMethodId ) { case RC_MenuGetItemId: @@ -2828,9 +2828,9 @@ BOOL StatementCommand::Execute() nPhysicalIndex = nNr1; if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) { // jep, we have to adjust the position - BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top - USHORT nVisibleCount = 0; - for ( USHORT i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ ) + sal_Bool bLastWasSeperator = sal_True; // sal_True for Separator at the top + sal_uInt16 nVisibleCount = 0; + for ( sal_uInt16 i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ ) { if ( pMenu->IsItemEnabled( pMenu->GetItemId( i ) ) && !( pMenu->GetItemType( i ) == MENUITEM_SEPARATOR && bLastWasSeperator ) ) @@ -2864,20 +2864,20 @@ BOOL StatementCommand::Execute() break; case RC_MenuGetItemPos: { - USHORT nLogicalPos = pMenu->GetItemPos(nNr1); + sal_uInt16 nLogicalPos = pMenu->GetItemPos(nNr1); if ( MENU_ITEM_NOTFOUND != nLogicalPos && pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) { // jep, we have to adjust the position if ( !pMenu->IsItemEnabled( nNr1 ) ) nLogicalPos = MENU_ITEM_NOTFOUND; else { - BOOL bLastWasSeperator = FALSE; + sal_Bool bLastWasSeperator = sal_False; for ( int i = nLogicalPos ; i >= 0 ; i-- ) { - if ( !pMenu->IsItemEnabled( pMenu->GetItemId( sal::static_int_cast< USHORT >(i) ) ) || - ( pMenu->GetItemType( sal::static_int_cast< USHORT >(i) ) == MENUITEM_SEPARATOR && bLastWasSeperator ) ) + if ( !pMenu->IsItemEnabled( pMenu->GetItemId( sal::static_int_cast< sal_uInt16 >(i) ) ) || + ( pMenu->GetItemType( sal::static_int_cast< sal_uInt16 >(i) ) == MENUITEM_SEPARATOR && bLastWasSeperator ) ) nLogicalPos--; - bLastWasSeperator = pMenu->GetItemType( sal::static_int_cast< USHORT >(i) ) == MENUITEM_SEPARATOR; + bLastWasSeperator = pMenu->GetItemType( sal::static_int_cast< sal_uInt16 >(i) ) == MENUITEM_SEPARATOR; } } } @@ -2912,7 +2912,7 @@ BOOL StatementCommand::Execute() break; case RC_MenuHasSubMenu: { - pRet->GenReturn ( RET_Value, nMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) ); + pRet->GenReturn ( RET_Value, nMethodId, (sal_Bool)(pMenu->GetPopupMenu(nNr1) != NULL) ); } break; case RC_MenuSelect: @@ -3016,7 +3016,7 @@ BOOL StatementCommand::Execute() { String aPath; - USHORT nDirFlags = 0; + sal_uInt16 nDirFlags = 0; // from basic/source/inc/runtime.hxx #define Sb_ATTR_NORMAL 0x0000 #define Sb_ATTR_HIDDEN 0x0002 @@ -3039,7 +3039,7 @@ BOOL StatementCommand::Execute() } else { - USHORT nFlags = 0; + sal_uInt16 nFlags = 0; if ( (nParams & PARAM_USHORT_1) ) nDirFlags = nFlags = nNr1; else @@ -3052,7 +3052,7 @@ BOOL StatementCommand::Execute() else { // Die richtige Auswahl treffen - USHORT nMode = FSYS_KIND_FILE; + sal_uInt16 nMode = FSYS_KIND_FILE; if( nFlags & Sb_ATTR_DIRECTORY ) nMode |= FSYS_KIND_DIR; if( nFlags == Sb_ATTR_DIRECTORY ) @@ -3148,7 +3148,7 @@ BOOL StatementCommand::Execute() if ( FSYS_ERR_OK == nErrorcode ) { FileStat aFS( aFile ); - pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit + pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_ULONG on 64bit nErrorcode = aFS.GetError(); } } @@ -3309,7 +3309,7 @@ BOOL StatementCommand::Execute() } #if OSL_DEBUG_LEVEL > 1 - USHORT nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count(); + sal_uInt16 nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count(); (void) nEntries; /* avoid warning about unused parameter */ #endif // The Count is only larger than 2 is the path is a directory which is not empty @@ -3394,7 +3394,7 @@ BOOL StatementCommand::Execute() case RC_RecordMacro: { if ( ! (nParams & PARAM_BOOL_1) ) - bBool1 = TRUE; + bBool1 = sal_True; MacroRecorder::GetMacroRecorder()->SetActionRecord( bBool1 ); } @@ -3432,18 +3432,18 @@ BOOL StatementCommand::Execute() if( (nParams & PARAM_BOOL_1) ) bCatchGPF = bBool1; else - bCatchGPF = TRUE; + bCatchGPF = sal_True; } break; case RC_IsProduct : { - BOOL bIsProduct; + sal_Bool bIsProduct; #ifdef DBG_UTIL - bIsProduct = FALSE; + bIsProduct = sal_False; #else - bIsProduct = TRUE; + bIsProduct = sal_True; #endif - pRet->GenReturn ( RET_Value, nMethodId, (BOOL)bIsProduct ); + pRet->GenReturn ( RET_Value, nMethodId, (sal_Bool)bIsProduct ); } break; case RC_UsePostEvents : @@ -3451,7 +3451,7 @@ BOOL StatementCommand::Execute() if( (nParams & PARAM_BOOL_1) ) bUsePostEvents = bBool1; else - bUsePostEvents = TRUE; + bUsePostEvents = sal_True; } break; default: @@ -3459,38 +3459,38 @@ BOOL StatementCommand::Execute() } SendProfile( RcString(nMethodId) ); delete this; - return TRUE; + return sal_True; } -BOOL StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir ) +sal_Bool StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir ) { SvStorageInfoList aList; xStorage->FillInfoList( &aList ); - for( USHORT i = 0; i < aList.Count(); i++ ) + for( sal_uInt16 i = 0; i < aList.Count(); i++ ) { SvStorageInfo& rInfo = aList.GetObject( i ); String aName = rInfo.GetName(); DirEntry aPath ( aBaseDir ); aPath += DirEntry( aName ); - BOOL bIsStorage = xStorage->IsStorage( aName ); + sal_Bool bIsStorage = xStorage->IsStorage( aName ); if ( bIsStorage ) { SotStorageRef xSubStorage = xStorage->OpenSotStorage( aName, STREAM_STD_READ ); if ( xSubStorage->GetError() ) { ReportError( GEN_RES_STR2(S_UNPACKING_STORAGE_FAILED, aName, aPath.GetFull()) ); - return FALSE; + return sal_False; } UnpackStorage( xSubStorage, aPath ); } else { - if ( !aPath.MakeDir( TRUE ) ) + if ( !aPath.MakeDir( sal_True ) ) { ReportError( GEN_RES_STR1(S_CANNOT_CREATE_DIRECTORY, aPath.GetFull()) ); - return FALSE; + return sal_False; } SotStorageStreamRef xStream = xStorage->OpenSotStream( aName, STREAM_STD_READ ); SvFileStream aDestination( aPath.GetFull(), STREAM_STD_READWRITE | STREAM_TRUNC ); @@ -3498,18 +3498,18 @@ BOOL StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir if ( aDestination.GetError() != ERRCODE_NONE ) { ReportError( GEN_RES_STR2(S_UNPACKING_STORAGE_FAILED, aName, aPath.GetFull()) ); - return FALSE; + return sal_False; } aDestination.Close(); } } - return TRUE; + return sal_True; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) +StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdType ) : StatementList() , nNr1( 0 ) , nNr2( 0 ) @@ -3518,8 +3518,8 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) , nLNr1( 0 ) , aString1() , aString2() -, bBool1(FALSE) -, bBool2(FALSE) +, bBool1(sal_False) +, bBool2(sal_False) { QueStatement( NULL ); //HELPID BACKWARD (SIControl is no longer needed) @@ -3576,10 +3576,10 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) #endif } -BOOL IsDialog(Window *pWin) +sal_Bool IsDialog(Window *pWin) { // Alles was von SystemWindow abgeleitet ist if ( !pWin ) - return FALSE; + return sal_False; switch (pWin->GetType()) { @@ -3609,19 +3609,19 @@ BOOL IsDialog(Window *pWin) case WINDOW_PATHDIALOG: - return TRUE; + return sal_True; // break; default: - return FALSE; + return sal_False; // break; } } -BOOL IsAccessable(Window *pWin) +sal_Bool IsAccessable(Window *pWin) { if ( pWin == NULL ) - return FALSE; + return sal_False; return pWin->IsEnabled() && pWin->IsInputEnabled(); } @@ -3631,8 +3631,8 @@ BOOL IsAccessable(Window *pWin) // neue Hilfsfunktion static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits ) { - USHORT n = pBase->GetChildCount(); - for( USHORT i = 0 ; i < n; i++ ) { + sal_uInt16 n = pBase->GetChildCount(); + for( sal_uInt16 i = 0 ; i < n; i++ ) { Window *pChild = pBase->GetChild(i); if( pChild->GetType() == WINDOW_OKBUTTON || pChild->GetType() == WINDOW_CANCELBUTTON @@ -3644,12 +3644,12 @@ static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits ) return NULL; } -BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung ) +sal_Bool StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung ) { if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) && pControl->IsVisible() ) || aUId.equals( UID_ACTIVE ) ) ) - return TRUE; + return sal_True; else { UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US ); @@ -3666,30 +3666,30 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung m_pDbgWin->AddText( aBezeichnung.AppendAscii(" NotFound or Disabled or Invisible") ); #endif - return FALSE; + return sal_False; } } -BOOL StatementList::ValueOK( rtl::OString aId, String aBezeichnung, ULONG nValue, ULONG nMax ) +sal_Bool StatementList::ValueOK( rtl::OString aId, String aBezeichnung, sal_uLong nValue, sal_uLong nMax ) { if ( nMax < nValue ) { if ( aBezeichnung.Len() > 0 ) ReportError( aId, GEN_RES_STR3( S_NUMBER_TOO_BIG, aBezeichnung, UniString::CreateFromInt32( nValue ), UniString::CreateFromInt32( nMax ) ) ); - return FALSE; + return sal_False; } if ( nValue < 1 ) { if ( aBezeichnung.Len() > 0 ) ReportError( aId, GEN_RES_STR3c3( S_NUMBER_TOO_SMALL, aBezeichnung, UniString::CreateFromInt32( nValue ), "1" ) ); - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } -USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ) +sal_uInt16 StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ) { if ( WinPtrValid( pMenuWindow ) ) pMenuBar = pMenuWindow->GetMenuBar(); @@ -3775,7 +3775,7 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin ) aDiff *= 1000; aDiff /= nSteps; - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_True; // Bah ist das ein ekliger Hack // Das verhindert, daß schon der nächste Befehl ausgeführt wird. for ( ; nSteps ; nSteps-- ) @@ -3788,37 +3788,37 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin ) SafeReschedule(); } pControl->SetPointerPosPixel(aZiel); - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_False; // Bah ist das ein ekliger Hack } -BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow ) +sal_Bool StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow ) { if ( bDoTypeKeysDelay ) { - ULONG nTimeWait = nMinTypeKeysDelay; + sal_uLong nTimeWait = nMinTypeKeysDelay; if ( nMaxTypeKeysDelay != nMinTypeKeysDelay ) nTimeWait += Time::GetSystemTicks() % ( nMaxTypeKeysDelay - nMinTypeKeysDelay ); Timer aTimer; aTimer.SetTimeout( nTimeWait ); aTimer.Start(); - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_True; // Bah ist das ein ekliger Hack // Das verhindert, daß schon der nächste Befehl ausgeführt wird. while ( aTimer.IsActive() ) { - SafeReschedule( TRUE ); + SafeReschedule( sal_True ); } - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_False; // Bah ist das ein ekliger Hack if ( !WinPtrValid(pTestWindow ) ) { ReportError( aUId, GEN_RES_STR1( S_WINDOW_DISAPPEARED, MethodString( nMethodId ) ) ); - return FALSE; + return sal_False; } } - return TRUE; + return sal_True; } -BOOL StatementControl::HandleVisibleControls( Window *pControl ) +sal_Bool StatementControl::HandleVisibleControls( Window *pControl ) { if( pControl ) // Also auch bei Disabled nicht jedoch bei Invisible { @@ -3913,15 +3913,15 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) nParams |= PARAM_USHORT_2; nParams |= PARAM_USHORT_3; nParams |= PARAM_USHORT_4; - nNr1 = (USHORT)-aStart.X(); - nNr2 = (USHORT)-aStart.Y(); - nNr3 = (USHORT)pControl->GetSizePixel().Width() + 2*(USHORT)aStart.X(); - nNr4 = (USHORT)pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y(); + nNr1 = (sal_uInt16)-aStart.X(); + nNr2 = (sal_uInt16)-aStart.Y(); + nNr3 = (sal_uInt16)pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X(); + nNr4 = (sal_uInt16)pControl->GetSizePixel().Height() + 2*(sal_uInt16)aStart.Y(); } - nNr1 = std::max((USHORT)-aStart.X(),nNr1); - nNr2 = std::max((USHORT)-aStart.Y(),nNr2); - nNr3 = std::min((USHORT)(pControl->GetSizePixel().Width() + 2*(USHORT)aStart.X()),nNr3); - nNr4 = std::min((USHORT)(pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y()),nNr4); + nNr1 = std::max((sal_uInt16)-aStart.X(),nNr1); + nNr2 = std::max((sal_uInt16)-aStart.Y(),nNr2); + 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 ) { // Zuschneiden @@ -3944,7 +3944,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) break; case M_GetFixedTextCount: { - pRet->GenReturn ( RET_Value, aUId, CountWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE ) ); + pRet->GenReturn ( RET_Value, aUId, CountWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True ) ); } break; case M_GetFixedText: @@ -3952,23 +3952,23 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) if( ( nParams & PARAM_USHORT_1 ) == 0 ) nNr1 = 1; - FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE, nNr1-1 ); + FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True, nNr1-1 ); if ( pFixedText ) pRet->GenReturn ( RET_Value, aUId, pFixedText->GetText() ); else - ValueOK(aUId, MethodString( nMethodId ),nNr1,CountWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE ) ); + ValueOK(aUId, MethodString( nMethodId ),nNr1,CountWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True ) ); } break; default: - return FALSE; + return sal_False; } SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL StatementControl::HandleCommonMethods( Window *pControl ) +sal_Bool StatementControl::HandleCommonMethods( Window *pControl ) { switch( nMethodId ) // Diese können an jedem Window ausgeführt werden { @@ -3996,14 +3996,14 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if( !(nParams & PARAM_USHORT_1) ) // Anzahl wiederholungen nNr1 = 1; if( !(nParams & PARAM_BOOL_1) ) // Follow Focus - bBool1 = FALSE; // so bleibt das bisherige Verhalten + bBool1 = sal_False; // so bleibt das bisherige Verhalten if ( !bBool1 ) // Altes Verhalten pControl->GrabFocus(); else // If focus is not inside given control we grab it once. { Window *pFocus = GetpApp()->GetFocusWindow(); - if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) ) + if ( !pFocus || !pControl->IsWindowOrChild( pFocus, sal_True ) ) pControl->GrabFocus(); } @@ -4012,7 +4012,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( pControl->GetType() == WINDOW_COMBOBOX ) { // Bei COMBOBOX an das Edit direkt liefern Window *pTemp = NULL; - for ( USHORT i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ ) + for ( sal_uInt16 i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ ) if ( pControl->GetChild( i )->GetType() == WINDOW_EDIT ) pTemp = pControl->GetChild( i ); if ( pTemp ) @@ -4026,22 +4026,22 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( StatementList::bUsePostEvents ) { // grab focus every time Window *pFocus = GetpApp()->GetFocusWindow(); - if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) ) + if ( !pFocus || !pControl->IsWindowOrChild( pFocus, sal_True ) ) pControl->GrabFocus(); } if ( bBool1 ) // Jedesmal das FocusWindow finden { Window *pFocus = GetpApp()->GetFocusWindow(); - if ( pFocus && pControl->IsWindowOrChild( pFocus, TRUE ) ) + if ( pFocus && pControl->IsWindowOrChild( pFocus, sal_True ) ) pDeliverHere = pFocus; else // sonst fallback auf das Basisfenster pDeliverHere = pControl; } pDeliverHere = pDeliverHere->GetPreferredKeyInputWindow(); KeyEvent aEvent; - if ( ((USHORT)aString1.GetChar(i)) <= 7 ) + if ( ((sal_uInt16)aString1.GetChar(i)) <= 7 ) { - USHORT nVal = 0; + sal_uInt16 nVal = 0; switch (aString1.GetChar(i)) { case 1: nVal = aString1.GetChar(i+1) + (aString1.GetChar(i+2) << 8); @@ -4058,8 +4058,8 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) } // #105672# // find out the keycode - USHORT nKeygroup = nVal & KEYGROUP_TYPE; - USHORT nKeyCode = nVal & KEY_CODE; + sal_uInt16 nKeygroup = nVal & KEYGROUP_TYPE; + sal_uInt16 nKeyCode = nVal & KEY_CODE; sal_Unicode aCh; switch (nKeygroup) { @@ -4104,7 +4104,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) else if ( aCh >= '0' && aCh <= '9' ) aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_NUM + aCh-'0', 0)); else if ( aPrintableMisc.Search(aCh) != STRING_NOTFOUND ) - aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (USHORT)aPrintableMisc.Search(aCh), 0)); + aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (sal_uInt16)aPrintableMisc.Search(aCh), 0)); else // Sollte eigentlich nicht auftreten aEvent = KeyEvent(aCh, KeyCode()); } @@ -4118,7 +4118,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; #define CalcMouseButton\ - USHORT nButton = MOUSE_LEFT;\ + sal_uInt16 nButton = MOUSE_LEFT;\ if ( (nParams & PARAM_USHORT_3) )\ {\ switch ( nNr3 )\ @@ -4225,7 +4225,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) pDlg->SetText(UniString("Schließen", RTL_TEXTENCODING_ISO_8859_1)); pDlg->Show(); pMyEd->Show(); - ULONG nTime = Time().GetTime(); + sal_uLong nTime = Time().GetTime(); while (pDlg->IsVisible()) { @@ -4263,7 +4263,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) } else { - BOOL bAtMousePos = ( nParams & PARAM_BOOL_1 ) && bBool1; + sal_Bool bAtMousePos = ( nParams & PARAM_BOOL_1 ) && bBool1; if ( bAtMousePos ) { aPos = pControl->GetPointerPosPixel(); @@ -4387,7 +4387,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) StatusBar *pStatus = NULL; while ( !pStatus && pControl ) { - pStatus = (StatusBar*)GetWinByRT( pControl, WINDOW_STATUSBAR, TRUE ); + pStatus = (StatusBar*)GetWinByRT( pControl, WINDOW_STATUSBAR, sal_True ); pControl = pControl->GET_REAL_PARENT(); } @@ -4464,10 +4464,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) ScrollBar *pScroll = NULL; - USHORT nSteps = 2; + sal_uInt16 nSteps = 2; while ( !pScroll && pControl && nSteps-- ) { - pScroll = GetScrollBar( pControl, nNr1, TRUE ); + pScroll = GetScrollBar( pControl, nNr1, sal_True ); pControl = pControl->GET_REAL_PARENT(); } @@ -4476,9 +4476,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) case M_HasScrollBar: { if ( pScroll ) - pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE ); + pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_True ); else - pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE ); + pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_False ); } break; case M_IsScrollBarEnabled: @@ -4495,16 +4495,16 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) } break; default: - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } -BOOL StatementControl::Execute() +sal_Bool StatementControl::Execute() { Window *pControl; - BOOL bStatementDone = TRUE; + sal_Bool bStatementDone = sal_True; if ( IsError ) @@ -4518,7 +4518,7 @@ BOOL StatementControl::Execute() #endif Advance(); delete this; - return TRUE; + return sal_True; } InitProfile(); @@ -4535,7 +4535,7 @@ BOOL StatementControl::Execute() pControl = GetAnyActive(); else { - BOOL bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId)); + 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); if ( nMethodId == M_TypeKeys || nMethodId == M_MouseDown || nMethodId == M_MouseUp || nMethodId == M_MouseMove @@ -4576,10 +4576,10 @@ BOOL StatementControl::Execute() case M_Exists: case M_NotExists: Time aT; - USHORT aSeconds = aT.GetMin()*60+aT.GetSec(); - if ( !bBool2 ) // wurde im Konstruktor auf FALSE gesetzt + sal_uInt16 aSeconds = aT.GetMin()*60+aT.GetSec(); + if ( !bBool2 ) // wurde im Konstruktor auf sal_False gesetzt { - bBool2 = TRUE; + bBool2 = sal_True; nNr2 = aSeconds; if( !(nParams & PARAM_USHORT_1) ) nNr1 = 0; // defaultmäßig sofort zurück @@ -4592,17 +4592,17 @@ BOOL StatementControl::Execute() if ( ((nMethodId == M_Exists) && pControl) || ((nMethodId == M_NotExists) && !pControl) ) { // Wenn Bedingung erfüllt - pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE ); + pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_True ); } else if ( aSeconds <= nNr2 + nNr1 ) // Zeit ist noch nicht abgelaufen - return FALSE; + return sal_False; else - pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE ); + pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_False ); Advance(); delete this; - return TRUE; + return sal_True; // break; } @@ -4647,7 +4647,7 @@ BOOL StatementControl::Execute() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( CUniString("Reschedule command (").Append( UniString::CreateFromInt32(nRetryCount) ).AppendAscii(")\n") ); #endif - return FALSE; + return sal_False; } if( ControlOK( pControl, "" ) ) @@ -4655,8 +4655,8 @@ BOOL StatementControl::Execute() if ( nMethodId == M_OpenContextMenu && !bBool2 ) { pControl->GrabFocus(); // to get asyncron focus on unix - bBool2 = TRUE; - return FALSE; + bBool2 = sal_True; + return sal_False; } // TODO: handle GetFocus for all Methods and Windows like this (remove part below) // See for impact of changed focus for HandleVisibleControls() (taking Snapshots might be different, possible exclude those methods) @@ -4675,12 +4675,12 @@ BOOL StatementControl::Execute() { SafeReschedule(); if ( !WinPtrValid( pControl ) ) - return FALSE; + return sal_False; } if ( !pControl->HasFocus() ) // to get asyncronous focus { - bBool2 = TRUE; - return FALSE; + bBool2 = sal_True; + return sal_False; } } } @@ -4691,7 +4691,7 @@ BOOL StatementControl::Execute() if ( HandleVisibleControls( pControl ) ) { delete this; - return TRUE; + return sal_True; } if( ControlOK( pControl, "Window/Control" ) ) { @@ -4715,7 +4715,7 @@ BOOL StatementControl::Execute() { // Hier wird das Statement auf ein TypeKeys umgebogen nMethodId = M_TypeKeys; nParams = PARAM_BOOL_1 | PARAM_STR_1; - bBool1 = TRUE; + bBool1 = sal_True; pControl->GrabFocus(); } */ @@ -4759,8 +4759,8 @@ BOOL StatementControl::Execute() case M_SetPage : { // Wegen lokaler Variablen TabControl *pTControl = ((TabControl*)pControl); - USHORT nActive = pTControl->GetCurPageId(); - USHORT i,anz; + sal_uInt16 nActive = pTControl->GetCurPageId(); + sal_uInt16 i,anz; rtl::OString aID; rtl::OString aWantedID; //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part) @@ -4957,21 +4957,21 @@ BOOL StatementControl::Execute() case M_Select: case M_MultiSelect: { - BOOL bUnselectBeforeSelect = ( nMethodId == M_Select ); - BOOL bFehler = FALSE; + sal_Bool bUnselectBeforeSelect = ( nMethodId == M_Select ); + sal_Bool bFehler = sal_False; if ( ! (nParams & PARAM_BOOL_1) ) - bBool1 = TRUE; + bBool1 = sal_True; if ( nMethodId == M_MultiSelect && nRT == C_ListBox ) { ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "ListBox" ) ); - bFehler = TRUE; + bFehler = sal_True; } if ( !bBool1 && nMethodId == M_Select ) { ReportError( aUId, GEN_RES_STR1( S_NO_SELECT_FALSE, MethodString( nMethodId ) ) ); - bFehler = TRUE; + bFehler = sal_True; } if ( !bFehler ) @@ -4979,7 +4979,7 @@ BOOL StatementControl::Execute() if( nParams & PARAM_STR_1 ) { ListBox *pLB = ((ListBox*)pControl); - USHORT nPos; + sal_uInt16 nPos; if ( (nPos = pLB->GetEntryPos( aString1 )) == LISTBOX_ENTRY_NOTFOUND ) ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) ); else @@ -5034,7 +5034,7 @@ BOOL StatementControl::Execute() break; case M_GetSelIndex : { - USHORT nPos = ((ComboBox*)pControl)->GetEntryPos(((ComboBox*)pControl)->GetText()); + sal_uInt16 nPos = ((ComboBox*)pControl)->GetEntryPos(((ComboBox*)pControl)->GetText()); if ( nPos == COMBOBOX_ENTRY_NOTFOUND ) nPos = 0; else @@ -5119,10 +5119,10 @@ BOOL StatementControl::Execute() ((MoreButton*)pControl)->Click(); break; case M_Open : - ((MoreButton*)pControl)->SetState(TRUE); + ((MoreButton*)pControl)->SetState(sal_True); break; case M_Close : - ((MoreButton*)pControl)->SetState(FALSE); + ((MoreButton*)pControl)->SetState(sal_False); break; default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MoreButton" ) ); @@ -5220,8 +5220,8 @@ BOOL StatementControl::Execute() aMEvnt = MouseEvent( aPt,1,MOUSE_SIMPLECLICK,MOUSE_LEFT ); ImplMouseButtonDown( pControl, aMEvnt, FORCE_DIRECT_CALL ); - ULONG nStart = Time::GetSystemTicks(); - ULONG nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay(); + sal_uLong nStart = Time::GetSystemTicks(); + sal_uLong nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay(); while ( ( Time::GetSystemTicks() - nStart ) < nDelay + 100 ) SafeReschedule(); @@ -5253,8 +5253,8 @@ BOOL StatementControl::Execute() } #define FIND_ITEM\ - USHORT nItemPos = 0;\ - BOOL bItemFound = FALSE;\ + sal_uInt16 nItemPos = 0;\ + sal_Bool bItemFound = sal_False;\ {\ rtl::OString aButtonId;\ if( nParams & PARAM_STR_1 )\ @@ -5271,12 +5271,12 @@ BOOL StatementControl::Execute() if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled && nMethodId != M_GetState )\ {\ ReportError( aUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\ - bItemFound = FALSE;\ + bItemFound = sal_False;\ }\ else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) && nMethodId != M_GetState )\ {\ ReportError( aUId, GEN_RES_STR1( S_BUTTON_HIDDEN_ON_TOOLBOX, MethodString( nMethodId ) ) );\ - bItemFound = FALSE;\ + bItemFound = sal_False;\ }\ else\ {\ @@ -5287,10 +5287,10 @@ BOOL StatementControl::Execute() { /* Try the multi line way */\ if ( pTB->GetItemRect(pTB->GetItemId(nItemPos)).IsEmpty() )\ {\ - USHORT nLine = pTB->GetCurLine();\ + sal_uInt16 nLine = pTB->GetCurLine();\ do\ {\ - pTB->ShowLine( FALSE );\ + pTB->ShowLine( sal_False );\ for ( int i = 1 ; i < 30 ; i++ )\ SafeReschedule();\ }\ @@ -5300,7 +5300,7 @@ BOOL StatementControl::Execute() if ( pTB->GetItemRect(pTB->GetItemId(nItemPos)).IsEmpty() )\ {\ ReportError( aUId, GEN_RES_STR1( S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX, MethodString( nMethodId ) ) );\ - bItemFound = FALSE;\ + bItemFound = sal_False;\ }\ }\ }\ @@ -5355,13 +5355,13 @@ BOOL StatementControl::Execute() Window *pWin = NULL; // Wait for the window to open. - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_True; // Bah ist das ein ekliger Hack { // Das verhindert, daß schon der nächste Befehl ausgeführt wird. Time aDelay; while ( !pWin && ( (pWin = GetPopupFloatingWin()) == NULL ) && ( Time() - aDelay ).GetSec() < 15 ) SafeReschedule(); } - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = sal_False; // Bah ist das ein ekliger Hack if ( pWin && pWin->GetType() == WINDOW_FLOATINGWINDOW ) { @@ -5496,9 +5496,9 @@ BOOL StatementControl::Execute() if ( pThisEntry ) { SvLBoxString* pItem = NULL; - USHORT nValidTextItemCount = 0; + sal_uInt16 nValidTextItemCount = 0; { - USHORT nIndex = 0; + sal_uInt16 nIndex = 0; SvLBoxItem *pMyItem; while ( ( nValidTextItemCount < nNr1 ) && nIndex < pThisEntry->ItemCount() ) { @@ -5536,7 +5536,7 @@ BOOL StatementControl::Execute() break; case M_Select : if ( ! (nParams & PARAM_BOOL_1) ) - bBool1 = TRUE; + bBool1 = sal_True; if( nParams & PARAM_STR_1 ) { /* ListBox *pLB = ((ListBox*)pControl); @@ -5748,7 +5748,7 @@ BOOL StatementControl::Execute() break; case C_Control: { - USHORT nRealControlType = 0; + sal_uInt16 nRealControlType = 0; if ( dynamic_cast< EditBrowseBox* >(pControl) ) nRealControlType = CONST_CTBrowseBox; else if ( dynamic_cast< ValueSet* >(pControl) ) @@ -5780,40 +5780,40 @@ BOOL StatementControl::Execute() /* - BOOL MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE ); + sal_Bool MakeFieldVisible( long nRow, sal_uInt16 nColId, sal_Bool bComplete = sal_False ); // access to dynamic values of cursor row - String GetColumnTitle( USHORT nColumnId ) const; - USHORT GetColumnId( USHORT nPos ) const; - USHORT GetColumnPos( USHORT nColumnId ) const; + String GetColumnTitle( sal_uInt16 nColumnId ) const; + sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; + sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; // access and movement of cursor long GetCurRow() const { return nCurRow; } - USHORT GetCurColumnId() const { return nCurColId; } - BOOL GoToRow( long nRow ); - BOOL GoToRowAndDoNotModifySelection( long nRow ); - BOOL GoToColumnId( USHORT nColId ); - BOOL GoToRowColumnId( long nRow, USHORT nColId ); + sal_uInt16 GetCurColumnId() const { return nCurColId; } + sal_Bool GoToRow( long nRow ); + sal_Bool GoToRowAndDoNotModifySelection( long nRow ); + sal_Bool GoToColumnId( sal_uInt16 nColId ); + sal_Bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections void SetNoSelection(); void SelectAll(); - void SelectRow( long nRow, BOOL bSelect = TRUE, BOOL bExpand = TRUE ); - void SelectColumnPos( USHORT nCol, BOOL bSelect = TRUE ) - { SelectColumnPos( nCol, bSelect, TRUE); } - void SelectColumnId( USHORT nColId, BOOL bSelect = TRUE ) - { SelectColumnPos( GetColumnPos(nColId), bSelect, TRUE); } + void SelectRow( long nRow, sal_Bool bSelect = sal_True, sal_Bool bExpand = sal_True ); + void SelectColumnPos( sal_uInt16 nCol, sal_Bool bSelect = sal_True ) + { SelectColumnPos( nCol, bSelect, sal_True); } + void SelectColumnId( sal_uInt16 nColId, sal_Bool bSelect = sal_True ) + { SelectColumnPos( GetColumnPos(nColId), bSelect, sal_True); } long GetSelectRowCount() const; - USHORT GetSelectColumnCount() const; - BOOL IsRowSelected( long nRow ) const; - BOOL IsColumnSelected( USHORT nColumnId ) const; - long FirstSelectedRow( BOOL bInverse = FALSE ); - long LastSelectedRow( BOOL bInverse = FALSE ); + sal_uInt16 GetSelectColumnCount() const; + sal_Bool IsRowSelected( long nRow ) const; + sal_Bool IsColumnSelected( sal_uInt16 nColumnId ) const; + long FirstSelectedRow( sal_Bool bInverse = sal_False ); + long LastSelectedRow( sal_Bool bInverse = sal_False ); long PrevSelectedRow(); long NextSelectedRow(); const MultiSelection* GetSelection() const { return bMultiSelection ? uRow.pSel : 0; } void SetSelection( const MultiSelection &rSelection ); - virtual String GetCellText(long _nRow, USHORT _nColId) const; - USHORT GetColumnCount() const { return ColCount(); } + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; + sal_uInt16 GetColumnCount() const { return ColCount(); } protected: virtual long GetRowCount() const; @@ -5840,9 +5840,9 @@ protected: break; case M_GetColumnCount : { - USHORT nColCount = pEBBox->GetColumnCount(); + sal_uInt16 nColCount = pEBBox->GetColumnCount(); comm_USHORT nUnfrozenColCount = 0; - USHORT i; + sal_uInt16 i; for ( i=0 ; i < nColCount ; i++ ) { if ( !pEBBox->IsFrozen( pEBBox->GetColumnId( i ) ) ) @@ -5867,9 +5867,9 @@ protected: { if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,pEBBox->GetRowCount() ) ) { - USHORT nColCount = pEBBox->GetColumnCount(); + sal_uInt16 nColCount = pEBBox->GetColumnCount(); comm_USHORT nUnfrozenColCount = 0; - USHORT i; + sal_uInt16 i; for ( i=0 ; i < nColCount ; i++ ) { if ( !pEBBox->IsFrozen( pEBBox->GetColumnId( i ) ) ) @@ -5921,7 +5921,7 @@ protected: break; case M_Select : if ( ! (nParams & PARAM_BOOL_1) ) - bBool1 = TRUE; + bBool1 = sal_True; if( nParams & PARAM_STR_1 ) { / * ListBox *pLB = ((ListBox*)pControl); @@ -6066,13 +6066,13 @@ protected: else if ( (nParams & PARAM_STR_1) ) { pELB->select( aString1 ); - BOOL bSuccess = TRUE; + sal_Bool bSuccess = sal_True; if ( pELB->getSelIndex() == EXTENSION_LISTBOX_ENTRY_NOTFOUND ) - bSuccess = FALSE; + bSuccess = sal_False; else { if ( !aString1.Equals( String( pELB->getItemName( pELB->getSelIndex() ) ) ) ) - bSuccess = FALSE; + bSuccess = sal_False; } if ( !bSuccess ) ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) ); @@ -6290,13 +6290,13 @@ protected: break; case M_Dock : if ( ((DockingWindow*)pControl)->IsFloatingMode() ) - ((DockingWindow*)pControl)->SetFloatingMode(FALSE); + ((DockingWindow*)pControl)->SetFloatingMode(sal_False); else ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) ); break; case M_Undock : if ( !((DockingWindow*)pControl)->IsFloatingMode() ) - ((DockingWindow*)pControl)->SetFloatingMode(TRUE); + ((DockingWindow*)pControl)->SetFloatingMode(sal_True); else ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) ); break; @@ -6479,14 +6479,14 @@ protected: pRet->GenReturn ( RET_Value, aUId, comm_BOOL (!((WorkWindow*)pControl)->IsMaximized() && !((WorkWindow*)pControl)->IsMinimized()) ); break; case M_Minimize : - ((WorkWindow*)pControl)->Maximize( FALSE ); + ((WorkWindow*)pControl)->Maximize( sal_False ); ((WorkWindow*)pControl)->Minimize(); break; case M_Maximize : ((WorkWindow*)pControl)->Maximize(); break; case M_Restore : - ((WorkWindow*)pControl)->Maximize( FALSE ); + ((WorkWindow*)pControl)->Maximize( sal_False ); ((WorkWindow*)pControl)->Restore(); break; case M_Help: // Alles was unten weiterbehandelt werden soll @@ -6505,7 +6505,7 @@ protected: case C_ErrorBox: case C_QueryBox: { - BOOL bDone = TRUE; + sal_Bool bDone = sal_True; MessBox* pMB = (MessBox*)pControl; switch( nMethodId ) { @@ -6516,17 +6516,17 @@ protected: pRet->GenReturn ( RET_Value, aUId, comm_BOOL( pMB->GetCheckBoxState() == STATE_CHECK) ); break; case M_Check : - pMB->SetCheckBoxState( TRUE ); + pMB->SetCheckBoxState( sal_True ); break; case M_UnCheck : - pMB->SetCheckBoxState( FALSE ); + pMB->SetCheckBoxState( sal_False ); break; case M_GetText : pRet->GenReturn ( RET_Value, aUId, pMB->GetMessText()); break; default: - bDone = FALSE; + bDone = sal_False; break; } if ( bDone ) @@ -6548,9 +6548,6 @@ protected: AnimateMouse( pControl, Mitte); break; case M_OK: -#if ( BUTTONID_OK != RET_OK ) -#error BUTTONID_OK != RET_OK -#endif if ( pBD->GetPushButton( BUTTONID_OK ) ) { SET_WINP_CLOSING(pControl); @@ -6700,7 +6697,7 @@ protected: } else { - bStatementDone=TRUE; + bStatementDone=sal_True; } } return bStatementDone; diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index ada6c60a6b35..f883dc53f1de 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -92,9 +92,9 @@ extern "C" #define GET_REAL_PARENT() GetWindow( WINDOW_REALPARENT ) // switch behaviour of ImplMouse* and ImplKeyInput -#define FORCE_DIRECT_CALL TRUE +#define FORCE_DIRECT_CALL sal_True -typedef USHORT SearchFlags; +typedef sal_uInt16 SearchFlags; #define SEARCH_NOOVERLAP ((SearchFlags) 0x0001) #define SEARCH_NO_TOPLEVEL_WIN ((SearchFlags) 0x0002) #define SEARCH_FOCUS_FIRST ((SearchFlags) 0x0004) @@ -107,15 +107,15 @@ public: Search( SearchFlags nSearchFlags = 0): nmSearchFlags(nSearchFlags) {} virtual ~Search() {} - virtual BOOL IsWinOK( Window *pWin ) = 0; + virtual sal_Bool IsWinOK( Window *pWin ) = 0; SearchFlags GetSearchFlags() { return nmSearchFlags; } void AddSearchFlags( SearchFlags aNewFlags ) { nmSearchFlags |= aNewFlags; } void RemoveSearchFlags( SearchFlags aRemoveFlags ) { nmSearchFlags &= ( ~aRemoveFlags ); } - BOOL HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; } + sal_Bool HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; } }; -BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Kann es Active sein) -BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft) +sal_Bool IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Kann es Active sein) +sal_Bool IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft) //class SafePointer : CriticalSection @@ -126,7 +126,7 @@ public: SafePointer() { pSelf = this; } virtual ~SafePointer() { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen"); pSelf = NULL; } -// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } +// static sal_Bool IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } // virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); } }; @@ -146,7 +146,7 @@ struct TTSettings // Translate TranslateWin *pTranslateWin; - BOOL bToTop; + sal_Bool bToTop; }; @@ -162,37 +162,37 @@ private: protected: StatementList(); - USHORT nRetryCount; + sal_uInt16 nRetryCount; void QueStatement(StatementList *pAfterThis); - BOOL bStatementInQue; - static USHORT nUseBindings; + sal_Bool bStatementInQue; + static sal_uInt16 nUseBindings; static TTProfiler *pProfiler; void InitProfile(); void SendProfile( String aText ); static StatementList *pCurrentProfileStatement; - static BOOL bIsInReschedule; - static USHORT nModalCount; + static sal_Bool bIsInReschedule; + static sal_uInt16 nModalCount; static Window *pLastFocusWindow; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen - static BOOL bWasDragManager; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen - static BOOL bWasPopupMenu; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen - static BOOL bBasicWasRunning; + static sal_Bool bWasDragManager; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen + static sal_Bool bWasPopupMenu; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen + static sal_Bool bBasicWasRunning; - static USHORT nMinTypeKeysDelay; /// Verzögerung der einzelnen Anschläge für TypeKeys - static USHORT nMaxTypeKeysDelay; - static BOOL bDoTypeKeysDelay; + static sal_uInt16 nMinTypeKeysDelay; /// Verzögerung der einzelnen Anschläge für TypeKeys + static sal_uInt16 nMaxTypeKeysDelay; + static sal_Bool bDoTypeKeysDelay; static Window* pFirstDocFrame; - static BOOL bIsSlotInExecute; + static sal_Bool bIsSlotInExecute; public: - static BOOL IsInReschedule() { return bIsInReschedule; } - void SafeReschedule( BOOL bYield = FALSE ) // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird + static sal_Bool IsInReschedule() { return bIsInReschedule; } + void SafeReschedule( sal_Bool bYield = sal_False ) // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird { nModalCount = Application::GetModalModeCount(); - bIsInReschedule = TRUE; + bIsInReschedule = sal_True; pLastFocusWindow = GetpApp()->GetFocusWindow(); bWasDragManager = false /*!= DragManager::GetDragManager()*/; bWasPopupMenu = NULL != PopupMenu::GetActivePopupMenu(); @@ -203,17 +203,17 @@ public: else GetpApp()->Reschedule(); bExecuting = bWasExecuting; - bBasicWasRunning = FALSE; - bWasPopupMenu = FALSE; - bWasDragManager = FALSE; + bBasicWasRunning = sal_False; + bWasPopupMenu = sal_False; + bWasDragManager = sal_False; pLastFocusWindow = NULL; - bIsInReschedule = FALSE; + bIsInReschedule = sal_False; nModalCount = 0; } - static BOOL MaybeResetSafeReschedule() + static sal_Bool MaybeResetSafeReschedule() { // Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so if ( !bIsInReschedule ) - return FALSE; + return sal_False; if ( pLastFocusWindow != GetpApp()->GetFocusWindow() || ( Application::GetModalModeCount() > nModalCount ) @@ -221,12 +221,12 @@ public: || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu ) || ( StarBASIC::IsRunning() && !bBasicWasRunning ) ) { - bIsInReschedule = FALSE; + bIsInReschedule = sal_False; pLastFocusWindow = NULL; - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } static void NormalReschedule() // Setzt das flag nicht { @@ -235,84 +235,84 @@ public: #define Reschedule RescheduleNichtBenutzen_StattdessenSafeRescheduleAnStatementList static Window* GetMouseWin(); - static BOOL WinPtrValid(Window *pTest); - static Window* SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE ); + static sal_Bool WinPtrValid(Window *pTest); + static Window* SearchAllWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase = sal_True ); protected: - static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE ); - - Window* SearchTree( rtl::OString aUId, BOOL bSearchButtonOnToolbox = FALSE ); - Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE ); - Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE ); - Window* GetAnyActive( BOOL MaybeBase = TRUE ); - ScrollBar* GetScrollBar( Window *pBase, USHORT nDirection, BOOL MaybeBase = TRUE ); - Window* GetPopupFloatingWin( BOOL MaybeBase = TRUE ); + static Window* SearchClientWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase = sal_True ); + + Window* SearchTree( rtl::OString aUId, sal_Bool bSearchButtonOnToolbox = sal_False ); + Window* GetActive( WindowType nRT, sal_Bool MaybeBase = sal_True ); + Window* GetFocus( WindowType nRT, sal_Bool MaybeBase = sal_True ); + Window* GetAnyActive( sal_Bool MaybeBase = sal_True ); + ScrollBar* GetScrollBar( Window *pBase, sal_uInt16 nDirection, sal_Bool MaybeBase = sal_True ); + Window* GetPopupFloatingWin( sal_Bool MaybeBase = sal_True ); Menu* GetMatchingMenu( Window* pWin, Menu* pBaseMenu = NULL ); - Window* GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE, USHORT nSkip = 0, BOOL bSearchAll = FALSE ); - USHORT CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE ); - Window* GetDocWin( USHORT nNr ); - USHORT GetDocWinCount(); - Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE ); - BOOL ValueOK(rtl::OString nId, String aBezeichnung, ULONG nValue, ULONG nMax); + Window* GetWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase = sal_True, sal_uInt16 nSkip = 0, sal_Bool bSearchAll = sal_False ); + sal_uInt16 CountWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase = sal_True ); + Window* GetDocWin( sal_uInt16 nNr ); + sal_uInt16 GetDocWinCount(); + Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, sal_Bool MaybeBase = sal_True ); + sal_Bool ValueOK(rtl::OString nId, String aBezeichnung, sal_uLong nValue, sal_uLong nMax); - USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); + sal_uInt16 GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); public: // void AddStatement( StatementList *pNewStatement ); virtual ~StatementList(); void Advance(); - virtual BOOL Execute() = 0; + virtual sal_Bool Execute() = 0; /*************************************************************************** ** Bestimmt erst den nächsten Befehl, setzt Current ** und führt dann aus. ** Returnwert gibt an, ob Befehl nochmal ausgeführt ** werden soll. Dann muß auch der UserEvent verlassen werden, um der Applikation ** normales Arbeiten zu ermöglichen (Dialog schliessen) -** TRUE bedeutet, dass alles klar gegangen ist -** FALSE bedeutet nochmal Bitte +** sal_True bedeutet, dass alles klar gegangen ist +** sal_False bedeutet nochmal Bitte ***************************************************************************/ void ReportError(String aMessage); void ReportError(rtl::OString aUId, String aMessage); - void ReportError(String aMessage, ULONG nWhatever); + void ReportError(String aMessage, sal_uLong nWhatever); - static void DirectLog( ULONG nType, String aString ); + static void DirectLog( sal_uLong nType, String aString ); String Tree(Window *pBase, int Indent); String ClientTree(Window *pBase, int Indent); StatementList *pNext; static StatementList /**pCurrent,*/ *pFirst; - static BOOL bReadingCommands; + static sal_Bool bReadingCommands; static rtl::OString aWindowWaitUId; static Window *pWindowWaitPointer; static rtl::OString aWindowWaitOldHelpId; static rtl::OString aWindowWaitOldUniqueId; static RetStream *pRet; - static BOOL IsError; - static BOOL bDying; - static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben - BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt - static USHORT aSubMenuId1; // Untermenüs bei PopupMenus - static USHORT aSubMenuId2; // erstmal 2-Stufig - static USHORT aSubMenuId3; // and now even 3 levels #i31512# + static sal_Bool IsError; + static sal_Bool bDying; + static sal_Bool bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben + sal_Bool bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt + static sal_uInt16 aSubMenuId1; // Untermenüs bei PopupMenus + static sal_uInt16 aSubMenuId2; // erstmal 2-Stufig + static sal_uInt16 aSubMenuId3; // and now even 3 levels #i31512# static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin - BOOL CheckWindowWait(); //True heisst, dass Window noch existiert + sal_Bool CheckWindowWait(); //True heisst, dass Window noch existiert //False -> Window weg; static void SetFirstDocFrame( Window* pWin ); static Window* GetFirstDocFrame(); - static BOOL IsFirstDocFrame( Window* pWin ); - static BOOL IsDocWin( Window* pWin ); - static BOOL IsIMEWin( Window* pWin ); // Input Window for CJK under Solaris - static BOOL IsDocFrame( Window* pWin ); + static sal_Bool IsFirstDocFrame( Window* pWin ); + static sal_Bool IsDocWin( Window* pWin ); + static sal_Bool IsIMEWin( Window* pWin ); // Input Window for CJK under Solaris + static sal_Bool IsDocFrame( Window* pWin ); static MenuBar* GetDocFrameMenuBar( Window* pWin ); - static USHORT GetDocFrameCount(); + static sal_uInt16 GetDocFrameCount(); - static BOOL bCatchGPF; + static sal_Bool bCatchGPF; - static BOOL bUsePostEvents; // use Application::Post*Event or own impl to handle key and mouseevents + static sal_Bool bUsePostEvents; // use Application::Post*Event or own impl to handle key and mouseevents #if OSL_DEBUG_LEVEL > 1 static EditWindow *m_pDbgWin; @@ -322,20 +322,20 @@ public: class StatementSlot : public StatementList //Slots aufrufen { protected: - USHORT nAnzahl; + sal_uInt16 nAnzahl; SfxPoolItem **pItemArr; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> aArgs; - USHORT nFunctionId; // can get removed when the old (numeric) slothandling is removed + sal_uInt16 nFunctionId; // can get removed when the old (numeric) slothandling is removed String aUnoUrl; - BOOL bMenuClosed; + sal_Bool bMenuClosed; StatementSlot(); void AddReferer(); public: StatementSlot( SCmdStream *pIn ); - StatementSlot( ULONG nSlot, SfxPoolItem* pItem = NULL ); + StatementSlot( sal_uLong nSlot, SfxPoolItem* pItem = NULL ); virtual ~StatementSlot(); - virtual BOOL Execute(); + virtual sal_Bool Execute(); }; class StatementUnoSlot : public StatementSlot //Uno Slots aufrufen @@ -348,32 +348,32 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, re { friend class ImplRemoteControl; protected: - USHORT nMethodId; - USHORT nParams; + sal_uInt16 nMethodId; + sal_uInt16 nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; String aString1,aString2; - BOOL bBool1,bBool2; + sal_Bool bBool1,bBool2; Window* GetNextOverlap( Window* pBase ); Window* GetNextRecoverWin(); - static USHORT nDirPos; + static sal_uInt16 nDirPos; static Dir *pDir; static pfunc_osl_printDebugMessage pOriginal_osl_DebugMessageFunc; - BOOL UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir ); + sal_Bool UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir ); void HandleSAXParser(); public: StatementCommand( SCmdStream *pIn ); - StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 ); - virtual BOOL Execute(); - BOOL DisplayHID(); + StatementCommand( StatementList *pAfterThis, sal_uInt16 MethodId, sal_uInt16 Params, sal_uInt16 Nr1 ); + virtual sal_Bool Execute(); + sal_Bool DisplayHID(); void Translate(); - void WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst = TRUE ); + void WriteControlData( Window *pBase, sal_uLong nConf, sal_Bool bFirst = sal_True ); }; @@ -384,46 +384,46 @@ class StatementControl : public StatementList { protected: rtl::OString aUId; - USHORT nMethodId; - USHORT nParams; + sal_uInt16 nMethodId; + sal_uInt16 nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; String aString1,aString2; - BOOL bBool1,bBool2; - BOOL ControlOK( Window *pControl, const sal_Char* aBezeichnung ); + sal_Bool bBool1,bBool2; + sal_Bool ControlOK( Window *pControl, const sal_Char* aBezeichnung ); void AnimateMouse( Window *pControl, TTHotSpots aWohin ); void AnimateMouse( Window *pControl, Point aWohin ); - BOOL MaybeDoTypeKeysDelay( Window *pTestWindow ); + sal_Bool MaybeDoTypeKeysDelay( Window *pTestWindow ); - BOOL HandleVisibleControls( Window *pControl ); - BOOL HandleCommonMethods( Window *pControl ); + sal_Bool HandleVisibleControls( Window *pControl ); + sal_Bool HandleCommonMethods( Window *pControl ); public: - StatementControl( SCmdStream *pIn, USHORT nControlType ); - virtual BOOL Execute(); + StatementControl( SCmdStream *pIn, sal_uInt16 nControlType ); + virtual sal_Bool Execute(); }; class StatementFlow : public StatementList // Kommunikation mit Sequence { - USHORT nArt; + sal_uInt16 nArt; - USHORT nParams; + sal_uInt16 nParams; comm_USHORT nSNr1; comm_ULONG nLNr1; String aString1; - BOOL bBool1; + sal_Bool bBool1; public: - StatementFlow (ULONG nServiceId, SCmdStream *pIn, ImplRemoteControl *pRC ); - StatementFlow( StatementList *pAfterThis, USHORT nArtP ); - virtual BOOL Execute(); + StatementFlow (sal_uLong nServiceId, SCmdStream *pIn, ImplRemoteControl *pRC ); + StatementFlow( StatementList *pAfterThis, sal_uInt16 nArtP ); + virtual sal_Bool Execute(); static CommunicationLink *pCommLink; - static BOOL bSending; + static sal_Bool bSending; - static BOOL bUseIPC; // Soll zur rückmeldung IPC verwendet werden? + static sal_Bool bUseIPC; // Soll zur rückmeldung IPC verwendet werden? static ImplRemoteControl *pRemoteControl; // Static für 2. Constructor private: @@ -435,10 +435,10 @@ class SearchUID : public Search Window *pMaybeResult; Window *pAlternateResult; rtl::OString aUId; - BOOL bSearchButtonOnToolbox; + sal_Bool bSearchButtonOnToolbox; public: - SearchUID( rtl::OString aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} - virtual BOOL IsWinOK( Window *pWin ); + SearchUID( rtl::OString aUIdP, sal_Bool bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} + virtual sal_Bool IsWinOK( Window *pWin ); Window* GetMaybeWin() { return pMaybeResult; } Window* GetAlternateResultWin() { return pAlternateResult; } }; @@ -447,52 +447,52 @@ class SearchActive : public Search WindowType nRT; public: SearchActive( WindowType nRTP ): nRT(nRTP) {} - virtual BOOL IsWinOK( Window *pWin ); + virtual sal_Bool IsWinOK( Window *pWin ); }; class SearchPopupFloatingWin : public Search { public: SearchPopupFloatingWin(): Search( SEARCH_FOCUS_FIRST ) {} - virtual BOOL IsWinOK( Window *pWin ); + virtual sal_Bool IsWinOK( Window *pWin ); }; class SearchRT : public Search { WindowType mnRT; - USHORT mnSkip; - USHORT mnCount; + sal_uInt16 mnSkip; + sal_uInt16 mnCount; public: - SearchRT( WindowType nRTP, SearchFlags nSearchFlags, USHORT nSkip = 0 ): Search(nSearchFlags), mnRT(nRTP), mnSkip( nSkip ), mnCount( 0 ) {} - virtual BOOL IsWinOK( Window *pWin ); - USHORT GetCount(){ return mnCount; } + SearchRT( WindowType nRTP, SearchFlags nSearchFlags, sal_uInt16 nSkip = 0 ): Search(nSearchFlags), mnRT(nRTP), mnSkip( nSkip ), mnCount( 0 ) {} + virtual sal_Bool IsWinOK( Window *pWin ); + sal_uInt16 GetCount(){ return mnCount; } }; class SearchScroll : public SearchRT { - USHORT nDirection; + sal_uInt16 nDirection; public: - SearchScroll( USHORT nDir, SearchFlags nSearchFlags ): SearchRT(WINDOW_SCROLLBAR, nSearchFlags), nDirection(nDir) {} - virtual BOOL IsWinOK( Window *pWin ); + SearchScroll( sal_uInt16 nDir, SearchFlags nSearchFlags ): SearchRT(WINDOW_SCROLLBAR, nSearchFlags), nDirection(nDir) {} + virtual sal_Bool IsWinOK( Window *pWin ); }; class SearchWinPtr : public Search { Window *pTest; public: SearchWinPtr( Window *pTestP ): pTest(pTestP) {} - virtual BOOL IsWinOK( Window *pWin ); + virtual sal_Bool IsWinOK( Window *pWin ); }; class SearchFadeSplitWin : public Search { WindowAlign nAlign; public: SearchFadeSplitWin( WindowAlign nAlignP ): nAlign(nAlignP) {} - virtual BOOL IsWinOK( Window *pWin ); + virtual sal_Bool IsWinOK( Window *pWin ); }; -void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect=FALSE ); -void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE ); -void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE ); -void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE ); +void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, sal_Bool bForceDirect=sal_False ); +void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False ); +void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False ); +void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False ); void ImplCommand( Window* pWin, CommandEvent &aCmdEvnt ); -void ImplEventWait( ULONG nID ); +void ImplEventWait( sal_uLong nID ); #endif diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx index 91f787fbff2f..bafd277ca422 100644 --- a/automation/source/simplecm/packethandler.cxx +++ b/automation/source/simplecm/packethandler.cxx @@ -85,8 +85,8 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) nLen = 0; pData = NULL; - comm_BOOL bWasError = FALSE; - comm_BOOL bForceMultiChannelThisPacket = FALSE; + comm_BOOL bWasError = sal_False; + comm_BOOL bForceMultiChannelThisPacket = sal_False; if ( pReceiver ) { comm_UINT32 nBytes = 0; @@ -95,14 +95,14 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) READ_SOCKET( &nBytes, sizeof(nBytes) ) if ( bWasError ) - return FALSE; + return sal_False; if ( 0xFFFFFFFF == nBytes ) // Expliziter Request für dieses Datenpaket auf MultiChannel umzuschalten { READ_SOCKET( &nBytes, sizeof(nBytes) ) if ( bWasError ) - return FALSE; - bForceMultiChannelThisPacket = TRUE; + return sal_False; + bForceMultiChannelThisPacket = sal_True; } nBytes = NETDWORD( nBytes ); @@ -143,13 +143,13 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) default: { DBG_ERROR("Unbekannter Headertyp in der Kommunikation"); - bWasError = TRUE; + bWasError = sal_True; } } if ( bWasError ) - return FALSE; + return sal_False; /// Längen anpassen und ggf restheader überlesen. while ( nHeaderBytes > nHeaderReadSoFar ) @@ -181,12 +181,12 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) if ( bWasError ) { ::operator delete(pData), pData = 0; - return FALSE; + return sal_False; } nLen = nBytes; } else - bWasError = TRUE; + bWasError = sal_True; return !bWasError; } @@ -204,7 +204,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMProtocol nProtocol ) { comm_UINT32 nBuffer = nLen; - comm_BOOL bWasError = FALSE; + comm_BOOL bWasError = sal_False; #ifndef FORCE_MULTI_CHANNEL_HEADERS if ( bMultiChannel ) @@ -254,7 +254,7 @@ comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMPr comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void* pData, comm_UINT32 nLen ) { - comm_BOOL bWasError = FALSE; + comm_BOOL bWasError = sal_False; comm_UINT32 nBuffer = 0; diff --git a/automation/source/simplecm/packethandler.hxx b/automation/source/simplecm/packethandler.hxx index ce0c22c100c9..cb62f07343df 100644 --- a/automation/source/simplecm/packethandler.hxx +++ b/automation/source/simplecm/packethandler.hxx @@ -56,7 +56,7 @@ protected: comm_UINT16 nReceiveHeaderType; public: - PacketHandler( ITransmiter* pTransmitter_, IReceiver* pReceiver_, comm_BOOL bMC = FALSE ); + PacketHandler( ITransmiter* pTransmitter_, IReceiver* pReceiver_, comm_BOOL bMC = sal_False ); comm_UINT16 GetReceiveProtocol() { return nReceiveProtocol; } comm_UINT16 GetReceiveHeaderType() { return nReceiveHeaderType; } diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index bebd4fc9b206..74a86f343677 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -54,11 +54,11 @@ CommunicationLink::CommunicationLink( CommunicationManager *pMan ) : pMyManager(pMan) , pServiceData(NULL) , nServiceProtocol( 0 ) -, bIsInsideCallback( FALSE ) +, bIsInsideCallback( sal_False ) , nTotalBytes( 0 ) , maApplication("Undefined") #if OSL_DEBUG_LEVEL > 1 -, bFlag( FALSE ) +, bFlag( sal_False ) , nSomething( 0 ) #endif { @@ -68,7 +68,7 @@ CommunicationLink::~CommunicationLink() { #if OSL_DEBUG_LEVEL > 1 if ( !bFlag ) // bFlag will be set if deletion is expected else we can set a breakpoint - bFlag = FALSE; + bFlag = sal_False; #endif if ( pMyManager ) pMyManager->DestroyingLink( this ); @@ -102,14 +102,14 @@ IMPL_LINK( CommunicationLink, DataReceived, void*, EMPTYARG ) return 1; } -BOOL CommunicationLink::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) +sal_Bool CommunicationLink::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) { INFO_MSG( CByteString("S :").Append( GetCommunicationPartner( CM_FQDN ) ), CByteString("Daten Senden:").Append( GetCommunicationPartner( CM_FQDN ) ), CM_SEND, this ); - BOOL bWasError = FALSE; + sal_Bool bWasError = sal_False; - UINT32 nBuffer; + sal_uInt32 nBuffer; nBuffer = pDataStream->SeekRel(0) +1; bWasError = pPacketHandler->TransferData( ((SvMemoryStream*)pDataStream)->GetData(), nBuffer, nProtocol ) != C_ERROR_NONE; @@ -123,7 +123,7 @@ BOOL CommunicationLink::DoTransferDataStream( SvStream *pDataStream, CMProtocol return !bWasError; } -BOOL CommunicationLink::TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) +sal_Bool CommunicationLink::TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol ) { aLastAccess = DateTime(); nTotalBytes += pDataStream->Seek( STREAM_SEEK_TO_END ); @@ -142,7 +142,7 @@ SimpleCommunicationLinkViaSocket::SimpleCommunicationLinkViaSocket( Communicatio , aMyName() , pStreamSocket( pSocket ) , pReceiveStream( NULL ) -, bIsRequestShutdownPending( FALSE ) +, bIsRequestShutdownPending( sal_False ) { pTCPIO = new TCPIO( pStreamSocket ); pPacketHandler = new PacketHandler( (ITransmiter*) pTCPIO, pTCPIO, pMyManager->IsMultiChannel() ); @@ -165,7 +165,7 @@ void SimpleCommunicationLinkViaSocket::SetStreamSocket( vos::OStreamSocket* pSoc pStreamSocket = pSocket; } -BOOL SimpleCommunicationLinkViaSocket::StopCommunication() +sal_Bool SimpleCommunicationLinkViaSocket::StopCommunication() { CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method if ( !IsCommunicationError() ) // Meaning that the Communication is still runnung @@ -176,7 +176,7 @@ BOOL SimpleCommunicationLinkViaSocket::StopCommunication() SendHandshake( CH_REQUEST_ShutdownLink ); } WaitForShutdown(); - return TRUE; + return sal_True; } void SimpleCommunicationLinkViaSocket::SetFinalRecieveTimeout() @@ -188,7 +188,7 @@ void SimpleCommunicationLinkViaSocket::SetFinalRecieveTimeout() } } -BOOL SimpleCommunicationLinkViaSocket::IsCommunicationError() +sal_Bool SimpleCommunicationLinkViaSocket::IsCommunicationError() { return !pStreamSocket; } @@ -273,9 +273,9 @@ SvStream* SimpleCommunicationLinkViaSocket::GetBestCommunicationStream() if ( !bWasError )\ {nTotal += nLength;} -BOOL SimpleCommunicationLinkViaSocket::DoReceiveDataStream() +sal_Bool SimpleCommunicationLinkViaSocket::DoReceiveDataStream() { - BOOL bWasError = FALSE; + sal_Bool bWasError = sal_False; void* pBuffer = NULL; comm_UINT32 nLen; bWasError = pPacketHandler->ReceiveData( pBuffer, nLen ) != C_ERROR_NONE; @@ -284,7 +284,7 @@ BOOL SimpleCommunicationLinkViaSocket::DoReceiveDataStream() pReceiveStream = GetBestCommunicationStream(); DBG_ASSERT( pReceiveStream->IsA() == ID_MEMORYSTREAM, "CommunicationStream is not an SvMemoryStream. Communication has to be reimplemented here!"); if ( pReceiveStream->IsA() == ID_MEMORYSTREAM ) - ((SvMemoryStream*)pReceiveStream)->SetBuffer( pBuffer, nLen, TRUE, nLen ); + ((SvMemoryStream*)pReceiveStream)->SetBuffer( pBuffer, nLen, sal_True, nLen ); DBG_ASSERT( pReceiveStream, "Datastream is NULL"); } @@ -307,13 +307,13 @@ void SimpleCommunicationLinkViaSocket::SetNewPacketAsCurrent() nServiceHeaderType = pPacketHandler->GetReceiveHeaderType(); } -BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeType, SvStream* pData ) +sal_Bool SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeType, SvStream* pData ) { - BOOL bWasError; + sal_Bool bWasError; if ( pData ) { - UINT32 nBuffer; + sal_uInt32 nBuffer; nBuffer = pData->Seek( STREAM_SEEK_TO_END ); bWasError = !pPacketHandler->SendHandshake( aHandshakeType, ((SvMemoryStream*)pData)->GetData(), nBuffer ); } @@ -337,7 +337,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy case CH_RESPONSE_HandshakeAlive: break; case CH_REQUEST_ShutdownLink: - bIsRequestShutdownPending = TRUE; + bIsRequestShutdownPending = sal_True; break; case CH_ShutdownLink: break; @@ -371,24 +371,24 @@ void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown() ReceiveDataStream(); } -BOOL SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ReceiveDataStream() +sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ReceiveDataStream() { if ( DoReceiveDataStream() ) { SetNewPacketAsCurrent(); StartCallback(); DataReceived(); - return TRUE; + return sal_True; } else { StartCallback(); ShutdownCommunication(); - return FALSE; + return sal_False; } } -BOOL SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication() +sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication() { if ( GetStreamSocket() ) GetStreamSocket()->shutdown(); @@ -402,14 +402,14 @@ BOOL SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication ConnectionClosed(); - return TRUE; + return sal_True; } -CommunicationManager::CommunicationManager( BOOL bUseMultiChannel ) +CommunicationManager::CommunicationManager( sal_Bool bUseMultiChannel ) : nInfoType( CM_NONE ) -, bIsCommunicationRunning( FALSE ) +, bIsCommunicationRunning( sal_False ) , maApplication("Unknown") , bIsMultiChannel( bUseMultiChannel ) { @@ -420,18 +420,18 @@ CommunicationManager::~CommunicationManager() xLastNewLink.Clear(); } -BOOL CommunicationManager::StartCommunication( String aApp, String aParams ) +sal_Bool CommunicationManager::StartCommunication( String aApp, String aParams ) { (void) aApp; /* avoid warning about unused parameter */ (void) aParams; /* avoid warning about unused parameter */ - return FALSE; + return sal_False; } -BOOL CommunicationManager::StartCommunication( ByteString aHost, ULONG nPort ) +sal_Bool CommunicationManager::StartCommunication( ByteString aHost, sal_uLong nPort ) { (void) aHost; /* avoid warning about unused parameter */ (void) nPort; /* avoid warning about unused parameter */ - return FALSE; + return sal_False; } ByteString CommunicationManager::GetMyName( CM_NameType ) @@ -446,7 +446,7 @@ void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden pCL->aStart = DateTime(); pCL->aLastAccess = pCL->aStart; - bIsCommunicationRunning = TRUE; + bIsCommunicationRunning = sal_True; pCL->SetApplication( GetApplication() ); xLastNewLink = pCL; @@ -493,7 +493,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL ) if ( CH_Handshake == pCL->nServiceHeaderType ) { SvStream *pData = pCL->GetServiceData(); - USHORT nType; + sal_uInt16 nType; pData->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); // Unfortulately it is written this way :(( *pData >> nType; pData->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -565,12 +565,12 @@ void CommunicationManager::CallInfoMsg( InfoString aMsg ) InfoMsg( aMsg ); } -void CommunicationManager::SetApplication( const ByteString& aApp, BOOL bRunningLinks ) +void CommunicationManager::SetApplication( const ByteString& aApp, sal_Bool bRunningLinks ) { maApplication = aApp; if ( bRunningLinks ) { - USHORT i; + sal_uInt16 i; for ( i = 0 ; i < GetCommunicationLinkCount() ; i++ ) GetCommunicationLink( i )->SetApplication( aApp ); } @@ -578,7 +578,7 @@ void CommunicationManager::SetApplication( const ByteString& aApp, BOOL bRunning -SingleCommunicationManager::SingleCommunicationManager( BOOL bUseMultiChannel ) +SingleCommunicationManager::SingleCommunicationManager( sal_Bool bUseMultiChannel ) : CommunicationManager( bUseMultiChannel ) { xActiveLink = NULL; @@ -592,31 +592,31 @@ SingleCommunicationManager::~SingleCommunicationManager() pInactiveLink->InvalidateManager(); } -BOOL SingleCommunicationManager::StopCommunication() +sal_Bool SingleCommunicationManager::StopCommunication() { if ( xActiveLink.Is() ) { - BOOL bSuccess = xActiveLink->StopCommunication(); + sal_Bool bSuccess = xActiveLink->StopCommunication(); if ( pInactiveLink ) pInactiveLink->InvalidateManager(); pInactiveLink = xActiveLink; xActiveLink.Clear(); return bSuccess; } - return TRUE; + return sal_True; } -BOOL SingleCommunicationManager::IsLinkValid( CommunicationLink* pCL ) +sal_Bool SingleCommunicationManager::IsLinkValid( CommunicationLink* pCL ) { return &xActiveLink == pCL; } -USHORT SingleCommunicationManager::GetCommunicationLinkCount() +sal_uInt16 SingleCommunicationManager::GetCommunicationLinkCount() { return IsCommunicationRunning()?1:0; } -CommunicationLinkRef SingleCommunicationManager::GetCommunicationLink( USHORT ) +CommunicationLinkRef SingleCommunicationManager::GetCommunicationLink( sal_uInt16 ) { return xActiveLink; } @@ -644,7 +644,7 @@ void SingleCommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) pInactiveLink->InvalidateManager(); pInactiveLink = xActiveLink; xActiveLink.Clear(); - bIsCommunicationRunning = FALSE; + bIsCommunicationRunning = sal_False; } void SingleCommunicationManager::DestroyingLink( CommunicationLink *pCL ) @@ -654,7 +654,7 @@ void SingleCommunicationManager::DestroyingLink( CommunicationLink *pCL ) } -SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel ) +SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel ) : SingleCommunicationManager( bUseMultiChannel ) , aHostToTalk( aHost ) , nPortToTalk( nPort ) @@ -662,7 +662,7 @@ SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSo } -SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( BOOL bUseMultiChannel ) +SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel ) : SingleCommunicationManager( bUseMultiChannel ) , aHostToTalk() , nPortToTalk( 0 ) @@ -670,7 +670,7 @@ SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSo } -BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort ) +sal_Bool CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort ) { vos::OInetSocketAddr Addr; vos::OConnectorSocket *pConnSocket; @@ -690,13 +690,13 @@ BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICo pConnSocket->setTcpNoDelay( 1 ); pCM->CallConnectionOpened( CreateCommunicationLink( pCM, pConnSocket ) ); - return TRUE; + return sal_True; } else delete pConnSocket; } while ( pCMC->RetryConnect() ); - return FALSE; + return sal_False; } diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index a0e50e912498..17621aec9d53 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.cxx @@ -66,8 +66,8 @@ CmdStream::~CmdStream() #define PUT_CHAR(ch) \ - USHORT nMCode = nModify + ch; \ - USHORT _Code = 1; \ + sal_uInt16 nMCode = nModify + ch; \ + sal_uInt16 _Code = 1; \ if ( (nMCode & 0xFF) == 0 ) \ _Code |= 2; \ if ( (nMCode >> 8) == 0 ) \ @@ -93,17 +93,17 @@ String CmdStream::WandleKeyEventString( String aKeys ) String Work = aKeys.Copy(nPos1+1,nPos2-nPos1+1-2); aKeys.Erase(nPos1,nPos2-nPos1+1); // Inclusive Spitze Klammern weg String Result, Token; - USHORT nModify = 0; + sal_uInt16 nModify = 0; while ( Work.Len() > 0 ) { Token = Work.GetToken(0,' '); Work.Erase(0,Token.Len()+1); ControlDef WhatName(Token,rtl::OString()); - USHORT nElement; + sal_uInt16 nElement; if (pKeyCodes->Seek_Entry(&WhatName,&nElement)) { // FIXME: HELPID - USHORT nCode = 0;//(USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); + sal_uInt16 nCode = 0;//(sal_uInt16) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); if ( nCode >= KEY_SHIFT ) nModify ^= nCode; else @@ -169,17 +169,17 @@ String CmdStream::WandleKeyEventString( String aKeys ) } -void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) +void CmdStream::WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString ) { - USHORT nParams = PARAM_NONE; - USHORT nNr1=0,nNr2=0,nNr3=0,nNr4=0; + sal_uInt16 nParams = PARAM_NONE; + sal_uInt16 nNr1=0,nNr2=0,nNr3=0,nNr4=0; comm_ULONG nLNr1=0; String aString1,aString2; - BOOL bBool1=FALSE,bBool2=FALSE; + sal_Bool bBool1=sal_False,bBool2=sal_False; if ( rPar ) { - for ( USHORT i = 1; i < rPar->Count() ; i++) + for ( sal_uInt16 i = 1; i < rPar->Count() ; i++) { switch (rPar->Get( i )->GetType()) { @@ -309,27 +309,27 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) if( nParams & PARAM_BOOL_2 ) Write( bBool2 ); } -void CmdStream::GenCmdCommand( USHORT nNr, SbxArray* rPar ) +void CmdStream::GenCmdCommand( sal_uInt16 nNr, SbxArray* rPar ) { - Write(USHORT(SICommand)); + Write(sal_uInt16(SICommand)); Write(nNr); WriteSortedParams(rPar, (nNr & M_KEY_STRING) != 0 ); } -void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) +void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar ) { - Write(USHORT(SISlot)); + Write(sal_uInt16(SISlot)); Write(nNr); if (rPar) { - USHORT nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2 + sal_uInt16 nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2 Write(nAnz); - BOOL bWriteUnoSlot = rPar->Get( 1 )->GetType() == SbxSTRING; + sal_Bool bWriteUnoSlot = rPar->Get( 1 )->GetType() == SbxSTRING; - for (USHORT n = 1 ; n <= nAnz ; n++) + for (sal_uInt16 n = 1 ; n <= nAnz ; n++) { /// #59513# nicht mehr ben�tigt -// ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData(); +// sal_uLong nUserData = rPar->Get( 2*n-1 )->GetUserData(); // rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing); // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind. if ( bWriteUnoSlot ) @@ -345,7 +345,7 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) case SbxUINT: case SbxSINGLE: if ( !bWriteUnoSlot ) - Write( (USHORT)BinUSHORT ); + Write( (sal_uInt16)BinUSHORT ); Write(rPar->Get( 2*n )->GetUShort()); break; case SbxLONG: @@ -354,18 +354,18 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) case SbxULONG64: case SbxDOUBLE: if ( !bWriteUnoSlot ) - Write( (USHORT)BinULONG ); + Write( (sal_uInt16)BinULONG ); Write(rPar->Get( 2*n )->GetULong()); break; case SbxSTRING: case SbxCHAR: if ( !bWriteUnoSlot ) - Write( (USHORT)BinString); + Write( (sal_uInt16)BinString); Write((String)rPar->Get( 2*n )->GetString()); // Cast f�r OS/2 break; case SbxBOOL: if ( !bWriteUnoSlot ) - Write( (USHORT)BinBool); + Write( (sal_uInt16)BinBool); Write(rPar->Get( 2*n )->GetBool()); break; default: @@ -378,20 +378,20 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) } } else - Write(USHORT(0)); + Write(sal_uInt16(0)); } void CmdStream::GenCmdUNOSlot( const String &aURL ) { - Write( USHORT(SIUnoSlot) ); -/* Write( USHORT(0) ); // Hier wird im Office die SID_OPENURL Eingetragen. + Write( sal_uInt16(SIUnoSlot) ); +/* Write( sal_uInt16(0) ); // Hier wird im Office die SID_OPENURL Eingetragen. // Dies mu� nat�rlich im Office hart verdratet werden und nicht hier, // da sich die ID ja mal �ndern kann. // Da auch die ID f�r das PoolItem im Office entnommen werden mu� hier also kein PoolItem // gesendet werden. - Write( USHORT(0) ); // Anzahl PoolItems + Write( sal_uInt16(0) ); // Anzahl PoolItems // Stattdessen wird noch eine extra String gesendet, der dann Officeseitig in ein // SfxStringItem mit entsprechender ID gewandelt wird. @@ -400,57 +400,57 @@ void CmdStream::GenCmdUNOSlot( const String &aURL ) Write( aURL ); // Die UNO URL eben } -void CmdStream::GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar ) +void CmdStream::GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar ) { - Write(USHORT(SIControl)); + Write(sal_uInt16(SIControl)); Write(nUId); Write(nMethodId); WriteSortedParams(rPar, (nMethodId & M_KEY_STRING) != 0 ); } -void CmdStream::GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar ) +void CmdStream::GenCmdControl( String aUId, sal_uInt16 nMethodId, SbxArray* rPar ) { - Write(USHORT(SIStringControl)); + Write(sal_uInt16(SIStringControl)); Write(aUId); Write(nMethodId); WriteSortedParams(rPar, (nMethodId & M_KEY_STRING) != 0 ); } -void CmdStream::GenCmdFlow( USHORT nArt ) +void CmdStream::GenCmdFlow( sal_uInt16 nArt ) { - Write(USHORT(SIFlow)); + Write(sal_uInt16(SIFlow)); Write(nArt); - Write(USHORT(PARAM_NONE)); // Typ der folgenden Parameter + Write(sal_uInt16(PARAM_NONE)); // Typ der folgenden Parameter } -void CmdStream::GenCmdFlow( USHORT nArt, USHORT nNr1 ) +void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 ) { - Write(USHORT(SIFlow)); + Write(sal_uInt16(SIFlow)); Write(nArt); - Write(USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(sal_uInt16(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nNr1); } -void CmdStream::GenCmdFlow( USHORT nArt, comm_ULONG nNr1 ) +void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 ) { - Write(USHORT(SIFlow)); + Write(sal_uInt16(SIFlow)); Write(nArt); - Write(USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(sal_uInt16(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr1); } -void CmdStream::GenCmdFlow( USHORT nArt, String aString1 ) +void CmdStream::GenCmdFlow( sal_uInt16 nArt, String aString1 ) { - Write(USHORT(SIFlow)); + Write(sal_uInt16(SIFlow)); Write(nArt); - Write(USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(sal_uInt16(PARAM_STR_1)); // Typ der folgenden Parameter Write(aString1); } -void CmdStream::Write( String aString, BOOL IsKeyString ) +void CmdStream::Write( String aString, sal_Bool IsKeyString ) { if ( IsKeyString ) - Write( WandleKeyEventString( aString ), FALSE ); + Write( WandleKeyEventString( aString ), sal_False ); else Write( aString.GetBuffer(), aString.Len() ); } diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx index 857517483280..8cdd695c6ca7 100644 --- a/automation/source/testtool/cmdstrm.hxx +++ b/automation/source/testtool/cmdstrm.hxx @@ -37,22 +37,22 @@ public: CmdStream(); ~CmdStream(); - void WriteSortedParams( SbxArray* rPar, BOOL IsKeyString = FALSE ); + void WriteSortedParams( SbxArray* rPar, sal_Bool IsKeyString = sal_False ); - void GenCmdCommand( USHORT nNr, SbxArray* rPar ); + void GenCmdCommand( sal_uInt16 nNr, SbxArray* rPar ); - void GenCmdSlot( USHORT nNr, SbxArray* rPar ); + void GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar ); void GenCmdUNOSlot( const String &aURL ); - void GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar ); - void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar ); + void GenCmdControl( comm_ULONG nUId, sal_uInt16 nMethodId, SbxArray* rPar ); + void GenCmdControl( String aUId, sal_uInt16 nMethodId, SbxArray* rPar ); - void GenCmdFlow( USHORT nArt ); - void GenCmdFlow( USHORT nArt, USHORT nNr1 ); - void GenCmdFlow( USHORT nArt, comm_ULONG nNr1 ); - void GenCmdFlow( USHORT nArt, String aString1 ); + 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, String aString1 ); void Reset(comm_ULONG nSequence); @@ -70,7 +70,7 @@ private: void Write( const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::Write( aString, nLenInChars );} void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );} // new - void Write( String aString, BOOL IsKeyString = FALSE ); + void Write( String aString, sal_Bool IsKeyString = sal_False ); SvMemoryStream *pSammel; }; diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx index e35448c012c5..f8dafece2a5b 100644 --- a/automation/source/testtool/comm_bas.cxx +++ b/automation/source/testtool/comm_bas.cxx @@ -47,9 +47,9 @@ // 2) Methoden: // CommunicationLink StartCommunication( Host, Port ) // StopAllCommunication // Alle Kommunikation wird abgebrochen -// BOOL IsCommunicationRunning // Läuft noch irgendwas +// sal_Bool IsCommunicationRunning // Läuft noch irgendwas // String GetMyName Der eigene Name -// BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig +// sal_Bool IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event // Der CommunicationLink hat folgende Elemente: @@ -144,8 +144,8 @@ CommunicationWrapper::Methods CommunicationWrapper::aLinkMethods[] = { // Konstruktor für den Manager CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject( rClass ) , m_pLink( NULL ) -, m_bIsManager( TRUE ) -, m_bCatchOpen( FALSE ) +, m_bIsManager( sal_True ) +, m_bCatchOpen( sal_False ) , m_pNewLink( NULL ) { // SetName( CUniString("Manager") ); @@ -159,8 +159,8 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject( // Konstruktor für den Link CommunicationWrapper::CommunicationWrapper( CommunicationLink *pThisLink ) : SbxObject( CUniString("Link") ) , m_pLink( pThisLink ) -, m_bIsManager( FALSE ) -, m_bCatchOpen( FALSE ) +, m_bIsManager( sal_False ) +, m_bCatchOpen( sal_False ) , m_pNewLink( NULL ) { m_pMethods = &aLinkMethods[0]; @@ -191,12 +191,12 @@ SbxVariable* CommunicationWrapper::Find( const String& rName, SbxClassType t ) // sonst suchen Methods* p = m_pMethods; short nIndex = 0; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; while( p->nArgs != -1 ) { if( rName.CompareIgnoreCaseToAscii( p->pName ) == COMPARE_EQUAL ) { - bFound = TRUE; break; + bFound = sal_True; break; } nIndex += ( p->nArgs & _ARGSMASK ) + 1; p = m_pMethods + nIndex; @@ -233,22 +233,22 @@ void CommunicationWrapper::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT, { SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar = pVar->GetParameters(); - USHORT nIndex = (USHORT) pVar->GetUserData(); + sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData(); // kein Index: weiterreichen! if( nIndex ) { - ULONG t = pHint->GetId(); + sal_uLong t = pHint->GetId(); if( t == SBX_HINT_INFOWANTED ) pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) ); else { - BOOL bWrite = FALSE; + sal_Bool bWrite = sal_False; if( t == SBX_HINT_DATACHANGED ) - bWrite = TRUE; + bWrite = sal_True; if( t == SBX_HINT_DATAWANTED || bWrite ) { // Parameter-Test fuer Methoden: - USHORT nPar = m_pMethods[ --nIndex ].nArgs & 0x00FF; + sal_uInt16 nPar = m_pMethods[ --nIndex ].nArgs & 0x00FF; // Element 0 ist der Returnwert if( ( !pPar && nPar ) || ( pPar && pPar->Count() != nPar+1 ) ) @@ -278,7 +278,7 @@ SbxInfo* CommunicationWrapper::GetInfo( short nIdx ) { p++; String aName( p->pName, RTL_TEXTENCODING_ASCII_US ); - USHORT nIFlags = ( p->nArgs >> 8 ) & 0x03; + sal_uInt16 nIFlags = ( p->nArgs >> 8 ) & 0x03; if( p->nArgs & _OPT ) nIFlags |= SBX_OPTIONAL; pRetInfo->AddParam( aName, p->eType, nIFlags ); @@ -332,21 +332,21 @@ void CommunicationWrapper::Events( String aType, CommunicationLink* pLink ) //////////////////////////////////////////////////////////////////////////// -// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert -// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus +// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert +// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus // Element 0 gespeichert. // Die Methoden: // Manager -void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL /*bWrite*/ ) +void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPar, sal_Bool /*bWrite*/ ) { // CommunicationLink StartCommunication( Host, Port ) - m_bCatchOpen = TRUE; + m_bCatchOpen = sal_True; if ( m_pManager->StartCommunication( ByteString( pPar->Get( 1 )->GetString(), RTL_TEXTENCODING_UTF8 ), pPar->Get( 2 )->GetULong() ) ) { while ( !m_pNewLink ) GetpApp()->Reschedule(); - m_bCatchOpen = FALSE; + m_bCatchOpen = sal_False; CommunicationWrapper *pNewLinkWrapper = new CommunicationWrapper( m_pNewLink ); m_pNewLink = NULL; pVar->PutObject( pNewLinkWrapper ); @@ -354,28 +354,28 @@ void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPa } -void CommunicationWrapper::MStopAllCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::MStopAllCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // StopAllCommunication // Alle Kommunikation wird abgebrochen m_pManager->StopCommunication(); } -void CommunicationWrapper::MIsCommunicationRunning( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // BOOL IsCommunicationRunning // Läuft noch irgendwas +void CommunicationWrapper::MIsCommunicationRunning( SbxVariable* pVar, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) +{ // sal_Bool IsCommunicationRunning // Läuft noch irgendwas pVar->PutBool( m_pManager->IsCommunicationRunning() ); } -void CommunicationWrapper::MGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::MGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // String GetMyName Der eigene Name pVar->PutString( UniString( m_pManager->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } -void CommunicationWrapper::MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL /*bWrite*/ ) -{ // BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig +void CommunicationWrapper::MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, sal_Bool /*bWrite*/ ) +{ // sal_Bool IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig CommunicationWrapper *pWrapper = (CommunicationWrapper*)(pPar->Get( 1 )->GetObject()); pVar->PutBool( m_pManager->IsLinkValid( pWrapper->GetCommunicationLink() ) ); } -void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ ) +void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, SbxArray* pPar, sal_Bool /*bWrite*/ ) { // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event m_aEventHandlerName = pPar->Get( 1 )->GetString(); } @@ -385,22 +385,22 @@ void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, // Link -void CommunicationWrapper::LStopCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::LStopCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // StopCommunication Die Kommunikation wird abgebrochen m_pLink->StopCommunication(); } -void CommunicationWrapper::LGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::LGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // String GetMyName Der eigene Name pVar->PutString( UniString( m_pLink->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } -void CommunicationWrapper::LGetHostName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::LGetHostName( SbxVariable* pVar, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // String GetHostName Der Name des Anderen pVar->PutString( UniString( m_pLink->GetCommunicationPartner( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } -void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ ) +void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, sal_Bool /*bWrite*/ ) { // Send(String ) String an den Partner schicken SvStream *pSendStream = m_pLink->GetBestCommunicationStream(); String aSendString = pPar->Get( 1 )->GetString(); @@ -409,12 +409,12 @@ void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /* delete pSendStream; } -void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) +void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, sal_Bool /*bWrite*/ ) { // String GetString Ergebnis des letzten Empfangs SvStream *pReceiveStream = m_pLink->GetServiceData(); if ( pReceiveStream ) { - ULONG nLength = pReceiveStream->Seek( STREAM_SEEK_TO_END ); + sal_uLong nLength = pReceiveStream->Seek( STREAM_SEEK_TO_END ); pReceiveStream->Seek( STREAM_SEEK_TO_BEGIN ); char *pBuffer = new char[nLength]; pReceiveStream->Read( pBuffer, nLength ); diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx index d39f0895eefd..2080354334aa 100644 --- a/automation/source/testtool/comm_bas.hxx +++ b/automation/source/testtool/comm_bas.hxx @@ -46,7 +46,7 @@ class CommunicationWrapper : public SbxObject // Einer für Manager und Links public: #endif typedef void( CommunicationWrapper::*pMeth ) - ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite ); + ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite ); #if defined ( ICC ) || defined ( HPUX ) private: #endif @@ -63,31 +63,31 @@ private: // Methoden // Manager - void MStartCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void MStopAllCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void MIsCommunicationRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void MGetMyName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void MSetCommunicationEventHandler( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); + void MStartCommunication( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void MStopAllCommunication( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void MIsCommunicationRunning( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void MGetMyName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void MSetCommunicationEventHandler( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); // Link - void LStopCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void LGetMyName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void LGetHostName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void LSend( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - void LGetString( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); + void LStopCommunication( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void LGetMyName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void LGetHostName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void LSend( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void LGetString( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); // Interne Member und Methoden CommunicationManagerClientViaSocket *m_pManager; CommunicationLink *m_pLink; - BOOL m_bIsManager; // Ist es kein Manager, so ist es ein Link + sal_Bool m_bIsManager; // Ist es kein Manager, so ist es ein Link // Kram für Manager DECL_LINK( Open, CommunicationLink* ); DECL_LINK( Close, CommunicationLink* ); DECL_LINK( Data, CommunicationLink* ); void Events( String aType, CommunicationLink* pLink ); - BOOL m_bCatchOpen; + sal_Bool m_bCatchOpen; CommunicationLink *m_pNewLink; String m_aEventHandlerName; diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx index a6850b1c2cc4..907ce02a4731 100644 --- a/automation/source/testtool/cretstrm.cxx +++ b/automation/source/testtool/cretstrm.cxx @@ -52,7 +52,7 @@ CRetStream::~CRetStream() void CRetStream::Read ( String &aString ) { comm_UniChar* pStr; - USHORT nLenInChars; + sal_uInt16 nLenInChars; CmdBaseStream::Read( pStr, nLenInChars ); aString = String( pStr, nLenInChars ); diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 147b04bc0414..7fe1416c681e 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.hxx @@ -35,7 +35,7 @@ class CRetStream : public CmdBaseStream { SvStream *pSammel; - USHORT nId; + sal_uInt16 nId; public: CRetStream( SvStream *pIn ); diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx index d8118b996ee9..691d803998ae 100644 --- a/automation/source/testtool/httprequest.cxx +++ b/automation/source/testtool/httprequest.cxx @@ -55,7 +55,7 @@ HttpRequest::~HttpRequest() pStream = NULL; } -void HttpRequest::SetRequest( ByteString aHost, ByteString aPath, USHORT nPort ) +void HttpRequest::SetRequest( ByteString aHost, ByteString aPath, sal_uInt16 nPort ) { nStatus = HTTP_REQUEST_SET; Init(); @@ -64,7 +64,7 @@ void HttpRequest::SetRequest( ByteString aHost, ByteString aPath, USHORT nPort ) nRequestPort = nPort; } -void HttpRequest::SetProxy( ByteString aHost, USHORT nPort ) +void HttpRequest::SetProxy( ByteString aHost, sal_uInt16 nPort ) { nStatus = HTTP_REQUEST_SET; Init(); @@ -72,7 +72,7 @@ void HttpRequest::SetProxy( ByteString aHost, USHORT nPort ) nProxyPort = nPort; } -BOOL HttpRequest::Execute() +sal_Bool HttpRequest::Execute() { nStatus = HTTP_REQUEST_PENDING; Init(); @@ -104,7 +104,7 @@ BOOL HttpRequest::Execute() { delete pOutSocket; nStatus = HTTP_REQUEST_ERROR; - return FALSE; + return sal_False; } @@ -141,9 +141,9 @@ BOOL HttpRequest::Execute() #define BUFFRE_SIZE 0x10000 // 64K Buffer char* pBuffer = new char[ BUFFRE_SIZE ]; - BOOL bWasError = ( nStatus != HTTP_REQUEST_PENDING ); + sal_Bool bWasError = ( nStatus != HTTP_REQUEST_PENDING ); - ULONG nDataRead; + sal_uLong nDataRead; pStream = new SvMemoryStream( 0x10000, 0x10000 ); while ( !bWasError ) { @@ -159,16 +159,16 @@ BOOL HttpRequest::Execute() pStream->Seek( 0 ); ByteString aLine; - BOOL bInsideHeader = TRUE; + sal_Bool bInsideHeader = sal_True; while ( bInsideHeader ) { pStream->ReadLine( aLine ); if ( !aLine.Len() ) - bInsideHeader = FALSE; + bInsideHeader = sal_False; else { if ( IsItem( "HTTP/", aLine ) ) - nResultId = (USHORT)aLine.GetToken( 1, ' ' ).ToInt32(); + nResultId = (sal_uInt16)aLine.GetToken( 1, ' ' ).ToInt32(); if ( IsItem( "Content-Type:", aLine ) ) { aContentType = aLine.Copy( 13 ); @@ -182,12 +182,12 @@ BOOL HttpRequest::Execute() if ( nStatus == HTTP_REQUEST_PENDING ) { nStatus = HTTP_REQUEST_DONE; - return TRUE; + return sal_True; } else { nStatus = HTTP_REQUEST_ERROR; - return FALSE; + return sal_False; } } /* @@ -208,7 +208,7 @@ void HttpRequest::SendString( vos::OStreamSocket* pSocket , ByteString aText ) pSocket->write( aText.GetBuffer(), aText.Len() ); } -BOOL HttpRequest::IsItem( ByteString aItem, ByteString aLine ) +sal_Bool HttpRequest::IsItem( ByteString aItem, ByteString aLine ) { return aItem.Match( aLine ) == STRING_MATCH; } @@ -232,7 +232,7 @@ SvMemoryStream* HttpRequest::GetBody() return pStream; } -USHORT HttpRequest::GetStatus() +sal_uInt16 HttpRequest::GetStatus() { return nStatus; } diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx index 44234239b81f..e9b36a321d82 100644 --- a/automation/source/testtool/httprequest.hxx +++ b/automation/source/testtool/httprequest.hxx @@ -47,38 +47,38 @@ class HttpRequest { ByteString aRequestPath; ByteString aRequestHost; - USHORT nRequestPort; + sal_uInt16 nRequestPort; ByteString aProxyHost; - USHORT nProxyPort; + sal_uInt16 nProxyPort; - USHORT nStatus; + sal_uInt16 nStatus; vos::OConnectorSocket *pOutSocket; ByteString aHeader; - USHORT nResultId; + sal_uInt16 nResultId; ByteString aContentType; SvMemoryStream* pStream; void SendString( vos::OStreamSocket* pSocket, ByteString aText ); - BOOL IsItem( ByteString aItem, ByteString aLine ); + sal_Bool IsItem( ByteString aItem, ByteString aLine ); void Init(); public: HttpRequest(); ~HttpRequest(); - void SetRequest( ByteString aHost, ByteString aPath, USHORT nPort ); - void SetProxy( ByteString aHost, USHORT nPort ); + void SetRequest( ByteString aHost, ByteString aPath, sal_uInt16 nPort ); + void SetProxy( ByteString aHost, sal_uInt16 nPort ); - BOOL Execute(); + sal_Bool Execute(); void Abort(); ByteString GetHeader() { return aHeader; } SvMemoryStream* GetBody(); ByteString GetContentType() { return aContentType; } - USHORT GetResultId() { return nResultId; } + sal_uInt16 GetResultId() { return nResultId; } - USHORT GetStatus(); + sal_uInt16 GetStatus(); }; diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 4f0f5084ad37..43334a915788 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -162,7 +162,7 @@ DBG_CTOR(ControlItem,0); pData->nUId = aType; } -ControlItem::ControlItem( const String &Name, const String &URL, const ULONG nUId ) +ControlItem::ControlItem( const String &Name, const String &URL, const sal_uLong nUId ) { DBG_CTOR(ControlItem,0); InitData(); @@ -171,7 +171,7 @@ DBG_CTOR(ControlItem,0); pData->nUId = nUId; } -ControlItem::ControlItem( const char *Name, const String &URL, const ULONG nUId ) +ControlItem::ControlItem( const char *Name, const String &URL, const sal_uLong nUId ) { DBG_CTOR(ControlItem,0); InitData(); @@ -204,22 +204,22 @@ ControlItemSon::ControlItemSon(const String &Name, rtl::OString aUIdP ) : ControlItem( Name, URL, aType ) {} -ControlItemSon::ControlItemSon(const String &Name, const String &URL, const ULONG nUId ) +ControlItemSon::ControlItemSon(const String &Name, const String &URL, const sal_uLong nUId ) : ControlItem( Name, URL, nUId ) {} -ControlItemSon::ControlItemSon(const char *Name, const String &URL, const ULONG nUId ) +ControlItemSon::ControlItemSon(const char *Name, const String &URL, const sal_uLong nUId ) : ControlItem( Name, URL, nUId ) {}*/ -BOOL ControlDef::operator < (const ControlItem &rPar) +sal_Bool ControlDef::operator < (const ControlItem &rPar) { return pData->Kurzname.CompareIgnoreCaseToAscii(rPar.pData->Kurzname) == COMPARE_LESS; } -BOOL ControlDef::operator == (const ControlItem &rPar) +sal_Bool ControlDef::operator == (const ControlItem &rPar) { return pData->Kurzname.CompareIgnoreCaseToAscii(rPar.pData->Kurzname) == COMPARE_EQUAL; } @@ -232,13 +232,13 @@ void ControlDef::Write( SvStream &aStream ) aStream.WriteByteString( String('*').Append( pData->Kurzname ), RTL_TEXTENCODING_UTF8 ); else aStream.WriteByteString( pData->Kurzname, RTL_TEXTENCODING_UTF8 ); - aStream << ((USHORT)pData->aUId.HasNumeric()); + aStream << ((sal_uInt16)pData->aUId.HasNumeric()); if ( pData->aUId.HasString() ) aStream.WriteByteString( pData->aUId.GetStr(), RTL_TEXTENCODING_UTF8 ); else - aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() ULONG != comm_ULONG on 64bit + aStream << static_cast<comm_ULONG>(pData->aUId.GetNum()); //GetNum() sal_uLong != comm_ULONG on 64bit if ( pSons ) - for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) + for ( sal_uInt16 i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(aStream); #else (void)aStream; @@ -257,7 +257,7 @@ ControlDef::ControlDef(const String &Name, rtl::OString aUIdP ) DBG_CTOR(ControlDef,0); } */ -ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons ) +ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, sal_Bool bWithSons ) : ControlItemSon("", pOriginal->pData->aUId) { DBG_CTOR(ControlDef,0); @@ -269,10 +269,10 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe if ( bWithSons && pOriginal->pSons ) { pSons = new CNames(); - for ( USHORT i = 0; i < pOriginal->pSons->Count() ; i++) + for ( sal_uInt16 i = 0; i < pOriginal->pSons->Count() ; i++) { ControlDef *pNewDef; - pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,TRUE ); + pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,sal_True ); if (! SonInsert(pNewDef)) { DBG_ERROR("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!"); @@ -285,22 +285,22 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe pSons = NULL; } -BOOL ControlItemUId::operator < (const ControlItem &rPar) +sal_Bool ControlItemUId::operator < (const ControlItem &rPar) { return pData->aUId < rPar.pData->aUId; } -BOOL ControlItemUId::operator == (const ControlItem &rPar) +sal_Bool ControlItemUId::operator == (const ControlItem &rPar) { return pData->aUId == rPar.pData->aUId; } SV_IMPL_OP_PTRARR_SORT( CNames, ControlItem* ) -void CRevNames::Insert( String aName, rtl::OString aUId, ULONG nSeq ) +void CRevNames::Insert( String aName, rtl::OString aUId, sal_uLong nSeq ) { ControlItem *pRN = new ReverseName(aName,aUId,nSeq); - USHORT nPos; + sal_uInt16 nPos; if ( Seek_Entry(pRN,&nPos) ) DeleteAndDestroy(nPos); @@ -315,8 +315,8 @@ void CRevNames::Insert( String aName, rtl::OString aUId, ULONG nSeq ) String CRevNames::GetName( rtl::OString aUId ) { ReverseName *pRN = new ReverseName(UniString(),aUId,0); - USHORT nPos; - BOOL bSeekOK = Seek_Entry(pRN,&nPos); + sal_uInt16 nPos; + sal_Bool bSeekOK = Seek_Entry(pRN,&nPos); delete pRN; if ( bSeekOK ) @@ -335,9 +335,9 @@ String CRevNames::GetName( rtl::OString aUId ) } } -void CRevNames::Invalidate ( ULONG nSeq ) +void CRevNames::Invalidate ( sal_uLong nSeq ) { - USHORT i; + sal_uInt16 i; for (i = 0; i < Count() ;) { if (((ReverseName*)GetObject(i))->LastSequence < nSeq) @@ -360,12 +360,12 @@ SbxTransportMethod::SbxTransportMethod( SbxDataType DT ) TestToolObj::TestToolObj( String aName, String aFilePath ) // Interner Aufruf : SbxObject( aName ) -, bUseIPC(FALSE) -, bReturnOK(TRUE) +, bUseIPC(sal_False) +, bReturnOK(sal_True) , nSequence(KEEP_SEQUENCES) , ProgPath() -, IsBlock(FALSE) -, SingleCommandBlock(TRUE) +, IsBlock(sal_False) +, SingleCommandBlock(sal_True) , m_pControls(NULL) , m_pNameKontext(NULL) , m_pSIds(NULL) @@ -383,7 +383,7 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter pImpl->aFileBase = DirEntry(aFilePath); // pImpl->aLogFileBase = DirEntry(); pImpl->aHIDDir = DirEntry(aFilePath); - pImpl->bIsStart = FALSE; + pImpl->bIsStart = sal_False; pImpl->pMyBasic = NULL; pImpl->aServerTimeout = Time(0,1,00); // 1:00 Minuten fest @@ -392,12 +392,12 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf im Testtool : SbxObject( aName ) -, bUseIPC(TRUE) -, bReturnOK(TRUE) +, bUseIPC(sal_True) +, bReturnOK(sal_True) , nSequence(KEEP_SEQUENCES) , ProgPath() -, IsBlock(FALSE) -, SingleCommandBlock(TRUE) +, IsBlock(sal_False) +, SingleCommandBlock(sal_True) , m_pControls(NULL) , m_pNameKontext(NULL) , m_pSIds(NULL) @@ -412,7 +412,7 @@ TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf { pImpl = new ImplTestToolObj; pImpl->ProgParam = String(); - pImpl->bIsStart = FALSE; + pImpl->bIsStart = sal_False; pImpl->pMyBasic = pBas; LoadIniFile(); @@ -477,7 +477,7 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d String aST; GETSET( aST, "ServerTimeout", ByteString::CreateFromInt64(Time(0,0,45).GetTime()) ); // 45 Sekunden Initial - pImpl->aServerTimeout = Time(ULONG(aST.ToInt64())); + pImpl->aServerTimeout = Time(sal_uLong(aST.ToInt64())); String aSOSE; aCurrentProfile = aConf.ReadKey( "CurrentProfile", "Misc" ); @@ -566,9 +566,9 @@ void TestToolObj::InitTestToolObj() pImpl->nMinRemoteCommandDelay = 0; pImpl->nMaxRemoteCommandDelay = 0; - pImpl->bDoRemoteCommandDelay = FALSE; + pImpl->bDoRemoteCommandDelay = sal_False; - pImpl->bLnaguageExtensionLoaded= FALSE; + pImpl->bLnaguageExtensionLoaded= sal_False; pImpl->pTTSfxBroadcaster = NULL; pImpl->nErrorCount = 0; @@ -583,8 +583,8 @@ void TestToolObj::InitTestToolObj() pImpl->nTestCaseLineNr = 0; - pImpl->bEnableQaErrors = TRUE; - pImpl->bDebugFindNoErrors = FALSE; + pImpl->bEnableQaErrors = sal_True; + pImpl->bDebugFindNoErrors = sal_False; pImpl->pChildEnv = new Environment; @@ -607,8 +607,8 @@ void TestToolObj::InitTestToolObj() pWait = pRTLObject->Make( CUniString("Wait"), SbxCLASS_METHOD, SbxNULL ); pWait->SetUserData( ID_Wait ); // change listener here - pRTLObject->EndListening( pWait->GetBroadcaster(), TRUE ); - StartListening( pWait->GetBroadcaster(), TRUE ); + pRTLObject->EndListening( pWait->GetBroadcaster(), sal_True ); + StartListening( pWait->GetBroadcaster(), sal_True ); } else { @@ -690,7 +690,7 @@ void TestToolObj::InitTestToolObj() // Load the Remote Commands from list if ( !pRCommands ) // Ist static, wird also nur einmal geladen ReadFlatArray( arR_Cmds, pRCommands ); - USHORT i; + sal_uInt16 i; for ( i = 0 ; i < pRCommands->Count() ; i++ ) { SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT ); @@ -703,7 +703,7 @@ void TestToolObj::InitTestToolObj() pMeth->nValue = 0; #endif Insert( pMeth ); - StartListening( pMeth->GetBroadcaster(), TRUE ); + StartListening( pMeth->GetBroadcaster(), sal_True ); } // Konstanten f�r SetControlType @@ -757,7 +757,7 @@ void TestToolObj::InitTestToolObj() pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(String::CreateFromInt32(i) ) ); Insert( pImpl->pMyVars[i] ); -// StartListening( pMyVars[i]->GetBroadcaster(), TRUE ); +// StartListening( pMyVars[i]->GetBroadcaster(), sal_True ); } @@ -865,7 +865,7 @@ SfxBroadcaster& TestToolObj::GetTTBroadcaster() return *pImpl->pTTSfxBroadcaster; } -void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, BOOL bIsFlat ) +void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, sal_Bool bIsFlat ) { /******************************************************************************* ** @@ -883,7 +883,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B String aLine,aShortname,aLongname; rtl::OString aUId; xub_StrLen nLineNr; - USHORT nElement; + sal_uInt16 nElement; ControlDef *pNewDef, *pNewDef2; ControlDef *pFatherDef = NULL; @@ -896,7 +896,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aFileName ); GetTTBroadcaster().Broadcast( aHint ); } - ReadFlat( aFileName ,pUIds, TRUE ); + ReadFlat( aFileName ,pUIds, sal_True ); if ( !pUIds ) return; pNewDef = new ControlDef("Active",rtl::OString()); @@ -962,12 +962,12 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B aFirstAllowedExtra.AssignAscii("+*"); aAllowed.AssignAscii("_"); xub_StrLen nIndex = 0; - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; while ( bOK && nIndex < aShortname.Len() ) { sal_Unicode aChar = aShortname.GetChar( nIndex ); - BOOL bOKThis = FALSE; + sal_Bool bOKThis = sal_False; bOKThis |= ( aAllowed.Search( aChar ) != STRING_NOTFOUND ); if ( !nIndex ) bOKThis |= ( aFirstAllowedExtra.Search( aChar ) != STRING_NOTFOUND ); @@ -984,7 +984,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B continue; } - BOOL bUnoName = ( aLongname.Copy( 0, 5 ).EqualsIgnoreCaseAscii( ".uno:" ) + sal_Bool bUnoName = ( aLongname.Copy( 0, 5 ).EqualsIgnoreCaseAscii( ".uno:" ) || aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "http" ) || aLongname.Copy( 0, 15 ).EqualsIgnoreCaseAscii( "private:factory" ) || aLongname.Copy( 0, 8 ).EqualsIgnoreCaseAscii( "service:" ) @@ -993,10 +993,10 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B // generic method to mark longnames as symbolic if ( aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "sym:" ) ) { - bUnoName = TRUE; + bUnoName = sal_True; aLongname.Erase( 0, 4 ); } - BOOL bMozillaName = ( !bIsFlat && aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( ".moz" ) ); + sal_Bool bMozillaName = ( !bIsFlat && aLongname.Copy( 0, 4 ).EqualsIgnoreCaseAscii( ".moz" ) ); if ( aShortname.GetChar(0) == '+' ) // Kompletten Eintrag kopieren { @@ -1006,7 +1006,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if (pNames->Seek_Entry(&WhatName,&nElement)) { OldTree = (ControlDef*)pNames->GetObject(nElement); - pNewDef = new ControlDef(aLongname,aShortname,OldTree,TRUE); + pNewDef = new ControlDef(aLongname,aShortname,OldTree,sal_True); const ControlItem *pItem = pNewDef; if (! pNames->Insert(pItem)) @@ -1138,15 +1138,15 @@ void TestToolObj::AddName(String &aBisher, String &aNeu ) } -void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) -// Wenn bSortByName == FALSE, dann nach UId Sortieren (ControlItemUId statt ControlDef) +void TestToolObj::ReadFlat( String Filename, CNames *&pNames, sal_Bool bSortByName ) +// Wenn bSortByName == sal_False, dann nach UId Sortieren (ControlItemUId statt ControlDef) { SvFileStream Stream; String aLine,aLongname; rtl::OString aUId; xub_StrLen nLineNr; ControlItem *pNewItem; - USHORT nDoubleCount = 0; + sal_uInt16 nDoubleCount = 0; Stream.Open(Filename, STREAM_STD_READ); @@ -1202,7 +1202,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } else { - USHORT nNr; + sal_uInt16 nNr; pNames->Seek_Entry( pNewItem, &nNr ); AddName( pNames->GetObject(nNr)->pData->Kurzname, pNewItem->pData->Kurzname ); } @@ -1227,7 +1227,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) { - USHORT nIndex = 0; + sal_uInt16 nIndex = 0; if ( !pNames ) pNames = new CNames(); @@ -1247,15 +1247,15 @@ void TestToolObj::WaitForAnswer () if ( bUseIPC ) { #ifdef DBG_UTILx - USHORT nSysWinModeMemo = GetpApp()->GetSystemWindowMode(); + sal_uInt16 nSysWinModeMemo = GetpApp()->GetSystemWindowMode(); GetpApp()->SetSystemWindowMode( 0 ); ModelessDialog aDlg(NULL); aDlg.SetOutputSizePixel(Size(200,0)); aDlg.SetText(CUniString("Waiting for Answer")); - aDlg.Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + aDlg.Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); GetpApp()->SetSystemWindowMode( nSysWinModeMemo ); #endif - BOOL bWasRealWait = !bReturnOK; + sal_Bool bWasRealWait = !bReturnOK; BasicRuntime aRun( NULL ); if ( BasicRuntimeAccess::HasRuntime() ) aRun = BasicRuntimeAccess::GetRuntime(); @@ -1292,7 +1292,7 @@ void TestToolObj::WaitForAnswer () if ( pTemp ) { ReturnResults( pTemp ); - bReturnOK = TRUE; + bReturnOK = sal_True; } else { @@ -1306,7 +1306,7 @@ void TestToolObj::WaitForAnswer () if ( !bReturnOK ) { ADD_ERROR(ERR_EXEC_TIMEOUT,GEN_RES_STR1(S_TIMOUT_WAITING, String::CreateFromInt64(nSequence))); - bReturnOK = TRUE; + bReturnOK = sal_True; nSequence++; } } @@ -1330,7 +1330,7 @@ IMPL_LINK( TestToolObj, CallDialogHandler, Application*, EMPTYARG ) String aHandlerName(aDialogHandlerName); aDialogHandlerName.Erase(); - ULONG nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler �ndert + sal_uLong nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler �ndert ((StarBASIC*)GetParent())->Call( aHandlerName ); nSequence = nRememberSequence; // Die Sequenznummern werden dann zwar doppelt vergeben, aber wen k�mmerts. @@ -1348,7 +1348,7 @@ void TestToolObj::BeginBlock() DBG_ASSERT(!IsBlock,"BeginBlock innerhalb eines Blockes"); In->Reset(nSequence); - IsBlock = TRUE; + IsBlock = sal_True; } @@ -1385,21 +1385,21 @@ void TestToolObj::SendViaSocket() } } - bReturnOK = FALSE; + bReturnOK = sal_False; if ( pCommunicationManager->GetLastNewLink() ) { if ( !pCommunicationManager->GetLastNewLink()->TransferDataStream( In->GetStream() ) ) { ADD_ERROR(ERR_SEND_TIMEOUT,GEN_RES_STR1(S_TIMOUT_SENDING, String::CreateFromInt64(nSequence))); nSequence++; - bReturnOK = TRUE; // Kein Return zu erwarten + bReturnOK = sal_True; // Kein Return zu erwarten } } else { ADD_ERROR(ERR_SEND_TIMEOUT,GEN_RES_STR1(S_NO_CONNECTION, String::CreateFromInt64(nSequence))); nSequence++; - bReturnOK = TRUE; // Kein Return zu erwarten + bReturnOK = sal_True; // Kein Return zu erwarten } } @@ -1414,7 +1414,7 @@ void TestToolObj::EndBlock() if ( pImpl->bDoRemoteCommandDelay ) { - ULONG nTimeWait = pImpl->nMinRemoteCommandDelay; + sal_uLong nTimeWait = pImpl->nMinRemoteCommandDelay; if ( pImpl->nMaxRemoteCommandDelay != pImpl->nMinRemoteCommandDelay ) nTimeWait += Time::GetSystemTicks() % ( pImpl->nMaxRemoteCommandDelay - pImpl->nMinRemoteCommandDelay ); Timer aTimer; @@ -1434,11 +1434,11 @@ void TestToolObj::EndBlock() else { // PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() ); - bReturnOK = FALSE; + bReturnOK = sal_False; if ( aDialogHandlerName.Len() > 0 ) GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 ); } - IsBlock = FALSE; + IsBlock = sal_False; } else { @@ -1447,14 +1447,14 @@ void TestToolObj::EndBlock() } -BOOL TestToolObj::Load( String aFileName, SbModule *pMod ) +sal_Bool TestToolObj::Load( String aFileName, SbModule *pMod ) { - BOOL bOk = TRUE; + sal_Bool bOk = sal_True; SvFileStream aStrm( aFileName, STREAM_STD_READ ); if( aStrm.IsOpen() ) { String aText, aLine; - BOOL bIsFirstLine = TRUE; + sal_Bool bIsFirstLine = sal_True; rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850; while( !aStrm.IsEof() && bOk ) { @@ -1466,10 +1466,10 @@ BOOL TestToolObj::Load( String aFileName, SbModule *pMod ) if ( !bIsFirstLine ) aText += '\n'; aText += aLine; - bIsFirstLine = FALSE; + bIsFirstLine = sal_False; } if( aStrm.GetError() != SVSTREAM_OK ) - bOk = FALSE; + bOk = sal_False; } aText.ConvertLineEnd(); pMod->SetName(CUniString("--").Append(aFileName)); @@ -1483,16 +1483,16 @@ BOOL TestToolObj::Load( String aFileName, SbModule *pMod ) MyBasic::SetCompileModule( pOldModule ); if ( WasPrecompilerError() ) - bOk = FALSE; + bOk = sal_False; } else - bOk = FALSE; + bOk = sal_False; return bOk; } -BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls ) +sal_Bool TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pControls ) { SvFileStream aStream; String aName,aURL; @@ -1505,7 +1505,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr if (!aStream.IsOpen()) { ADD_ERROR(ERR_NO_FILE,GEN_RES_STR1(S_CANNOT_OPEN_FILE, Filename)); - return FALSE; + return sal_False; } if ( !pSIds ) @@ -1518,17 +1518,17 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr GetTTBroadcaster().Broadcast( aHint ); } - USHORT nAnz; + sal_uInt16 nAnz; aStream >> nAnz; CNames *pNames = pSIds; // first read all the slots - BOOL bIsFlat = TRUE; // Slots do not have children + sal_Bool bIsFlat = sal_True; // Slots do not have children while ( nAnz && !aStream.IsEof() ) { aStream.ReadByteString( aName, RTL_TEXTENCODING_UTF8 ); - USHORT nType; + sal_uInt16 nType; aStream >> nType; if ( !nType /* HasNumeric() */) { @@ -1599,7 +1599,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { aStream >> nAnz; pNames = pControls; // Now read the controls - bIsFlat = FALSE; // Controls *do* have children + bIsFlat = sal_False; // Controls *do* have children } @@ -1611,17 +1611,17 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr } aStream.Close(); - return TRUE; + return sal_True; } -BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls ) +sal_Bool TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pControls ) { - BOOL bOk = TRUE; + sal_Bool bOk = sal_True; SvFileStream aStrm( String(Filename).AppendAscii(".bin"), STREAM_STD_WRITE ); if( aStrm.IsOpen() ) { - USHORT i; + sal_uInt16 i; if ( pSIds ) { aStrm << pSIds->Count(); @@ -1629,11 +1629,11 @@ BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pContro { ((ControlDef*)(*pSIds)[i])->Write(aStrm); if( aStrm.GetError() != SVSTREAM_OK ) - bOk = FALSE; + bOk = sal_False; } } else - aStrm << USHORT( 0 ); + aStrm << sal_uInt16( 0 ); if ( pControls ) { @@ -1642,14 +1642,14 @@ BOOL TestToolObj::WriteNamesBin( String Filename, CNames *pSIds, CNames *pContro { ((ControlDef*)(*pControls)[i])->Write(aStrm); if( aStrm.GetError() != SVSTREAM_OK ) - bOk = FALSE; + bOk = sal_False; } } else - aStrm << USHORT( 0 ); + aStrm << sal_uInt16( 0 ); } else - bOk = FALSE; + bOk = sal_False; return bOk; } @@ -1665,8 +1665,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, SbxVariable* pVar = p->GetVar(); SbxArray* rPar = pVar->GetParameters(); - ULONG nHintId = p->GetId(); - ULONG nHintUserData = pVar->GetUserData(); + sal_uLong nHintId = p->GetId(); + sal_uLong nHintUserData = pVar->GetUserData(); if( nHintId == SBX_HINT_DATAWANTED ) { nMyVar = 0; @@ -1678,14 +1678,14 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, m_pNameKontext = m_pControls; // So da� nicht immer mal wieder was aus einem alten Kontext dazwischenhaut - for (USHORT i=0;i<VAR_POOL_SIZE;i++) + for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++) { pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) ); } } else if ( rPar && rPar->Count() == 2 ) { - USHORT nElement; + sal_uInt16 nElement; SbxVariableRef pArg = rPar->Get( 1 ); String aKontext = pArg->GetString(); ControlDef WhatName(aKontext,rtl::OString()); @@ -1694,7 +1694,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, m_pNameKontext = ((ControlDef*)m_pControls->GetObject(nElement))->GetSons(); // So da� nicht immer mal wieder was aus einem alten Kontext dazwischenhaut - for (USHORT i=0;i<VAR_POOL_SIZE;i++) + for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++) { pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) ); } @@ -1724,10 +1724,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, GetTTBroadcaster().Broadcast( aHint ); } - pImpl->bIsStart = TRUE; + pImpl->bIsStart = sal_True; BeginBlock(); EndBlock(); - pImpl->bIsStart = FALSE; + pImpl->bIsStart = sal_False; { TTExecutionStatusHint aHint( TT_EXECUTION_HIDE_ACTION ); GetTTBroadcaster().Broadcast( aHint ); @@ -1808,12 +1808,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, while ( pCommunicationManager->IsCommunicationRunning() ) Application::Reschedule(); - SingleCommandBlock = TRUE; // Bug 57188 - IsBlock = FALSE; + SingleCommandBlock = sal_True; // Bug 57188 + IsBlock = sal_False; // pCommunicationManager->StartCommunication(); - for (USHORT i=0;i<VAR_POOL_SIZE;i++) + for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++) { pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) ); } @@ -1855,19 +1855,19 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, m_pReverseUIds = NULL; } m_pNameKontext = m_pControls; - pImpl->bLnaguageExtensionLoaded = FALSE; + pImpl->bLnaguageExtensionLoaded = sal_False; SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED ); GetTTBroadcaster().Broadcast( aHint ); pImpl->nMinRemoteCommandDelay = 0; pImpl->nMaxRemoteCommandDelay = 0; - pImpl->bDoRemoteCommandDelay = FALSE; + pImpl->bDoRemoteCommandDelay = sal_False; pImpl->aTestCaseName.Erase(); pImpl->aTestCaseFileName.Erase(); pImpl->nTestCaseLineNr = 0; - pImpl->bEnableQaErrors = TRUE; - pImpl->bDebugFindNoErrors = FALSE; + pImpl->bEnableQaErrors = sal_True; + pImpl->bDebugFindNoErrors = sal_False; pImpl->pChildEnv->clear(); @@ -1892,21 +1892,21 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( Ext.CompareIgnoreCaseToAscii("Win") == COMPARE_EQUAL ) { ReadNames( FilePath.GetFull(),m_pControls,pUIds); - pImpl->bLnaguageExtensionLoaded = TRUE; + pImpl->bLnaguageExtensionLoaded = sal_True; SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED ); GetTTBroadcaster().Broadcast( aHint ); } else if ( Ext.CompareIgnoreCaseToAscii("Sid") == COMPARE_EQUAL ) { ReadNames( FilePath.GetFull(),m_pSIds,pUIds,FLAT); - pImpl->bLnaguageExtensionLoaded = TRUE; + pImpl->bLnaguageExtensionLoaded = sal_True; SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED ); GetTTBroadcaster().Broadcast( aHint ); } else if ( Ext.CompareIgnoreCaseToAscii("Bin") == COMPARE_EQUAL ) { ReadNamesBin( FilePath.GetFull(), m_pSIds, m_pControls ); - pImpl->bLnaguageExtensionLoaded = TRUE; + pImpl->bLnaguageExtensionLoaded = sal_True; SfxSimpleHint aHint( SBX_HINT_LANGUAGE_EXTENSION_LOADED ); GetTTBroadcaster().Broadcast( aHint ); } @@ -1986,7 +1986,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, case ID_CaseLog: if ( rPar ) // rPar != NULL <=> Es gibt Parameter { - USHORT n; + sal_uInt16 n; String aX; for ( n = 1; n < rPar->Count(); n++ ) { @@ -2014,16 +2014,16 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( IS_ERROR() ) { BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); - BOOL bWasNewError = FALSE; + sal_Bool bWasNewError = sal_False; if ( BasicRuntimeAccess::HasStack() ) { - for ( USHORT i = 0 ; i < BasicRuntimeAccess::GetStackEntryCount() -1 ; i++ ) + for ( sal_uInt16 i = 0 ; i < BasicRuntimeAccess::GetStackEntryCount() -1 ; i++ ) { BasicErrorStackEntry aThisEntry = BasicRuntimeAccess::GetStackEntry(i); if ( !bWasNewError ) { - bWasNewError = TRUE; + bWasNewError = sal_True; ADD_ERROR_LOG( GET_ERROR()->aText, aThisEntry.GetModuleName(SbxNAME_SHORT_TYPES), aThisEntry.GetLine(), aThisEntry.GetCol1(), aThisEntry.GetCol2(), aThisEntry.GetSourceRevision() ); } @@ -2036,7 +2036,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, BasicRuntimeAccess::DeleteStack(); } - BOOL bIsFirst = TRUE; + sal_Bool bIsFirst = sal_True; while ( aRun.IsValid() ) { xub_StrLen nErrLn; @@ -2044,7 +2044,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, xub_StrLen nCol2; if ( bIsFirst ) { - bIsFirst = FALSE; + bIsFirst = sal_False; nErrLn = GET_ERROR()->nLine; nCol1 = GET_ERROR()->nCol1; nCol2 = GET_ERROR()->nCol2; @@ -2058,7 +2058,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !bWasNewError ) { - bWasNewError = TRUE; + bWasNewError = sal_True; ADD_ERROR_LOG( GET_ERROR()->aText, aRun.GetModuleName(SbxNAME_SHORT_TYPES), nErrLn, nCol1, nCol2, aRun.GetSourceRevision() ); } @@ -2091,7 +2091,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, case ID_QAErrorLog: if ( rPar ) // rPar != NULL <=> Es gibt Parameter { - USHORT n; + sal_uInt16 n; String aSammel; for ( n = 1; n < rPar->Count(); n++ ) { @@ -2104,7 +2104,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, case ID_PrintLog: if ( rPar ) // rPar != NULL <=> Es gibt Parameter { - USHORT n; + sal_uInt16 n; String aSammel; for ( n = 1; n < rPar->Count(); n++ ) { @@ -2117,7 +2117,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, case ID_WarnLog: if ( rPar ) // rPar != NULL <=> Es gibt Parameter { - USHORT n; + sal_uInt16 n; String aSammel; for ( n = 1; n < rPar->Count(); n++ ) { @@ -2151,7 +2151,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, // Das ist total rotten und mu� wohl komplett neu!! -/* BOOL bWasBlock = IsBlock; +/* sal_Bool bWasBlock = IsBlock; if ( !IsBlock ) // Impliziter call bei Aufruf mit Methode if ( SingleCommandBlock ) BeginBlock(); @@ -2159,7 +2159,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, // In->GenCmdSlot (128,rPar); // ((Controls*)pVar)->pMethodVar->nValue = 128; - ULONG nOldValue = ((Controls*)pVar)->GetULong(); + sal_uLong nOldValue = ((Controls*)pVar)->GetULong(); // Setzen, so da� beim Return der Wert stimmt ((Controls*)pVar)->PutULong( 128 ); pImpl->pNextReturn = ((Controls*)pVar)->pMethodVar; @@ -2216,7 +2216,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, SetError( SbxERR_NOTIMP ); } if ( !IsError() ) - In->GenCmdCommand ((USHORT)(((SbxTransportMethod*)pVar)->nValue),rPar); + In->GenCmdCommand ((sal_uInt16)(((SbxTransportMethod*)pVar)->nValue),rPar); if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); @@ -2225,7 +2225,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, } if ( SingleCommandBlock ) EndBlock(); - if ( !IsError() && (USHORT)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) + if ( !IsError() && (sal_uInt16)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { WaitForAnswer(); } @@ -2245,8 +2245,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( SingleCommandBlock ) BeginBlock(); if ( !IsError() ) - In->GenCmdSlot ( (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar ); - pVar->PutInteger( (USHORT)((SbxTransportMethod*)pVar)->nValue ); + In->GenCmdSlot ( (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar ); + pVar->PutInteger( (sal_uInt16)((SbxTransportMethod*)pVar)->nValue ); if ( SingleCommandBlock ) EndBlock(); } @@ -2293,14 +2293,14 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( nHintUserData == ID_Control ) { In->GenCmdControl (pMember->GetULong(), - (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); + (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar); // FIXME: HELPID aNextReturnId = rtl::OString();// pMember->GetULong() ); } else { In->GenCmdControl (pMember->GetString(), - (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); + (sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar); // FIXME: HELPID #if 0 aNextReturnId = rtl::OString( pMember->GetString() ); @@ -2321,7 +2321,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, } if ( SingleCommandBlock ) EndBlock(); - if ( !IsError() && (USHORT)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) + if ( !IsError() && (sal_uInt16)((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { WaitForAnswer(); } @@ -2796,7 +2796,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, delete pFehlerListe; pFehlerListe = new CErrors; - for (USHORT i=0;i<VAR_POOL_SIZE;i++) + for (sal_uInt16 i=0;i<VAR_POOL_SIZE;i++) { pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) ); } @@ -2847,7 +2847,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, } } -void TestToolObj::DebugFindNoErrors( BOOL bDebugFindNoErrors ) +void TestToolObj::DebugFindNoErrors( sal_Bool bDebugFindNoErrors ) { pImpl->bDebugFindNoErrors = bDebugFindNoErrors; } @@ -2870,7 +2870,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) else { - USHORT nElement; + sal_uInt16 nElement; ControlDef *pWhatName = new ControlDef(aStr,rtl::OString()); /// nach Controls suchen @@ -2987,18 +2987,18 @@ String TestToolObj::GetRevision( String const &aSourceIn ) return String::CreateFromAscii("No Revision found"); } -BOOL TestToolObj::CError( ULONG code, const String& rMsg, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 ) +sal_Bool TestToolObj::CError( sal_uLong code, const String& rMsg, xub_StrLen l, xub_StrLen c1, xub_StrLen c2 ) { - bWasPrecompilerError = TRUE; + bWasPrecompilerError = sal_True; if ( aCErrorHdl.IsSet() ) { ErrorEntry aErrorEntry( code, rMsg, l, c1, c2 ); - return (BOOL)aCErrorHdl.Call( &aErrorEntry ); + return (sal_Bool)aCErrorHdl.Call( &aErrorEntry ); } else { ADD_ERROR( code, rMsg ) - return TRUE; + return sal_True; } } @@ -3020,15 +3020,15 @@ void TestToolObj::CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrL #define CATCHRES_LABEL CUniString( "ctchres" ) #define ENDCATCH_LABEL CUniString( "endctch" ) -BOOL IsAlphaChar( sal_Unicode cChar ) +sal_Bool IsAlphaChar( sal_Unicode cChar ) { return ( cChar >= 'a' && cChar <= 'z' ) || ( cChar >= 'A' && cChar <= 'Z' ); } -BOOL IsInsideString( const String& aSource, const xub_StrLen nStart ) +sal_Bool IsInsideString( const String& aSource, const xub_StrLen nStart ) { - BOOL bInside = FALSE; + sal_Bool bInside = sal_False; xub_StrLen nPos = nStart-1; while ( nPos && aSource.GetChar(nPos) != _CR && aSource.GetChar(nPos) != _LF ) @@ -3040,7 +3040,7 @@ BOOL IsInsideString( const String& aSource, const xub_StrLen nStart ) return bInside; } -BOOL IsValidHit( const String& aSource, const xub_StrLen nStart, const xub_StrLen nEnd ) +sal_Bool IsValidHit( const String& aSource, const xub_StrLen nStart, const xub_StrLen nEnd ) { return !IsAlphaChar( aSource.GetChar(nStart-1) ) && !IsAlphaChar( aSource.GetChar(nEnd+1)) && !IsInsideString( aSource, nStart ); @@ -3061,7 +3061,7 @@ xub_StrLen TestToolObj::ImplSearch( const String &aSource, const xub_StrLen nSta } } -xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, USHORT &nLabelCount ) +xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, sal_uInt16 &nLabelCount ) { xub_StrLen nTry,nCatch,nEndcatch; if( (nTry = ImplSearch( aSource, nStart, nEnd, CUniString("try"), nStart )) == STRING_NOTFOUND ) @@ -3170,7 +3170,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_ void TestToolObj::PreCompileDispatchParts( String &aSource, String aStart, String aEnd, String aFinalLable ) { - USHORT nLabelCount = 0; + sal_uInt16 nLabelCount = 0; xub_StrLen nPartPos = 0; while ( !WasPrecompilerError() && (nPartPos = ImplSearch( aSource, nPartPos, aSource.Len(), aStart )) != STRING_NOTFOUND ) @@ -3184,7 +3184,7 @@ void TestToolObj::PreCompileDispatchParts( String &aSource, String aStart, Strin } -BOOL TestToolObj::WasPrecompilerError() +sal_Bool TestToolObj::WasPrecompilerError() { return bWasPrecompilerError; } @@ -3192,13 +3192,13 @@ BOOL TestToolObj::WasPrecompilerError() String TestToolObj::PreCompile( String const &aSourceIn ) { // Im CTOR zu fr�h, und hier grade nicg rechtzeitig. Start und Stop von Programmausf�hrung - StartListening( ((StarBASIC*)GetParent())->GetBroadcaster(), TRUE ); + StartListening( ((StarBASIC*)GetParent())->GetBroadcaster(), sal_True ); xub_StrLen nTestCase; xub_StrLen nEndCase; xub_StrLen nStartPos = 0; String aSource(aSourceIn); - bWasPrecompilerError = FALSE; + bWasPrecompilerError = sal_False; HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.") aSource = String(' ').Append( aSource ); // Da Schl�sselworte an Position 0 sonst nicht gefunden werden @@ -3209,7 +3209,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.") xub_StrLen nComment; while ( (nComment = aSource.SearchAscii("'",nStartPos)) != STRING_NOTFOUND ) { - USHORT nStringEndCount = 0; + sal_uInt16 nStringEndCount = 0; xub_StrLen nIndex = nComment; while ( nIndex && aSource.GetChar(nIndex) != '\n' ) { @@ -3260,7 +3260,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.") if ( aSource.SearchAscii(":",nTestCase) < nTcEnd ) nTcEnd = aSource.SearchAscii(":",nTestCase) -1; String aSuffix = aSource.Copy(nTestCase+8,nTcEnd-nTestCase-8); - USHORT nOldLen; + sal_uInt16 nOldLen; do { nOldLen = aSuffix.Len(); @@ -3288,7 +3288,7 @@ HACK("Ich gestehe alles: Ich war zu faul das richtig zu machen.") void TestToolObj::AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem ) { - USHORT nNr; + sal_uInt16 nNr; if ( pControls->Seek_Entry( pNewItem, &nNr ) ) { AddName( pControls->GetObject(nNr)->pData->Kurzname, pNewItem->pData->Kurzname ); @@ -3319,7 +3319,7 @@ void TestToolObj::ReadHidLstByNumber() GetTTBroadcaster().Broadcast( aHint ); } - ReadFlat( aName, m_pReverseUIds, FALSE ); + ReadFlat( aName, m_pReverseUIds, sal_False ); { TTExecutionStatusHint aHint( TT_EXECUTION_HIDE_ACTION ); @@ -3328,14 +3328,14 @@ void TestToolObj::ReadHidLstByNumber() } } -void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) +void TestToolObj::SortControlsByNumber( sal_Bool bIncludeActive ) { // Die Controls einmal hirarchisch und einmal alle flach nach nummer sortiert if ( !m_pReverseControls && !m_pReverseControlsSon && m_pControls ) { m_pReverseControls = new CNames; m_pReverseControlsSon = new CNames; - USHORT nWin,nCont; + sal_uInt16 nWin,nCont; const String aSl('/'); for ( nWin = 0 ; nWin < m_pControls->Count() ; nWin++ ) { @@ -3366,7 +3366,7 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) { // FIXME: HELPID ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() ); - USHORT nNr; + sal_uInt16 nNr; if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) ) { m_pReverseControls->DeleteAndDestroy( nNr ); @@ -3383,12 +3383,12 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) } -BOOL TestToolObj::ReturnResults( SvStream *pIn ) +sal_Bool TestToolObj::ReturnResults( SvStream *pIn ) { - USHORT nId; - ULONG nClearSequence = 0; - BOOL bSequenceOK = TRUE; + sal_uInt16 nId; + sal_uLong nClearSequence = 0; + sal_Bool bSequenceOK = sal_True; CNames *pReverseControlsKontext = NULL; CRetStream *pRetStream = new CRetStream(pIn); @@ -3400,7 +3400,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { case SIReturn: { - USHORT nRet,nParams; + sal_uInt16 nRet,nParams; rtl::OString aUId; pRetStream->Read(nRet); if ( pRetStream->GetNextType() == BinString ) @@ -3423,10 +3423,10 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } pRetStream->Read(nParams); - USHORT nNr1 = 0; + sal_uInt16 nNr1 = 0; comm_ULONG nLNr1 = 0; String aString1; - BOOL bBool1 = FALSE; + sal_Bool bBool1 = sal_False; SbxValueRef xValue1 = new SbxValue; if( nParams & PARAM_USHORT_1 ) @@ -3450,10 +3450,10 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { // FIXME: HELPID #if 0 - ULONG nUId = aUId.GetNum(); + sal_uLong nUId = aUId.GetNum(); if ( nSequence != nUId ) { - bSequenceOK = FALSE; + bSequenceOK = sal_False; ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR2(S_RETURN_SEQUENCE_MISSMATCH, String::CreateFromInt64(nUId), String::CreateFromInt64(nSequence)) ); } else @@ -3466,7 +3466,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case RET_Value: if ( pImpl->pNextReturn ) { -// ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); +// sal_uLong nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); // pImpl->pNextReturn->GetParent()->SetUserData(0); // if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() ) if ( aNextReturnId.equals( aUId ) ) @@ -3512,7 +3512,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( !m_pReverseSlots && m_pSIds ) { m_pReverseSlots = new CNames; - USHORT nWin; + sal_uInt16 nWin; const String aSl('/'); for ( nWin = 0 ; nWin < m_pSIds->Count() ; nWin++ ) { @@ -3526,7 +3526,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) #if 0 pWinInfo->aUId = aUId.GetText(); #endif - pWinInfo->nRType = (USHORT)nLNr1; // just ULONG for Transport, data is always USHORT + pWinInfo->nRType = (sal_uInt16)nLNr1; // just sal_uLong for Transport, data is always USHORT pWinInfo->aRName = aString1; pWinInfo->bIsReset = bBool1; pWinInfo->aKurzname.Erase(); @@ -3535,7 +3535,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // eventuell den Kontext feststellen. Passiert nur beim ersten Eintrag nach reset if ( !pReverseControlsKontext && m_pReverseControlsSon ) { - USHORT nNr; + sal_uInt16 nNr; ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( m_pReverseControlsSon->Seek_Entry(pNewItem,&nNr) ) { @@ -3557,7 +3557,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // Kurzname feststellen if ( pReverseControlsKontext ) { - USHORT nNr; + sal_uInt16 nNr; ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) ) { @@ -3570,7 +3570,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // Slotname feststellen if ( m_pReverseSlots ) { - USHORT nNr; + sal_uInt16 nNr; ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( m_pReverseSlots->Seek_Entry(pNewItem,&nNr) ) pWinInfo->aSlotname = m_pReverseSlots->GetObject(nNr)->pData->Kurzname; @@ -3588,7 +3588,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { if ( m_pReverseUIds ) { - USHORT nNr; + sal_uInt16 nNr; ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( m_pReverseUIds->Seek_Entry(pNewItem,&nNr) ) pWinInfo->aLangname = m_pReverseUIds->GetObject(nNr)->pData->Kurzname; @@ -3606,7 +3606,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { // FIXME: HELPID #if 0 - ULONG nUId = aUId.GetNum(); + sal_uLong nUId = aUId.GetNum(); if ( nParams & PARAM_STR_1 ) { DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf")); @@ -3625,8 +3625,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { case S_ProfileReset: // nLNr1 = Anzahl Borders { - pImpl->nNumBorders = (USHORT)nLNr1; // Borders are 0 to 4 - USHORT i; + pImpl->nNumBorders = (sal_uInt16)nLNr1; // Borders are 0 to 4 + sal_uInt16 i; for ( i=0 ; i<4 ; i++ ) pImpl->naValBorders[i] = 0; @@ -3648,7 +3648,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } case S_ProfileTime: // nLNr1 = remote Zeit des Befehls { - USHORT i; + sal_uInt16 i; for ( i=0 ; i<pImpl->nNumBorders && pImpl->naValBorders[i] <= nLNr1 ; i++ ) {}; @@ -3683,7 +3683,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if( aStrm.IsOpen() ) { String aProfile; - USHORT i; + sal_uInt16 i; aProfile += String().Expand(15); for ( i=0 ; i<pImpl->nNumBorders ; i++ ) @@ -3741,7 +3741,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { // FIXME: HELPID #if 0 - ULONG nUId = aUId.GetNum(); + sal_uLong nUId = aUId.GetNum(); switch ( nUId ) { case S_AssertError: @@ -3764,15 +3764,15 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; case RET_MacroRecorder: { - SortControlsByNumber( TRUE ); + SortControlsByNumber( sal_True ); String aCommand,aControls,aControl,aULongNames,aULongName; - BOOL bWriteNewKontext = FALSE; + sal_Bool bWriteNewKontext = sal_False; aControls.Erase(); // Kurzname feststellen if ( m_pReverseControls ) { - USHORT nNr; + sal_uInt16 nNr; ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) ) aControls = m_pReverseControls->GetObject(nNr)->pData->Kurzname; @@ -3789,7 +3789,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { if ( m_pReverseControls ) { - USHORT nNr; + sal_uInt16 nNr; // FIXME: HELPID ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) ); if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) ) @@ -3803,8 +3803,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } // now determin the best common kontext - USHORT i,j; - BOOL bFoundUlongName = FALSE, bFoundControl = FALSE; + sal_uInt16 i,j; + sal_Bool bFoundUlongName = sal_False, bFoundControl = sal_False; // check for current kontext for ( i = 0 ; !bFoundUlongName && i < aULongNames.GetTokenCount('/') ; i++ ) bFoundUlongName = aLastRecordedKontext.Equals( aULongNames.GetToken(i,'/').GetToken( 0,':') ); @@ -3819,7 +3819,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } else { // see if we can find common kontext - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aCurrentKontext; for ( i = 0 ; !bFound && i < aULongNames.GetTokenCount('/') ; i++ ) @@ -3830,19 +3830,19 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { if ( aCurrentKontext.Equals( aControls.GetToken(j,'/').GetToken( 0,':') ) ) { - bFound = TRUE; + bFound = sal_True; aULongName = aULongNames.GetToken(i,'/').GetToken( 1,':'); aControl = aControls.GetToken(j,'/').GetToken( 1,':'); aLastRecordedKontext = aCurrentKontext; - bWriteNewKontext = TRUE; + bWriteNewKontext = sal_True; } } } if ( !bFound ) { // check if both contain toplevel - bFoundUlongName = FALSE; - bFoundControl = FALSE; + bFoundUlongName = sal_False; + bFoundControl = sal_False; for ( i = 0 ; !bFoundUlongName && i < aULongNames.GetTokenCount('/') ; i++ ) bFoundUlongName = aULongNames.GetToken(i,'/').GetToken( 0,':').Equals( aULongNames.GetToken(i,'/').GetToken( 1,':') ); @@ -3856,7 +3856,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( aLastRecordedKontext.Len() ) { aLastRecordedKontext.Erase(); - bWriteNewKontext = TRUE; + bWriteNewKontext = sal_True; } } else @@ -3874,8 +3874,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } else { // we only have a Control - USHORT i; - BOOL bFoundControl = FALSE; + sal_uInt16 i; + sal_Bool bFoundControl = sal_False; // check for current kontext for ( i = 0 ; !bFoundControl && i < aControls.GetTokenCount('/') ; i++ ) bFoundControl = aLastRecordedKontext.Equals( aControls.GetToken(i,'/').GetToken( 0,':') ); @@ -3884,7 +3884,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) else { aLastRecordedKontext = aControls.GetToken(0,'/').GetToken( 0,':'); - bWriteNewKontext = TRUE; + bWriteNewKontext = sal_True; aControl = aControls.GetToken(0,'/').GetToken( 1,':'); } @@ -3911,35 +3911,35 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) aCommand += '.'; aCommand += aMethod; - BOOL bWasParam = FALSE; + sal_Bool bWasParam = sal_False; if( nParams & PARAM_STR_1 ) { - bWasParam = TRUE; + bWasParam = sal_True; aCommand.AppendAscii( " \"" ); if ( nNr1 & M_KEY_STRING ) { - USHORT nModify = 0; - BOOL bIsProsa = FALSE; + sal_uInt16 nModify = 0; + sal_Bool bIsProsa = sal_False; xub_StrLen i; for ( i = 0; i < aString1.Len(); i++ ) { - if ( ((USHORT)aString1.GetChar(i)) == 1 ) // we have a spechial char + if ( ((sal_uInt16)aString1.GetChar(i)) == 1 ) // we have a spechial char { i++; if ( !bIsProsa ) { aCommand.AppendAscii( "<" ); - bIsProsa = TRUE; + bIsProsa = sal_True; } else aCommand.AppendAscii( " " ); - USHORT nKeyCode = (USHORT)aString1.GetChar(i) & KEY_CODE; - USHORT nNewModify = (USHORT)aString1.GetChar(i) & KEY_MODTYPE; + sal_uInt16 nKeyCode = (sal_uInt16)aString1.GetChar(i) & KEY_CODE; + sal_uInt16 nNewModify = (sal_uInt16)aString1.GetChar(i) & KEY_MODTYPE; if ( nNewModify != nModify ) { // generate modifiers - USHORT nChanged = ( nNewModify ^ nModify ); + sal_uInt16 nChanged = ( nNewModify ^ nModify ); if ( nChanged & KEY_SHIFT ) { aCommand += GetKeyName( KEY_SHIFT ); @@ -3964,7 +3964,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( bIsProsa ) { aCommand.AppendAscii( ">" ); - bIsProsa = FALSE; + bIsProsa = sal_False; } aCommand += aString1.GetChar(i); nModify = 0; @@ -3973,7 +3973,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( bIsProsa ) { aCommand.AppendAscii( ">" ); - bIsProsa = FALSE; + bIsProsa = sal_False; } } else @@ -3988,7 +3988,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) aCommand.AppendAscii( ", " ); else aCommand.AppendAscii( " " ); - bWasParam = TRUE; + bWasParam = sal_True; if ( nNr1 & M_RET_NUM_CONTROL ) { aCommand.Append( aULongName ); @@ -4004,7 +4004,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) aCommand.AppendAscii( ", " ); else aCommand.AppendAscii( " " ); - bWasParam = TRUE; + bWasParam = sal_True; if ( bBool1 ) aCommand.AppendAscii( "true" ); else @@ -4077,14 +4077,14 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) pShortNames->Invalidate( nClearSequence - KEEP_SEQUENCES ); } - bReturnOK = TRUE; + bReturnOK = sal_True; - return TRUE; + return sal_True; } // RetService::Request() -String TestToolObj::GetMethodName( ULONG nMethodId ) +String TestToolObj::GetMethodName( sal_uLong nMethodId ) { - USHORT nElement; + sal_uInt16 nElement; if ( !Controls::pClasses ) // Ist static, wird also nur einmal geladen ReadFlatArray( Controls::arClasses, Controls::pClasses ); if ( Controls::pClasses ) @@ -4102,9 +4102,9 @@ String TestToolObj::GetMethodName( ULONG nMethodId ) return String(); } -String TestToolObj::GetKeyName( USHORT nKeyCode ) +String TestToolObj::GetKeyName( sal_uInt16 nKeyCode ) { - USHORT nElement; + sal_uInt16 nElement; if ( !CmdStream::pKeyCodes ) // Ist static, wird also nur einmal geladen ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes ); if ( CmdStream::pKeyCodes ) @@ -4132,36 +4132,36 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = xub_StrLen nGleich = STRING_NOTFOUND; xub_StrLen nEnd = STRING_NOTFOUND; xub_StrLen nStartPos = 0; - ULONG nNumber; + sal_uLong nNumber; String aType; String aResult; - BOOL bFound; + sal_Bool bFound; while ( (nStart = aText.Search(StartKenn,nStartPos)) != STRING_NOTFOUND && (nGleich = aText.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND && (nEnd = aText.Search(EndKenn,nGleich+1)) != STRING_NOTFOUND) { aType = aText.Copy(nStart,nGleich-nStart); - nNumber = (ULONG)aText.Copy(nGleich+1,nEnd-nGleich-1).ToInt64(); - bFound = FALSE; + nNumber = (sal_uLong)aText.Copy(nGleich+1,nEnd-nGleich-1).ToInt64(); + bFound = sal_False; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { // FIXME: HELPID aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); - bFound = TRUE; + bFound = sal_True; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) { - bFound = TRUE; + bFound = sal_True; aResult = GetMethodName( nNumber ); } if ( aType.CompareTo(RcKenn ) == COMPARE_EQUAL ) { - bFound = TRUE; + bFound = sal_True; if ( !pRCommands ) // Ist static, wird also nur einmal geladen ReadFlatArray( arR_Cmds, pRCommands ); - USHORT nElement; + sal_uInt16 nElement; if ( pRCommands ) { // FIXME: HELPID @@ -4179,11 +4179,11 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = } if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL ) { - bFound = TRUE; + bFound = sal_True; if ( !pRTypes ) // Ist static, wird also nur einmal geladen ReadFlatArray( arRes_Type, pRTypes ); - USHORT nElement; + sal_uInt16 nElement; if ( pRTypes ) { // FIXME: HELPID @@ -4203,15 +4203,15 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = { // FIXME: HELPID aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); - bFound = TRUE; + bFound = sal_True; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) { if ( nNumber > nStart ) - aResult.Fill( (USHORT)nNumber - nStart +1 ); + aResult.Fill( (sal_uInt16)nNumber - nStart +1 ); else aResult = CUniString(" "); - bFound = TRUE; + bFound = sal_True; } nStartPos = nStart; @@ -4227,7 +4227,7 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = } -SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) +SbTextType TestToolObj::GetSymbolType( const String &rSymbol, sal_Bool bWasControl ) { if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL || rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL @@ -4257,7 +4257,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) // Die Controls durchsuchen if ( m_pControls ) { - USHORT nWin; + sal_uInt16 nWin; for ( nWin = 0 ; nWin < m_pControls->Count() ; nWin++ ) { @@ -4306,8 +4306,8 @@ Controls::~Controls() void Controls::ChangeListener( SbxObject* parent ) { - EndListening( pMethodVar->GetBroadcaster(), TRUE ); - parent->StartListening( pMethodVar->GetBroadcaster(), TRUE ); + EndListening( pMethodVar->GetBroadcaster(), sal_True ); + parent->StartListening( pMethodVar->GetBroadcaster(), sal_True ); } void Controls::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, @@ -4329,13 +4329,13 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType) } - USHORT nElement; + sal_uInt16 nElement; ControlDef WhatName(aStr,rtl::OString()); if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement)) { pMethodVar->SetName(aStr); // FIXME: HELPID - ULONG nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum(); + sal_uLong nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum(); pMethodVar->nValue = nUId; pMethodVar->SetUserData( GetUserData() ); @@ -4354,7 +4354,7 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType) } -String TTFormat::ms2s( ULONG nMilliSeconds ) +String TTFormat::ms2s( sal_uLong nMilliSeconds ) { if ( nMilliSeconds < 100000 ) // 100 Sekunden return String::CreateFromInt64( nMilliSeconds ); diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index f62d59311024..c0dfd1c12ac6 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -120,24 +120,24 @@ public: ControlItem( const char *Name, rtl::OString aUIdP ); ControlItem( const String &Name, rtl::OString aUIdP ); // ControlItem( const String &Name, const String &URL, const URLType aType ); -// ControlItem( const String &Name, const String &URL, const ULONG nUId ); -// ControlItem( const char *Name, const String &URL, const ULONG nUId ); +// ControlItem( const String &Name, const String &URL, const sal_uLong nUId ); +// ControlItem( const char *Name, const String &URL, const sal_uLong nUId ); ControlItem( ControlData *pDataP ); virtual ~ControlItem() { DBG_DTOR(ControlItem,0); delete pData; } - virtual BOOL operator < (const ControlItem &rPar)=0; - virtual BOOL operator == (const ControlItem &rPar)=0; + virtual sal_Bool operator < (const ControlItem &rPar)=0; + virtual sal_Bool operator == (const ControlItem &rPar)=0; // void Write( SvStream &aStream ); }; SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) #define MK_SON_ACCESS( ClassName )\ - BOOL SonInsert( const ClassName *pNewEntry ) { const ControlItem *pItem = pNewEntry; return pSons->Insert( pItem ); }\ - BOOL SonSeek_Entry( const ClassName *pSearchEntry, USHORT *nRes = NULL) { return pSons->Seek_Entry( pSearchEntry, nRes ); }\ - ClassName* SonGetObject( USHORT nNr ) { return (ClassName*)pSons->GetObject( nNr ); } + sal_Bool SonInsert( const ClassName *pNewEntry ) { const ControlItem *pItem = pNewEntry; return pSons->Insert( pItem ); }\ + sal_Bool SonSeek_Entry( const ClassName *pSearchEntry, sal_uInt16 *nRes = NULL) { return pSons->Seek_Entry( pSearchEntry, nRes ); }\ + ClassName* SonGetObject( sal_uInt16 nNr ) { return (ClassName*)pSons->GetObject( nNr ); } class ControlSon { @@ -149,7 +149,7 @@ public: ~ControlSon(); // void Write( SvStream &aStream ); - USHORT Son_Count() { return pSons->Count(); } + sal_uInt16 Son_Count() { return pSons->Count(); } void Sons( CNames *pNewSons ) { pSons = pNewSons; } CNames*& GetSons() { return pSons; } }; @@ -161,8 +161,8 @@ public: : ControlItem( Name, aUIdP ) {} ControlItemSon(const String &Name, rtl::OString aUIdP ); // ControlItemSon(const String &Name, const String &URL, const URLType aType ); -// ControlItemSon(const String &Name, const String &URL, const ULONG nUId ); -// ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); +// ControlItemSon(const String &Name, const String &URL, const sal_uLong nUId ); +// ControlItemSon(const char *Name, const String &URL, const sal_uLong nUId ); // void Write( SvStream &aStream ); }; @@ -173,10 +173,10 @@ public: : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);} ControlDef(const String &Name, rtl::OString aUIdP ); // ControlDef(const String &Name, const String &URL, const URLType aType ); - ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); + ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, sal_Bool bWithSons = sal_False ); ~ControlDef() {DBG_DTOR(ControlDef,0);} - virtual BOOL operator < (const ControlItem &rPar); - virtual BOOL operator == (const ControlItem &rPar); + virtual sal_Bool operator < (const ControlItem &rPar); + virtual sal_Bool operator == (const ControlItem &rPar); void Write( SvStream &aStream ); MK_SON_ACCESS( ControlDef ) }; @@ -186,8 +186,8 @@ class ControlItemUId : public ControlItem public: ControlItemUId(String Name, rtl::OString aUIdP) : ControlItem( Name, aUIdP){} - virtual BOOL operator < (const ControlItem &rPar); - virtual BOOL operator == (const ControlItem &rPar); + virtual sal_Bool operator < (const ControlItem &rPar); + virtual sal_Bool operator == (const ControlItem &rPar); }; class ControlItemUIdSon : public ControlItemUId, public ControlSon @@ -200,17 +200,17 @@ public: class ReverseName : public ControlItemUId { public: - ULONG LastSequence; + sal_uLong LastSequence; - ReverseName(String Name, rtl::OString aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} + ReverseName(String Name, rtl::OString aUIdP, sal_uLong nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} }; class CRevNames: public CNames { public: - void Insert( String aName, rtl::OString aUId, ULONG nSeq ); + void Insert( String aName, rtl::OString aUId, sal_uLong nSeq ); String GetName( rtl::OString aUId ); - void Invalidate ( ULONG nSeq ); + void Invalidate ( sal_uLong nSeq ); }; @@ -218,7 +218,7 @@ class SbxTransportMethod: public SbxMethod { public: SbxTransportMethod( SbxDataType ); - ULONG nValue; + sal_uLong nValue; String aUnoSlot; }; SV_DECL_IMPL_REF(SbxTransportMethod); @@ -263,42 +263,42 @@ public: // Profiling Datenfelder - ULONG LocalStarttime; - USHORT nNumBorders; - ULONG naValBorders[4]; - ULONG naNumEntries[5]; - ULONG naRemoteTime[5]; - ULONG naLocalTime[5]; - - ULONG nMinRemoteCommandDelay; - ULONG nMaxRemoteCommandDelay; - BOOL bDoRemoteCommandDelay; - - BOOL bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting + sal_uLong LocalStarttime; + sal_uInt16 nNumBorders; + sal_uLong naValBorders[4]; + sal_uLong naNumEntries[5]; + sal_uLong naRemoteTime[5]; + sal_uLong naLocalTime[5]; + + sal_uLong nMinRemoteCommandDelay; + sal_uLong nMaxRemoteCommandDelay; + sal_Bool bDoRemoteCommandDelay; + + sal_Bool bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting SfxBroadcaster *pTTSfxBroadcaster; - ULONG nErrorCount; - ULONG nWarningCount; - ULONG nQAErrorCount; - ULONG nIncludeFileWarningCount; + sal_uLong nErrorCount; + sal_uLong nWarningCount; + sal_uLong nQAErrorCount; + sal_uLong nIncludeFileWarningCount; SbxDimArrayRef xErrorList; SbxDimArrayRef xWarningList; SbxDimArrayRef xQAErrorList; SbxDimArrayRef xIncludeFileWarningList; - BOOL bIsStart; // set tu TRUE while command Start is initiating the communication + sal_Bool bIsStart; // set tu sal_True while command Start is initiating the communication MyBasic* pMyBasic; String aTestCaseName; // holds name of current TestCase String aTestCaseFileName; // holds FileName of current TestCase - USHORT nTestCaseLineNr; // holds Line of current TestCase + sal_uInt16 nTestCaseLineNr; // holds Line of current TestCase - BOOL bEnableQaErrors; // include QA errors in report - BOOL bDebugFindNoErrors; // suppress generating errors when find of variables is called for variable viewing purposes + sal_Bool bEnableQaErrors; // include QA errors in report + sal_Bool bDebugFindNoErrors; // suppress generating errors when find of variables is called for variable viewing purposes - BOOL bStopOnSyntaxError; // catch syntax errors in testcases or not + sal_Bool bStopOnSyntaxError; // catch syntax errors in testcases or not Environment *pChildEnv; // Environment Variables for child Process @@ -309,7 +309,7 @@ public: class TTFormat { public: - static String ms2s( ULONG nMilliSeconds ); + static String ms2s( sal_uLong nMilliSeconds ); }; diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx index 97684cfba2cf..f3c338362529 100644 --- a/automation/source/testtool/tcommuni.cxx +++ b/automation/source/testtool/tcommuni.cxx @@ -44,7 +44,7 @@ #include <basic/testtool.hxx> CommunicationManagerClientViaSocketTT::CommunicationManagerClientViaSocketTT() -: CommunicationManagerClientViaSocket( TRUE ) +: CommunicationManagerClientViaSocket( sal_True ) , aAppPath() , aAppParams() , pProcess( NULL ) @@ -52,14 +52,14 @@ CommunicationManagerClientViaSocketTT::CommunicationManagerClientViaSocketTT() } -BOOL CommunicationManagerClientViaSocketTT::StartCommunication() +sal_Bool CommunicationManagerClientViaSocketTT::StartCommunication() { - bApplicationStarted = FALSE; + bApplicationStarted = sal_False; return CommunicationManagerClientViaSocket::StartCommunication( ByteString( GetHostConfig(), RTL_TEXTENCODING_UTF8 ), GetTTPortConfig() ); } -BOOL CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, String aParams, Environment *pChildEnv ) +sal_Bool CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, String aParams, Environment *pChildEnv ) { aAppPath = aApp; aAppParams = aParams; @@ -68,7 +68,7 @@ BOOL CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, Str } -BOOL CommunicationManagerClientViaSocketTT::RetryConnect() +sal_Bool CommunicationManagerClientViaSocketTT::RetryConnect() { if ( !bApplicationStarted ) { @@ -80,8 +80,8 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect() pProcess = new Process(); pProcess->SetImage( aAppPath, aAppParams, &aAppEnv ); - BOOL bSucc = pProcess->Start(); - bApplicationStarted = TRUE; + sal_Bool bSucc = pProcess->Start(); + bApplicationStarted = sal_True; if ( bSucc ) { @@ -91,7 +91,7 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect() } return bSucc; } - return FALSE; + return sal_False; } else { @@ -102,18 +102,18 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect() aWait.Start(); while ( aWait.IsActive() ) GetpApp()->Yield(); - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } } -BOOL CommunicationManagerClientViaSocketTT::KillApplication() +sal_Bool CommunicationManagerClientViaSocketTT::KillApplication() { if ( pProcess ) return pProcess->Terminate(); - return TRUE; + return sal_True; } #define GETSET(aVar, KeyName, Dafault) \ @@ -129,7 +129,7 @@ String GetHostConfig() { String aHostToTalk; - for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) + for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { if ( Application::GetCommandLineParam( i ).Copy(0,6).CompareIgnoreCaseToAscii("-host=") == COMPARE_EQUAL #ifndef UNX @@ -148,11 +148,11 @@ String GetHostConfig() } -ULONG GetTTPortConfig() +sal_uLong GetTTPortConfig() { String aPortToTalk; - for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) + for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { if ( Application::GetCommandLineParam( i ).Copy(0,6).CompareIgnoreCaseToAscii("-port=") == COMPARE_EQUAL #ifndef UNX @@ -161,7 +161,7 @@ ULONG GetTTPortConfig() ) { aPortToTalk = Application::GetCommandLineParam( i ).Copy(6); - return (ULONG)aPortToTalk.ToInt64(); + return (sal_uLong)aPortToTalk.ToInt64(); } } @@ -170,15 +170,15 @@ ULONG GetTTPortConfig() aConf.SetGroup("Communication"); GETSET( abPortToTalk, "TTPort", ByteString::CreateFromInt32( TESTTOOL_DEFAULT_PORT ) ); - return (ULONG)abPortToTalk.ToInt64(); + return (sal_uLong)abPortToTalk.ToInt64(); } -ULONG GetUnoPortConfig() +sal_uLong GetUnoPortConfig() { String aPortToTalk; - for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) + for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-unoport=") == COMPARE_EQUAL #ifndef UNX @@ -187,7 +187,7 @@ ULONG GetUnoPortConfig() ) { aPortToTalk = Application::GetCommandLineParam( i ).Copy(6); - return (ULONG)aPortToTalk.ToInt64(); + return (sal_uLong)aPortToTalk.ToInt64(); } } @@ -196,5 +196,5 @@ ULONG GetUnoPortConfig() aConf.SetGroup("Communication"); GETSET( abPortToTalk, "UnoPort", ByteString::CreateFromInt32( UNO_DEFAULT_PORT ) ); - return (ULONG)abPortToTalk.ToInt64(); + return (sal_uLong)abPortToTalk.ToInt64(); } diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx index 4374edfd7fc9..c3fec2f7b04d 100644 --- a/automation/source/testtool/tcommuni.hxx +++ b/automation/source/testtool/tcommuni.hxx @@ -45,14 +45,14 @@ public: CommunicationManagerClientViaSocketTT(); using CommunicationManagerClientViaSocket::StartCommunication; - virtual BOOL StartCommunication(); - virtual BOOL StartCommunication( String aApp, String aParams, Environment *pChildEnv ); + virtual sal_Bool StartCommunication(); + virtual sal_Bool StartCommunication( String aApp, String aParams, Environment *pChildEnv ); - BOOL KillApplication(); + sal_Bool KillApplication(); protected: - virtual BOOL RetryConnect(); - BOOL bApplicationStarted; + virtual sal_Bool RetryConnect(); + sal_Bool bApplicationStarted; Time aFirstRetryCall; String aAppPath; String aAppParams; @@ -62,6 +62,6 @@ protected: String GetHostConfig(); -ULONG GetTTPortConfig(); -ULONG GetUnoPortConfig(); +sal_uLong GetTTPortConfig(); +sal_uLong GetUnoPortConfig(); |