summaryrefslogtreecommitdiff
path: root/basic/inc
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-10 14:40:57 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-10 14:40:57 +0100
commit642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7 (patch)
treeb5b4029cf2c401a9907f3be73e88c1d0d617bd6d /basic/inc
parentf8431bc530cabfe39df3918b994269dded8d7f8c (diff)
removetooltypes01: #i112600# adjust basic and scaddins
Diffstat (limited to 'basic/inc')
-rw-r--r--basic/inc/basic/basicrt.hxx12
-rw-r--r--basic/inc/basic/basmgr.hxx64
-rw-r--r--basic/inc/basic/basrdll.hxx8
-rw-r--r--basic/inc/basic/mybasic.hxx14
-rw-r--r--basic/inc/basic/process.hxx16
-rw-r--r--basic/inc/basic/sberrors.hxx2
-rw-r--r--basic/inc/basic/sbmeth.hxx22
-rw-r--r--basic/inc/basic/sbmod.hxx62
-rw-r--r--basic/inc/basic/sbobjmod.hxx2
-rw-r--r--basic/inc/basic/sbprop.hxx2
-rw-r--r--basic/inc/basic/sbstar.hxx82
-rw-r--r--basic/inc/basic/sbstdobj.hxx60
-rw-r--r--basic/inc/basic/sbx.hxx102
-rw-r--r--basic/inc/basic/sbxcore.hxx104
-rw-r--r--basic/inc/basic/sbxdef.hxx32
-rw-r--r--basic/inc/basic/sbxfac.hxx8
-rw-r--r--basic/inc/basic/sbxform.hxx28
-rw-r--r--basic/inc/basic/sbxmeth.hxx2
-rw-r--r--basic/inc/basic/sbxmstrm.hxx2
-rw-r--r--basic/inc/basic/sbxobj.hxx22
-rw-r--r--basic/inc/basic/sbxvar.hxx226
-rw-r--r--basic/inc/basic/testtool.hxx14
-rw-r--r--basic/inc/basic/ttstrhlp.hxx16
23 files changed, 451 insertions, 451 deletions
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 6d50e1cddc07..7af0e0fe9db7 100644
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -44,8 +44,8 @@ public:
xub_StrLen GetLine();
xub_StrLen GetCol1();
xub_StrLen GetCol2();
- BOOL IsRun();
- BOOL IsValid() { return pRun != NULL; }
+ sal_Bool IsRun();
+ sal_Bool IsValid() { return pRun != NULL; }
BasicRuntime GetNextRuntime();
};
@@ -67,12 +67,12 @@ class BasicRuntimeAccess
public:
static BasicRuntime GetRuntime();
static bool HasRuntime();
- static USHORT GetStackEntryCount();
- static BasicErrorStackEntry GetStackEntry( USHORT nIndex );
- static BOOL HasStack();
+ static sal_uInt16 GetStackEntryCount();
+ static BasicErrorStackEntry GetStackEntry( sal_uInt16 nIndex );
+ static sal_Bool HasStack();
static void DeleteStack();
- static BOOL IsRunInit();
+ static sal_Bool IsRunInit();
};
#endif
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 5c62c347fbdd..da63da89ea81 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -68,21 +68,21 @@ class SotStorage;
class BasicError
{
private:
- ULONG nErrorId;
- USHORT nReason;
+ sal_uIntPtr nErrorId;
+ sal_uInt16 nReason;
String aErrStr;
public:
BasicError();
BasicError( const BasicError& rErr );
- BasicError( ULONG nId, USHORT nR, const String& rErrStr );
+ BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr );
- ULONG GetErrorId() const { return nErrorId; }
- USHORT GetReason() const { return nReason; }
+ sal_uIntPtr GetErrorId() const { return nErrorId; }
+ sal_uInt16 GetReason() const { return nReason; }
String GetErrorStr() { return aErrStr; }
- void SetErrorId( ULONG n ) { nErrorId = n; }
- void SetReason( USHORT n ) { nReason = n; }
+ void SetErrorId( sal_uIntPtr n ) { nErrorId = n; }
+ void SetReason( sal_uInt16 n ) { nReason = n; }
void SetErrorStr( const String& rStr) { aErrStr = rStr; }
};
@@ -146,33 +146,33 @@ private:
String aName;
String maStorageName;
- BOOL bBasMgrModified;
- BOOL mbDocMgr;
+ sal_Bool bBasMgrModified;
+ sal_Bool mbDocMgr;
BasicManagerImpl* mpImpl;
void Init();
protected:
- BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
- BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const;
+ sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
+ sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const String& rStorageName );
BasicLibInfo* CreateLibInfo();
- void LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadBasics = TRUE );
+ void LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadBasics = sal_True );
void LoadOldBasicManager( SotStorage& rStorage );
- BOOL ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
- BOOL ImplEncryptStream( SvStream& rStream ) const;
+ sal_Bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
+ sal_Bool ImplEncryptStream( SvStream& rStream ) const;
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
- void CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
- void SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
+ void CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
+ void SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const;
BasicManager(); // Nur zum anpassen von Pfaden bei 'Speichern unter'.
~BasicManager();
public:
TYPEINFO();
- BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
- BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
+ BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
+ BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
/** deletes the given BasicManager instance
@@ -189,12 +189,12 @@ public:
String GetName() const { return aName; }
- USHORT GetLibCount() const;
- StarBASIC* GetLib( USHORT nLib ) const;
+ sal_uInt16 GetLibCount() const;
+ StarBASIC* GetLib( sal_uInt16 nLib ) const;
StarBASIC* GetLib( const String& rName ) const;
- USHORT GetLibId( const String& rName ) const;
+ sal_uInt16 GetLibId( const String& rName ) const;
- String GetLibName( USHORT nLib );
+ String GetLibName( sal_uInt16 nLib );
/** announces the library containers which belong to this BasicManager
@@ -208,14 +208,14 @@ public:
const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
GetScriptLibraryContainer() const;
- BOOL LoadLib( USHORT nLib );
- BOOL RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage );
+ sal_Bool LoadLib( sal_uInt16 nLib );
+ sal_Bool RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
// Modify-Flag wird nur beim Speichern zurueckgesetzt.
- BOOL IsModified() const;
- BOOL IsBasicModified() const;
+ sal_Bool IsModified() const;
+ sal_Bool IsBasicModified() const;
- BOOL HasErrors();
+ sal_Bool HasErrors();
void ClearErrors();
BasicError* GetFirstError();
BasicError* GetNextError();
@@ -238,14 +238,14 @@ public:
bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
private:
- BOOL IsReference( USHORT nLib );
+ sal_Bool IsReference( sal_uInt16 nLib );
- BOOL SetLibName( USHORT nLib, const String& rName );
+ sal_Bool SetLibName( sal_uInt16 nLib, const String& rName );
StarBASIC* GetStdLib() const;
- StarBASIC* AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference );
- BOOL RemoveLib( USHORT nLib );
- BOOL HasLib( const String& rName ) const;
+ StarBASIC* AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference );
+ sal_Bool RemoveLib( sal_uInt16 nLib );
+ sal_Bool HasLib( const String& rName ) const;
StarBASIC* CreateLibForLibContainer( const String& rLibName,
const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >&
diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index aecf55c26a22..2265bd354ec4 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -38,8 +38,8 @@ private:
ResMgr* pSttResMgr;
ResMgr* pBasResMgr;
- BOOL bDebugMode;
- BOOL bBreakEnabled;
+ sal_Bool bDebugMode;
+ sal_Bool bBreakEnabled;
public:
BasicDLL();
@@ -50,8 +50,8 @@ public:
static void BasicBreak();
- static void EnableBreak( BOOL bEnable );
- static void SetDebugMode( BOOL bDebugMode );
+ static void EnableBreak( sal_Bool bEnable );
+ static void SetDebugMode( sal_Bool bDebugMode );
};
#define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) )
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index 02002f43cdd4..9522dbe7b997 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -36,10 +36,10 @@ class ErrorEntry;
class BasicError {
AppBasEd* pWin;
- USHORT nLine, nCol1, nCol2;
+ sal_uInt16 nLine, nCol1, nCol2;
String aText;
public:
- BasicError( AppBasEd*, USHORT, const String&, USHORT, USHORT, USHORT );
+ BasicError( AppBasEd*, sal_uInt16, const String&, sal_uInt16, sal_uInt16, sal_uInt16 );
void Show();
};
@@ -51,8 +51,8 @@ DECLARE_LIST( ErrorList, BasicError* )
class MyBasic : public StarBASIC
{
SbError nError;
- virtual BOOL ErrorHdl();
- virtual USHORT BreakHdl();
+ virtual sal_Bool ErrorHdl();
+ virtual sal_uInt16 BreakHdl();
protected:
Link GenLogHdl();
@@ -70,7 +70,7 @@ public:
ErrorList aErrors;
MyBasic();
virtual ~MyBasic();
- virtual BOOL Compile( SbModule* );
+ virtual sal_Bool Compile( SbModule* );
void Reset();
SbError GetErrors() { return nError; }
@@ -80,10 +80,10 @@ public:
virtual void LoadIniFile();
// Determines the extended symbol type for syntax highlighting
- virtual SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );
+ virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl );
virtual const String GetSpechialErrorText();
virtual void ReportRuntimeError( AppBasEd *pEditWin );
- virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors );
+ virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
static void SetCompileModule( SbModule *pMod );
static SbModule *GetCompileModule();
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 9a593322b896..e683bf527173 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -42,22 +42,22 @@ class Process
vos::OArgumentList *pArgumentList;
vos::OEnvironment *pEnvList;
vos::OProcess *pProcess;
- BOOL ImplIsRunning();
+ sal_Bool ImplIsRunning();
long ImplGetExitCode();
- BOOL bWasGPF;
- BOOL bHasBeenStarted;
+ sal_Bool bWasGPF;
+ sal_Bool bHasBeenStarted;
public:
Process();
~Process();
// Methoden
void SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv = NULL );
- BOOL Start();
- ULONG GetExitCode();
- BOOL IsRunning();
- BOOL WasGPF();
+ sal_Bool Start();
+ sal_uIntPtr GetExitCode();
+ sal_Bool IsRunning();
+ sal_Bool WasGPF();
- BOOL Terminate();
+ sal_Bool Terminate();
};
#endif
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index c34176e0bde7..4eeb28d43e32 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -31,7 +31,7 @@
#include <basic/sbxdef.hxx>
#ifndef __RSC
-typedef ULONG SbError;
+typedef sal_uIntPtr SbError;
#endif
// Mapping to SbxError
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 4e426ffe8552..fea6644db270 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -47,15 +47,15 @@ class SbMethod : public SbxMethod
SbMethodImpl* mpSbMethodImpl; // Impl data
SbModule* pMod;
- USHORT nDebugFlags;
- USHORT nLine1, nLine2;
- UINT32 nStart;
- BOOL bInvalid;
+ sal_uInt16 nDebugFlags;
+ sal_uInt16 nLine1, nLine2;
+ sal_uInt32 nStart;
+ sal_Bool bInvalid;
SbxArrayRef refStatics;
SbMethod( const String&, SbxDataType, SbModule* );
SbMethod( const SbMethod& );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbMethod();
public:
@@ -66,14 +66,14 @@ public:
SbxArray* GetStatics();
void ClearStatics();
SbModule* GetModule() { return pMod; }
- UINT32 GetId() const { return nStart; }
- USHORT GetDebugFlags() { return nDebugFlags; }
- void SetDebugFlags( USHORT n ) { nDebugFlags = n; }
- void GetLineRange( USHORT&, USHORT& );
+ sal_uInt32 GetId() const { return nStart; }
+ sal_uInt16 GetDebugFlags() { return nDebugFlags; }
+ void SetDebugFlags( sal_uInt16 n ) { nDebugFlags = n; }
+ void GetLineRange( sal_uInt16&, sal_uInt16& );
// Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
virtual ErrCode Call( SbxValue* pRet = NULL );
- virtual void Broadcast( ULONG nHintId );
+ virtual void Broadcast( sal_uIntPtr nHintId );
};
#ifndef __SB_SBMETHODREF_HXX
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index d6ee1d3eab0e..a0552cdf3d4b 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -40,7 +40,7 @@
class SbMethod;
class SbProperty;
class SbiRuntime;
-typedef std::deque< USHORT > SbiBreakpoints;
+typedef std::deque< sal_uInt16 > SbiBreakpoints;
class SbiImage;
class SbProcedureProperty;
class SbIfaceMapperMethod;
@@ -72,8 +72,8 @@ protected:
SbiImage* pImage; // the Image
SbiBreakpoints* pBreaks; // Breakpoints
SbClassData* pClassData;
- BOOL mbVBACompat;
- INT32 mnType;
+ sal_Bool mbVBACompat;
+ sal_Int32 mnType;
SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
bool bIsProxyModule;
@@ -83,19 +83,19 @@ protected:
SbProperty* GetProperty( const String&, SbxDataType );
SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType );
SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* );
- void EndDefinitions( BOOL=FALSE );
- USHORT Run( SbMethod* );
+ void EndDefinitions( sal_Bool=sal_False );
+ sal_uInt16 Run( SbMethod* );
void RunInit();
void ClearPrivateVars();
void ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
- void GlobalRunInit( BOOL bBasicStart ); // for all modules
+ void GlobalRunInit( sal_Bool bBasicStart ); // for all modules
void GlobalRunDeInit( void );
- const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const;
- const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT&,
- BOOL bFollowJumps, const SbiImage* pImg=NULL ) const;
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
- virtual BOOL LoadCompleted();
+ const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
+ const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
+ sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
+ virtual sal_Bool LoadCompleted();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -103,7 +103,7 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
TYPEINFO();
- SbModule( const String&, BOOL bCompat = FALSE );
+ SbModule( const String&, sal_Bool bCompat = sal_False );
virtual void SetParent( SbxObject* );
virtual void Clear();
@@ -116,33 +116,33 @@ public:
void SetSource32( const ::rtl::OUString& r );
void SetComment( const String& r );
- virtual BOOL Compile();
- BOOL Disassemble( String& rText );
- virtual BOOL IsCompiled() const;
+ virtual sal_Bool Compile();
+ sal_Bool Disassemble( String& rText );
+ virtual sal_Bool IsCompiled() const;
const SbxObject* FindType( String aTypeName ) const;
- virtual BOOL IsBreakable( USHORT nLine ) const;
+ virtual sal_Bool IsBreakable( sal_uInt16 nLine ) const;
virtual size_t GetBPCount() const;
- virtual USHORT GetBP( size_t n ) const;
- virtual BOOL IsBP( USHORT nLine ) const;
- virtual BOOL SetBP( USHORT nLine );
- virtual BOOL ClearBP( USHORT nLine );
+ virtual sal_uInt16 GetBP( size_t n ) const;
+ virtual sal_Bool IsBP( sal_uInt16 nLine ) const;
+ virtual sal_Bool SetBP( sal_uInt16 nLine );
+ virtual sal_Bool ClearBP( sal_uInt16 nLine );
virtual void ClearAllBP();
// Lines of Subs
- virtual SbMethod* GetFunctionForLine( USHORT );
+ virtual SbMethod* GetFunctionForLine( sal_uInt16 );
// Store only image, no source (needed for new password protection)
- BOOL StoreBinaryData( SvStream& );
- BOOL StoreBinaryData( SvStream&, USHORT nVer );
- BOOL LoadBinaryData( SvStream&, USHORT nVer );
- BOOL LoadBinaryData( SvStream& );
- BOOL ExceedsLegacyModuleSize();
+ sal_Bool StoreBinaryData( SvStream& );
+ sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
+ sal_Bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
+ sal_Bool LoadBinaryData( SvStream& );
+ sal_Bool ExceedsLegacyModuleSize();
void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
- BOOL IsVBACompat() const;
- void SetVBACompat( BOOL bCompat );
- INT32 GetModuleType() { return mnType; }
- void SetModuleType( INT32 nType ) { mnType = nType; }
+ sal_Bool IsVBACompat() const;
+ void SetVBACompat( sal_Bool bCompat );
+ sal_Int32 GetModuleType() { return mnType; }
+ void SetModuleType( sal_Int32 nType ) { mnType = nType; }
bool isProxyModule() { return bIsProxyModule; }
void AddVarName( const String& aName );
void RemoveVars();
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 49fefb79309e..f8c515b13108 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -117,7 +117,7 @@ public:
SbUserFormModuleInstance( SbUserFormModule* pParentModule, const String& rName,
const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
- virtual BOOL IsClass( const String& ) const;
+ virtual sal_Bool IsClass( const String& ) const;
virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
};
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index 60cd9e5353c0..88f6504bff76 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -39,7 +39,7 @@ class SbProperty : public SbxProperty
friend class SbModule;
friend class SbProcedureProperty;
SbModule* pMod;
- BOOL bInvalid;
+ sal_Bool bInvalid;
SbProperty( const String&, SbxDataType, SbModule* );
virtual ~SbProperty();
public:
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index db67836890e9..9eeee5f71d7c 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -67,13 +67,13 @@ class StarBASIC : public SbxObject
// Handler-Support:
Link aErrorHdl; // Error handler
Link aBreakHdl; // Breakpoint handler
- BOOL bNoRtl; // if TRUE: do not search RTL
- BOOL bBreak; // if TRUE: Break, otherwise Step
- BOOL bDocBasic;
- BOOL bVBAEnabled;
+ sal_Bool bNoRtl; // if sal_True: do not search RTL
+ sal_Bool bBreak; // if sal_True: Break, otherwise Step
+ sal_Bool bDocBasic;
+ sal_Bool bVBAEnabled;
BasicLibInfo* pLibInfo; // Info block for basic manager
SbLanguageMode eLanguageMode; // LanguageMode of the basic object
- BOOL bQuit;
+ sal_Bool bQuit;
SbxObjectRef pVBAGlobals;
SbxObject* getVBAGlobals( );
@@ -81,19 +81,19 @@ class StarBASIC : public SbxObject
void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
protected:
- BOOL CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_Bool CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
private:
- BOOL RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
- BOOL RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
- USHORT BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
- USHORT StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ sal_Bool RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_Bool RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_uInt16 BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ sal_uInt16 StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
protected:
- virtual BOOL ErrorHdl();
- virtual USHORT BreakHdl();
+ virtual sal_Bool ErrorHdl();
+ virtual sal_uInt16 BreakHdl();
virtual ~StarBASIC();
public:
@@ -101,11 +101,11 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
TYPEINFO();
- StarBASIC( StarBASIC* pParent = NULL, BOOL bIsDocBasic = FALSE );
+ StarBASIC( StarBASIC* pParent = NULL, sal_Bool bIsDocBasic = sal_False );
// #51727 SetModified overridden so that the Modfied-State is
// not delivered to Parent.
- virtual void SetModified( BOOL );
+ virtual void SetModified( sal_Bool );
void* operator new( size_t );
void operator delete( void* );
@@ -122,14 +122,14 @@ public:
SbModule* MakeModule( const String& rName, const String& rSrc );
SbModule* MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
SbModule* MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc );
- BOOL Compile( SbModule* );
- BOOL Disassemble( SbModule*, String& rText );
+ sal_Bool Compile( SbModule* );
+ sal_Bool Disassemble( SbModule*, String& rText );
static void Stop();
static void Error( SbError );
static void Error( SbError, const String& rMsg );
static void FatalError( SbError );
static void FatalError( SbError, const String& rMsg );
- static BOOL IsRunning();
+ static sal_Bool IsRunning();
static SbError GetErrBasic();
// #66536 make additional message accessible by RTL function Error
static String GetErrorMsg();
@@ -138,7 +138,7 @@ public:
void Highlight( const String& rSrc, SbTextPortions& rList );
virtual SbxVariable* Find( const String&, SbxClassType );
- virtual BOOL Call( const String&, SbxArray* = NULL );
+ virtual sal_Bool Call( const String&, SbxArray* = NULL );
SbxArray* GetModules() { return pModules; }
SbxObject* GetRtl() { return pRtl; }
@@ -147,26 +147,26 @@ public:
void InitAllModules( StarBASIC* pBasicNotToInit = NULL );
void DeInitAllModules( void );
void ClearAllModuleVars( void );
- void ActivateObject( const String*, BOOL );
- BOOL LoadOldModules( SvStream& );
+ void ActivateObject( const String*, sal_Bool );
+ sal_Bool LoadOldModules( SvStream& );
// #43011 For TestTool; deletes global vars
void ClearGlobalVars( void );
// Calls for error and break handler
- static USHORT GetLine();
- static USHORT GetCol1();
- static USHORT GetCol2();
- static void SetErrorData( SbError nCode, USHORT nLine,
- USHORT nCol1, USHORT nCol2 );
+ static sal_uInt16 GetLine();
+ static sal_uInt16 GetCol1();
+ static sal_uInt16 GetCol2();
+ static void SetErrorData( SbError nCode, sal_uInt16 nLine,
+ sal_uInt16 nCol1, sal_uInt16 nCol2 );
// Specific to error handler
static void MakeErrorText( SbError, const String& aMsg );
static const String& GetErrorText();
static SbError GetErrorCode();
- static BOOL IsCompilerError();
- static USHORT GetVBErrorCode( SbError nError );
- static SbError GetSfxFromVBError( USHORT nError );
+ static sal_Bool IsCompilerError();
+ static sal_uInt16 GetVBErrorCode( SbError nError );
+ static SbError GetSfxFromVBError( sal_uInt16 nError );
static void SetGlobalLanguageMode( SbLanguageMode eLangMode );
static SbLanguageMode GetGlobalLanguageMode();
// Local settings
@@ -175,7 +175,7 @@ public:
SbLanguageMode GetLanguageMode();
// Specific for break handler
- BOOL IsBreak() const { return bBreak; }
+ sal_Bool IsBreak() const { return bBreak; }
static Link GetGlobalErrorHdl();
static void SetGlobalErrorHdl( const Link& rNewHdl );
@@ -191,24 +191,24 @@ public:
static SbxBase* FindSBXInCurrentScope( const String& rName );
static SbxVariable* FindVarInCurrentScopy
- ( const String& rName, USHORT& rStatus );
- static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
+ ( const String& rName, sal_uInt16& rStatus );
+ static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 );
static SbModule* GetActiveModule();
- void SetVBAEnabled( BOOL bEnabled );
- BOOL isVBAEnabled();
+ void SetVBAEnabled( sal_Bool bEnabled );
+ sal_Bool isVBAEnabled();
- // #60175 TRUE: SFX-Resource is not displayed on basic errors
- static void StaticSuppressSfxResource( BOOL bSuppress );
+ // #60175 sal_True: SFX-Resource is not displayed on basic errors
+ static void StaticSuppressSfxResource( sal_Bool bSuppress );
- // #91147 TRUE: Reschedule is enabled (default>, FALSE: No reschedule
- static void StaticEnableReschedule( BOOL bReschedule );
+ // #91147 sal_True: Reschedule is enabled (default>, sal_False: No reschedule
+ static void StaticEnableReschedule( sal_Bool bReschedule );
SbxObjectRef getRTL( void ) { return pRtl; }
- BOOL IsDocBasic() { return bDocBasic; }
+ sal_Bool IsDocBasic() { return bDocBasic; }
SbxVariable* VBAFind( const String& rName, SbxClassType t );
bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
void QuitAndExitApplication();
- BOOL IsQuitApplication() { return bQuit; };
+ sal_Bool IsQuitApplication() { return bQuit; };
static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
GetModelFromBasic( SbxObject* pBasic );
diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index 5cc76c8bd9c3..b1c061161896 100644
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -59,9 +59,9 @@ protected:
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void PropType( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropWidth( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropHeight( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
public:
TYPEINFO();
@@ -79,23 +79,23 @@ public:
class SbStdFont : public SbxObject
{
protected:
- BOOL bBold;
- BOOL bItalic;
- BOOL bStrikeThrough;
- BOOL bUnderline;
- USHORT nSize;
+ sal_Bool bBold;
+ sal_Bool bItalic;
+ sal_Bool bStrikeThrough;
+ sal_Bool bUnderline;
+ sal_uInt16 nSize;
String aName;
~SbStdFont();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void PropBold( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropItalic( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropUnderline( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropSize( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropUnderline( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropSize( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
public:
TYPEINFO();
@@ -103,16 +103,16 @@ public:
SbStdFont();
virtual SbxVariable* Find( const String&, SbxClassType );
- void SetBold( BOOL bB ) { bBold = bB; }
- BOOL IsBold() const { return bBold; }
- void SetItalic( BOOL bI ) { bItalic = bI; }
- BOOL IsItalic() const { return bItalic; }
- void SetStrikeThrough( BOOL bS ) { bStrikeThrough = bS; }
- BOOL IsStrikeThrough() const { return bStrikeThrough; }
- void SetUnderline( BOOL bU ) { bUnderline = bU; }
- BOOL IsUnderline() const { return bUnderline; }
- void SetSize( USHORT nS ) { nSize = nS; }
- USHORT GetSize() const { return nSize; }
+ void SetBold( sal_Bool bB ) { bBold = bB; }
+ sal_Bool IsBold() const { return bBold; }
+ void SetItalic( sal_Bool bI ) { bItalic = bI; }
+ sal_Bool IsItalic() const { return bItalic; }
+ void SetStrikeThrough( sal_Bool bS ) { bStrikeThrough = bS; }
+ sal_Bool IsStrikeThrough() const { return bStrikeThrough; }
+ void SetUnderline( sal_Bool bU ) { bUnderline = bU; }
+ sal_Bool IsUnderline() const { return bUnderline; }
+ void SetSize( sal_uInt16 nS ) { nSize = nS; }
+ sal_uInt16 GetSize() const { return nSize; }
void SetFontName( const String& rName ) { aName = rName; }
String GetFontName() const { return aName; }
};
@@ -128,12 +128,12 @@ protected:
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void MethClear( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
+ void MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
public:
TYPEINFO();
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 2eb194708739..7f0681ccce6c 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -72,9 +72,9 @@ struct SbxParamInfo
const String aName; // Name of the parameter
SbxBaseRef aTypeRef; // Object, if object type
SbxDataType eType; // Data type
- UINT16 nFlags; // Flag-Bits
- UINT32 nUserData; // IDs etc.
- SbxParamInfo( const String& s, SbxDataType t, USHORT n, SbxBase* b = NULL )
+ sal_uInt16 nFlags; // Flag-Bits
+ sal_uInt32 nUserData; // IDs etc.
+ SbxParamInfo( const String& s, SbxDataType t, sal_uInt16 n, SbxBase* b = NULL )
: aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
~SbxParamInfo() {}
};
@@ -97,27 +97,27 @@ class SbxInfo : public SvRefBase
String aComment;
String aHelpFile;
- UINT32 nHelpId;
+ sal_uInt32 nHelpId;
SbxParams aParams;
protected:
- BOOL LoadData( SvStream&, USHORT );
- BOOL StoreData( SvStream& ) const;
+ sal_Bool LoadData( SvStream&, sal_uInt16 );
+ sal_Bool StoreData( SvStream& ) const;
virtual ~SbxInfo();
public:
SbxInfo();
- SbxInfo( const String&, UINT32 );
+ SbxInfo( const String&, sal_uInt32 );
- void AddParam( const String&, SbxDataType, USHORT=SBX_READ );
+ void AddParam( const String&, SbxDataType, sal_uInt16=SBX_READ );
void AddParam( const SbxParamInfo& );
- const SbxParamInfo* GetParam( USHORT n ) const; // index starts with 1!
+ const SbxParamInfo* GetParam( sal_uInt16 n ) const; // index starts with 1!
const String& GetComment() const { return aComment; }
const String& GetHelpFile() const { return aHelpFile; }
- UINT32 GetHelpId() const { return nHelpId; }
+ sal_uInt32 GetHelpId() const { return nHelpId; }
void SetComment( const String& r ) { aComment = r; }
void SetHelpFile( const String& r ) { aHelpFile = r; }
- void SetHelpId( UINT32 nId ) { nHelpId = nId; }
+ void SetHelpId( sal_uInt32 nId ) { nHelpId = nId; }
};
#endif
@@ -130,7 +130,7 @@ class SbxHint : public SfxSimpleHint
SbxVariable* pVar;
public:
TYPEINFO();
- SbxHint( ULONG n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
+ SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
SbxVariable* GetVar() const { return pVar; }
};
@@ -144,7 +144,7 @@ class SbxAlias : public SbxVariable, public SfxListener
{
SbxVariableRef xAlias;
virtual ~SbxAlias();
- virtual void Broadcast( ULONG );
+ virtual void Broadcast( sal_uIntPtr );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
public:
@@ -173,7 +173,7 @@ class SbxArray : public SbxBase
friend class SbMethod;
friend class SbClassModuleObject;
friend SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
- void PutDirect( SbxVariable* pVar, UINT32 nIdx );
+ void PutDirect( SbxVariable* pVar, sal_uInt32 nIdx );
SbxArrayImpl* mpSbxArrayImpl; // Impl data
SbxVarRefs* pData; // The variables
@@ -181,8 +181,8 @@ class SbxArray : public SbxBase
protected:
SbxDataType eType; // Data type of the array
virtual ~SbxArray();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
@@ -191,28 +191,28 @@ public:
SbxArray( const SbxArray& );
SbxArray& operator=( const SbxArray& );
virtual void Clear();
- USHORT Count() const;
+ sal_uInt16 Count() const;
virtual SbxDataType GetType() const;
virtual SbxClassType GetClass() const;
- SbxVariableRef& GetRef( USHORT );
- SbxVariable* Get( USHORT );
- void Put( SbxVariable*, USHORT );
- void Insert( SbxVariable*, USHORT );
- void Remove( USHORT );
+ SbxVariableRef& GetRef( sal_uInt16 );
+ SbxVariable* Get( sal_uInt16 );
+ void Put( SbxVariable*, sal_uInt16 );
+ void Insert( SbxVariable*, sal_uInt16 );
+ void Remove( sal_uInt16 );
void Remove( SbxVariable* );
void Merge( SbxArray* );
- const String& GetAlias( USHORT );
- void PutAlias( const String&, USHORT );
- SbxVariable* FindUserData( UINT32 nUserData );
+ const String& GetAlias( sal_uInt16 );
+ void PutAlias( const String&, sal_uInt16 );
+ SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
// Additional methods for 32-bit indices
- UINT32 Count32() const;
- SbxVariableRef& GetRef32( UINT32 );
- SbxVariable* Get32( UINT32 );
- void Put32( SbxVariable*, UINT32 );
- void Insert32( SbxVariable*, UINT32 );
- void Remove32( UINT32 );
+ sal_uInt32 Count32() const;
+ SbxVariableRef& GetRef32( sal_uInt32 );
+ SbxVariable* Get32( sal_uInt32 );
+ void Put32( SbxVariable*, sal_uInt32 );
+ void Insert32( SbxVariable*, sal_uInt32 );
+ void Remove32( sal_uInt32 );
};
#endif
@@ -231,15 +231,15 @@ class SbxDimArray : public SbxArray
SbxDim* pFirst, *pLast; // Links to Dimension table
short nDim; // Number of dimensions
- void AddDimImpl32( INT32, INT32, BOOL bAllowSize0 );
+ void AddDimImpl32( sal_Int32, sal_Int32, sal_Bool bAllowSize0 );
bool mbHasFixedSize;
protected:
- USHORT Offset( const short* );
- UINT32 Offset32( const INT32* );
- USHORT Offset( SbxArray* );
- UINT32 Offset32( SbxArray* );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ sal_uInt16 Offset( const short* );
+ sal_uInt32 Offset32( const sal_Int32* );
+ sal_uInt16 Offset( SbxArray* );
+ sal_uInt32 Offset32( SbxArray* );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbxDimArray();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
@@ -261,17 +261,17 @@ public:
short GetDims() const { return nDim; }
void AddDim( short, short );
void unoAddDim( short, short );
- BOOL GetDim( short, short&, short& ) const;
+ sal_Bool GetDim( short, short&, short& ) const;
using SbxArray::GetRef32;
- SbxVariableRef& GetRef32( const INT32* );
+ SbxVariableRef& GetRef32( const sal_Int32* );
using SbxArray::Get32;
- SbxVariable* Get32( const INT32* );
+ SbxVariable* Get32( const sal_Int32* );
using SbxArray::Put32;
- void Put32( SbxVariable*, const INT32* );
- void AddDim32( INT32, INT32 );
- void unoAddDim32( INT32, INT32 );
- BOOL GetDim32( INT32, INT32&, INT32& ) const;
+ void Put32( SbxVariable*, const sal_Int32* );
+ void AddDim32( sal_Int32, sal_Int32 );
+ void unoAddDim32( sal_Int32, sal_Int32 );
+ sal_Bool GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const;
bool hasFixedSize() { return mbHasFixedSize; };
void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
};
@@ -286,7 +286,7 @@ class SbxCollection : public SbxObject
void Initialize();
protected:
virtual ~SbxCollection();
- virtual BOOL LoadData( SvStream&, USHORT );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
// Overridable methods (why not pure virtual?):
@@ -300,7 +300,7 @@ public:
SbxCollection( const String& rClassname );
SbxCollection( const SbxCollection& );
SbxCollection& operator=( const SbxCollection& );
- virtual SbxVariable* FindUserData( UINT32 nUserData );
+ virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
virtual void Clear();
};
@@ -314,17 +314,17 @@ class SbxStdCollection : public SbxCollection
{
protected:
String aElemClass;
- BOOL bAddRemoveOk;
+ sal_Bool bAddRemoveOk;
virtual ~SbxStdCollection();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual void CollAdd( SbxArray* pPar );
virtual void CollRemove( SbxArray* pPar );
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
TYPEINFO();
SbxStdCollection
- ( const String& rClassname, const String& rElemClass, BOOL=TRUE );
+ ( const String& rClassname, const String& rElemClass, sal_Bool=sal_True );
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
virtual void Insert( SbxVariable* );
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 83e474521cc2..b4e80a49f168 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -45,30 +45,30 @@ class UniString;
// This version of the Macros does not define Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) \
- virtual UINT32 GetCreator() const { return nCre; } \
- virtual UINT16 GetVersion() const { return nVer; } \
- virtual UINT16 GetSbxId() const { return nSbxId; }
+ virtual sal_uInt32 GetCreator() const { return nCre; } \
+ virtual sal_uInt16 GetVersion() const { return nVer; } \
+ virtual sal_uInt16 GetSbxId() const { return nSbxId; }
#define SBX_DECL_PERSIST_NODATA_() \
- virtual UINT32 GetCreator() const; \
- virtual UINT16 GetVersion() const; \
- virtual UINT16 GetSbxId() const;
+ virtual sal_uInt32 GetCreator() const; \
+ virtual sal_uInt16 GetVersion() const; \
+ virtual sal_uInt16 GetSbxId() const;
// This version of the macro defines Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
#define SBX_DECL_PERSIST_() \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA_()
#define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer ) \
- UINT32 C::GetCreator() const { return nCre; } \
- UINT16 C::GetVersion() const { return nVer; } \
- UINT16 C::GetSbxId() const { return nSbxId; }
+ sal_uInt32 C::GetCreator() const { return nCre; } \
+ sal_uInt16 C::GetVersion() const { return nVer; } \
+ sal_uInt16 C::GetSbxId() const { return nSbxId; }
class SbxBase;
class SbxFactory;
@@ -82,10 +82,10 @@ class SbxBase : virtual public SvRefBase
{
SbxBaseImpl* mpSbxBaseImpl; // Impl data
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
protected:
- USHORT nFlags; // Flag-Bits
+ sal_uInt16 nFlags; // Flag-Bits
SbxBase();
SbxBase( const SbxBase& );
@@ -94,21 +94,21 @@ protected:
SBX_DECL_PERSIST(0,0,0);
public:
TYPEINFO();
- inline void SetFlags( USHORT n );
- inline USHORT GetFlags() const;
- inline void SetFlag( USHORT n );
- inline void ResetFlag( USHORT n );
- inline BOOL IsSet( USHORT n ) const;
- inline BOOL IsReset( USHORT n ) const;
- inline BOOL CanRead() const;
- inline BOOL CanWrite() const;
- inline BOOL IsModified() const;
- inline BOOL IsConst() const;
- inline BOOL IsHidden() const;
- inline BOOL IsVisible() const;
-
- virtual BOOL IsFixed() const;
- virtual void SetModified( BOOL );
+ inline void SetFlags( sal_uInt16 n );
+ inline sal_uInt16 GetFlags() const;
+ inline void SetFlag( sal_uInt16 n );
+ inline void ResetFlag( sal_uInt16 n );
+ inline sal_Bool IsSet( sal_uInt16 n ) const;
+ inline sal_Bool IsReset( sal_uInt16 n ) const;
+ inline sal_Bool CanRead() const;
+ inline sal_Bool CanWrite() const;
+ inline sal_Bool IsModified() const;
+ inline sal_Bool IsConst() const;
+ inline sal_Bool IsHidden() const;
+ inline sal_Bool IsVisible() const;
+
+ virtual sal_Bool IsFixed() const;
+ virtual void SetModified( sal_Bool );
virtual SbxDataType GetType() const;
virtual SbxClassType GetClass() const;
@@ -117,24 +117,24 @@ public:
static SbxBase* Load( SvStream& );
static void Skip( SvStream& );
- BOOL Store( SvStream& );
- virtual BOOL LoadCompleted();
- virtual BOOL StoreCompleted();
+ sal_Bool Store( SvStream& );
+ virtual sal_Bool LoadCompleted();
+ virtual sal_Bool StoreCompleted();
static SbxError GetError();
static void SetError( SbxError );
- static BOOL IsError();
+ static sal_Bool IsError();
static void ResetError();
// Set the factory for Load/Store/Create
static void AddFactory( SbxFactory* );
static void RemoveFactory( SbxFactory* );
- static SbxBase* Create( UINT16, UINT32=SBXCR_SBX );
+ static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
static SbxObject* CreateObject( const String& );
// Sbx solution as replacement for SfxBroadcaster::Enable()
- static void StaticEnableBroadcasting( BOOL bEnable );
- static BOOL StaticIsEnabledBroadcasting( void );
+ static void StaticEnableBroadcasting( sal_Bool bEnable );
+ static sal_Bool StaticIsEnabledBroadcasting( void );
};
#ifndef SBX_BASE_DECL_DEFINED
@@ -142,40 +142,40 @@ public:
SV_DECL_REF(SbxBase)
#endif
-inline void SbxBase::SetFlags( USHORT n )
+inline void SbxBase::SetFlags( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
-inline USHORT SbxBase::GetFlags() const
+inline sal_uInt16 SbxBase::GetFlags() const
{ DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
-inline void SbxBase::SetFlag( USHORT n )
+inline void SbxBase::SetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
-inline void SbxBase::ResetFlag( USHORT n )
+inline void SbxBase::ResetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
-inline BOOL SbxBase::IsSet( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) != 0 ); }
+inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
-inline BOOL SbxBase::IsReset( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) == 0 ); }
+inline sal_Bool SbxBase::IsReset( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) == 0 ); }
-inline BOOL SbxBase::CanRead() const
+inline sal_Bool SbxBase::CanRead() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
-inline BOOL SbxBase::CanWrite() const
+inline sal_Bool SbxBase::CanWrite() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
-inline BOOL SbxBase::IsModified() const
+inline sal_Bool SbxBase::IsModified() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
-inline BOOL SbxBase::IsConst() const
+inline sal_Bool SbxBase::IsConst() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
-inline BOOL SbxBase::IsHidden() const
+inline sal_Bool SbxBase::IsHidden() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
-inline BOOL SbxBase::IsVisible() const
+inline sal_Bool SbxBase::IsVisible() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
#endif
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index b85b3552c79e..6dc9fe1d8d66 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -57,23 +57,23 @@ enum SbxClassType { // SBX-class-IDs (order is important!)
enum SbxDataType {
SbxEMPTY = 0, // * Uninitialized
SbxNULL = 1, // * Contains no valid data
- SbxINTEGER = 2, // * Integer (INT16)
- SbxLONG = 3, // * Long integer (INT32)
+ SbxINTEGER = 2, // * Integer (sal_Int16)
+ SbxLONG = 3, // * Long integer (sal_Int32)
SbxSINGLE = 4, // * Single-precision floating point number (float)
SbxDOUBLE = 5, // * Double-precision floating point number (double)
- SbxCURRENCY = 6, // Currency (INT64)
+ SbxCURRENCY = 6, // Currency (sal_Int64)
SbxDATE = 7, // * Date (double)
SbxSTRING = 8, // * String (StarView)
SbxOBJECT = 9, // * SbxBase object pointer
- SbxERROR = 10, // * Error (UINT16)
+ SbxERROR = 10, // * Error (sal_uInt16)
SbxBOOL = 11, // * Boolean (0 or -1)
SbxVARIANT = 12, // * Anzeige fuer varianten Datentyp
SbxDATAOBJECT = 13, // * Common data object w/o ref count
SbxCHAR = 16, // * signed char
SbxBYTE = 17, // * unsigned char
- SbxUSHORT = 18, // * unsigned short (UINT16)
- SbxULONG = 19, // * unsigned long (UINT32)
+ SbxUSHORT = 18, // * unsigned short (sal_uInt16)
+ SbxULONG = 19, // * unsigned long (sal_uInt32)
SbxLONG64 = 20, // signed 64-bit int
SbxULONG64 = 21, // unsigned 64-bit int
SbxINT = 22, // * signed machine-dependent int
@@ -105,9 +105,9 @@ enum SbxDataType {
SbxUSERn = 2047 // last user defined data type
};
-const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
-const UINT32 SBX_TYPE_DIM_AS_NEW_FLAG = 0x20000;
-const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible
+const sal_uInt32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const sal_uInt32 SBX_TYPE_DIM_AS_NEW_FLAG = 0x20000;
+const sal_uInt32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible
#endif
@@ -123,8 +123,8 @@ enum SbxOperator {
SbxPLUS, // this + var
SbxMINUS, // this - var
SbxNEG, // -this (var is ignored)
- SbxIDIV, // this / var (both operands max. INT32!)
- // Boolean operators (max INT32!):
+ SbxIDIV, // this / var (both operands max. sal_Int32!)
+ // Boolean operators (max sal_Int32!):
SbxAND, // this & var
SbxOR, // this | var
SbxXOR, // this ^ var
@@ -157,7 +157,7 @@ enum SbxNameType { // Type of the questioned name of a variable
#endif
// AB: 20.3.96: New error messages
-typedef ULONG SbxError; // Preserve old type
+typedef sal_uIntPtr SbxError; // Preserve old type
#endif
// von #ifndef __RSC
@@ -356,10 +356,10 @@ enum SbxError { // Ergebnis einer Rechenoperation/Konversion
#define SbxMAXBYTE ( 255)
#define SbxMAXINT ( 32767)
#define SbxMININT (-32768)
-#define SbxMAXUINT ((UINT16) 65535)
+#define SbxMAXUINT ((sal_uInt16) 65535)
#define SbxMAXLNG ( 2147483647)
-#define SbxMINLNG ((INT32)(-2147483647-1))
-#define SbxMAXULNG ((UINT32) 0xffffffff)
+#define SbxMINLNG ((sal_Int32)(-2147483647-1))
+#define SbxMAXULNG ((sal_uInt32) 0xffffffff)
#define SbxMAXSALINT64 SAL_MAX_INT64
#define SbxMINSALINT64 SAL_MIN_INT64
@@ -379,7 +379,7 @@ enum SbxError { // Ergebnis einer Rechenoperation/Konversion
#define SBX_MAXINDEX 0x3FF0
#define SBX_MAXINDEX32 SbxMAXLNG
-// The numeric values of TRUE and FALSE
+// The numeric values of sal_True and FALSE
enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 };
#endif // __RSC
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index f72cebd8d979..372785657266 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -37,11 +37,11 @@ class UniString;
class SbxFactory
{
- BOOL bHandleLast; // TRUE: Factory is asked at last because of its expensiveness
+ sal_Bool bHandleLast; // sal_True: Factory is asked at last because of its expensiveness
public:
- SbxFactory( BOOL bLast=FALSE ) { bHandleLast = bLast; }
- BOOL IsHandleLast( void ) { return bHandleLast; }
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ SbxFactory( sal_Bool bLast=sal_False ) { bHandleLast = bLast; }
+ sal_Bool IsHandleLast( void ) { return bHandleLast; }
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 0e8ab2466271..9f31e3529d04 100644
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -111,16 +111,16 @@ class SbxBasicFormater {
String BasicFormat( double dNumber, String sFormatStrg );
String BasicFormatNull( String sFormatStrg );
- static BOOL isBasicFormat( String sFormatStrg );
+ static sal_Bool isBasicFormat( String sFormatStrg );
private:
//*** some helper methods ***
//void ShowError( char *sErrMsg );
- inline void ShiftString( String& sStrg, USHORT nStartPos );
+ inline void ShiftString( String& sStrg, sal_uInt16 nStartPos );
inline void StrAppendChar( String& sStrg, sal_Unicode ch );
void AppendDigit( String& sStrg, short nDigit );
void LeftShiftDecimalPoint( String& sStrg );
- void StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow );
+ void StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow );
void StrRoundDigit( String& sStrg, short nPos );
void ParseBack( String& sStrg, const String& sFormatStrg,
short nFormatPos );
@@ -128,30 +128,30 @@ class SbxBasicFormater {
// Methods for string conversion with sprintf():
void InitScan( double _dNum );
void InitExp( double _dNewExp );
- short GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit );
+ short GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit );
short GetDigitAtPosExpScan( double dNewExponent, short nPos,
- BOOL& bFoundFirstDigit );
- short GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit );
+ sal_Bool& bFoundFirstDigit );
+ short GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit );
#else
// Methods for direct 'calculation' with log10() and pow():
short GetDigitAtPos( double dNumber, short nPos, double& dNextNumber,
- BOOL& bFoundFirstDigit );
+ sal_Bool& bFoundFirstDigit );
short RoundDigit( double dNumber );
#endif
- String GetPosFormatString( const String& sFormatStrg, BOOL & bFound );
- String GetNegFormatString( const String& sFormatStrg, BOOL & bFound );
- String Get0FormatString( const String& sFormatStrg, BOOL & bFound );
- String GetNullFormatString( const String& sFormatStrg, BOOL & bFound );
+ String GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String Get0FormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound );
short AnalyseFormatString( const String& sFormatStrg,
short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,
short& nNoOfOptionalExponentDigits,
- BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
- BOOL& bGenerateThousandSeparator,
+ sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+ sal_Bool& bGenerateThousandSeparator,
short& nMultipleThousandSeparators );
void ScanFormatString( double dNumber, const String& sFormatStrg,
- String& sReturnStrg, BOOL bCreateSign );
+ String& sReturnStrg, sal_Bool bCreateSign );
//*** Data ***
sal_Unicode cDecPoint; // sign for the decimal point
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 5cc9af6f877a..1f812cdb6260 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -44,7 +44,7 @@ public:
SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
SbxMethod& operator=( const SbxMethod& r )
{ SbxVariable::operator=( r ); return *this; }
- BOOL Run( SbxValues* pValues = NULL );
+ sal_Bool Run( SbxValues* pValues = NULL );
virtual SbxClassType GetClass() const;
};
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index ebd6a2b93484..c382269f6903 100644
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -37,7 +37,7 @@ SV_DECL_REF(SbxMemoryStream)
class SbxMemoryStream : public SbxBase, public SvMemoryStream
{
public:
- SbxMemoryStream(ULONG nInitSize_=512, ULONG nResize_=64) :
+ SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
SvMemoryStream(nInitSize_,nResize_) {}
~SbxMemoryStream();
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index a1ed962502cd..8b973eee59cb 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -42,9 +42,9 @@ class SbxObject : public SbxVariable, public SfxListener
{
SbxObjectImpl* mpSbxObjectImpl; // Impl data
- SbxArray* FindVar( SbxVariable*, USHORT& );
+ SbxArray* FindVar( SbxVariable*, sal_uInt16& );
// AB 23.3.1997, special method for VCPtrRemove (see below)
- SbxArray* VCPtrFindVar( SbxVariable*, USHORT& );
+ SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
protected:
SbxArrayRef pMethods; // Methods
SbxArrayRef pProps; // Properties
@@ -52,8 +52,8 @@ protected:
SbxProperty* pDfltProp; // Default-Property
String aClassName; // Classname
String aDfltPropName;
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbxObject();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
@@ -67,7 +67,7 @@ public:
virtual SbxClassType GetClass() const;
virtual void Clear();
- virtual BOOL IsClass( const String& ) const;
+ virtual sal_Bool IsClass( const String& ) const;
const String& GetClassName() const { return aClassName; }
void SetClassName( const String &rNew ) { aClassName = rNew; }
// Default-Property
@@ -75,15 +75,15 @@ public:
void SetDfltProperty( const String& r );
void SetDfltProperty( SbxProperty* );
// Search for an element
- virtual SbxVariable* FindUserData( UINT32 nUserData );
+ virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
SbxVariable* FindQualified( const String&, SbxClassType );
// Quick-Call-Interface for Methods
- virtual BOOL Call( const String&, SbxArray* = NULL );
+ virtual sal_Bool Call( const String&, SbxArray* = NULL );
// Execution of DDE-Commands
SbxVariable* Execute( const String& );
// Manage elements
- virtual BOOL GetAll( SbxClassType ) { return TRUE; }
+ virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
SbxVariable* Make( const String&, SbxClassType, SbxDataType );
virtual SbxObject* MakeObject( const String&, const String& );
virtual void Insert( SbxVariable* );
@@ -96,7 +96,7 @@ public:
virtual void Remove( SbxVariable* );
// AB 23.3.1997, deletion per pointer for controls (duplicate names!)
void VCPtrRemove( SbxVariable* );
- void SetPos( SbxVariable*, USHORT );
+ void SetPos( SbxVariable*, sal_uInt16 );
// Macro-Recording
virtual String GenerateSource( const String &rLinePrefix,
@@ -108,9 +108,9 @@ public:
// Hooks
virtual SvDispatch* GetSvDispatch();
// Debugging
- void Dump( SvStream&, BOOL bDumpAll=FALSE );
+ void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
- static void GarbageCollection( ULONG nObjects = 0 /* ::= all */ );
+ static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
};
#ifndef __SBX_SBXOBJECTREF_HXX
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 1ba1b5d1edfa..5a2fc4601586 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -38,17 +38,17 @@
struct SbxINT64
{
- INT32 nHigh; UINT32 nLow;
+ sal_Int32 nHigh; sal_uInt32 nLow;
#if FALSE
SbxINT64() : nHigh( 0 ), nLow( 0 ) {}
- SbxINT64( UINT8 n ) : nHigh( 0 ), nLow( n ) {}
- SbxINT64( UINT16 n ) : nHigh( 0 ), nLow( n ) {}
- SbxINT64( UINT32 n ) : nHigh( 0 ), nLow( n ) {}
+ SbxINT64( sal_uInt8 n ) : nHigh( 0 ), nLow( n ) {}
+ SbxINT64( sal_uInt16 n ) : nHigh( 0 ), nLow( n ) {}
+ SbxINT64( sal_uInt32 n ) : nHigh( 0 ), nLow( n ) {}
SbxINT64( unsigned int n ) : nHigh( 0 ), nLow( n ) {}
- SbxINT64( INT8 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
- SbxINT64( INT16 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
- SbxINT64( INT32 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+ SbxINT64( sal_Int8 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+ SbxINT64( sal_Int16 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
+ SbxINT64( sal_Int32 n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
SbxINT64( int n ) : nHigh( n < 0 ? -1 : 0 ), nLow( n ) {}
SbxINT64( SbxINT64 &r ) : nHigh( r.nHigh ), nLow( r.nLow ) {}
@@ -57,7 +57,7 @@ struct SbxINT64
#endif
void CHS()
{
- nLow ^= (UINT32)-1;
+ nLow ^= (sal_uInt32)-1;
nHigh ^= -1;
nLow++;
if( !nLow )
@@ -69,16 +69,16 @@ struct SbxINT64
{
if( n >= 0 )
{
- nHigh = (INT32)(n / (double)4294967296.0);
- nLow = (UINT32)(n - ((double)nHigh * (double)4294967296.0) + 0.5);
+ nHigh = (sal_Int32)(n / (double)4294967296.0);
+ nLow = (sal_uInt32)(n - ((double)nHigh * (double)4294967296.0) + 0.5);
}
else {
- nHigh = (INT32)(-n / (double)4294967296.0);
- nLow = (UINT32)(-n - ((double)nHigh * (double)4294967296.0) + 0.5);
+ nHigh = (sal_Int32)(-n / (double)4294967296.0);
+ nLow = (sal_uInt32)(-n - ((double)nHigh * (double)4294967296.0) + 0.5);
CHS();
}
}
- void Set(INT32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }
+ void Set(sal_Int32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }
void SetMax() { nHigh = 0x7FFFFFFF; nLow = 0xFFFFFFFF; }
void SetMin() { nHigh = 0x80000000; nLow = 0x00000000; }
@@ -117,14 +117,14 @@ struct SbxINT64
struct SbxUINT64
{
- UINT32 nHigh; UINT32 nLow;
+ sal_uInt32 nHigh; sal_uInt32 nLow;
void Set(double n)
{
- nHigh = (UINT32)(n / (double)4294967296.0);
- nLow = (UINT32)(n - ((double)nHigh * (double)4294967296.0));
+ nHigh = (sal_uInt32)(n / (double)4294967296.0);
+ nLow = (sal_uInt32)(n - ((double)nHigh * (double)4294967296.0));
}
- void Set(UINT32 n) { nHigh = 0; nLow = n; }
+ void Set(sal_uInt32 n) { nHigh = 0; nLow = n; }
void SetMax() { nHigh = 0xFFFFFFFF; nLow = 0xFFFFFFFF; }
void SetMin() { nHigh = 0x00000000; nLow = 0x00000000; }
@@ -165,11 +165,11 @@ struct SbxValues
{
union {
sal_Unicode nChar;
- BYTE nByte;
- INT16 nInteger;
- INT32 nLong;
- UINT16 nUShort;
- UINT32 nULong;
+ sal_uInt8 nByte;
+ sal_Int16 nInteger;
+ sal_Int32 nLong;
+ sal_uInt16 nUShort;
+ sal_uInt32 nULong;
float nSingle;
double nDouble;
SbxINT64 nLong64;
@@ -183,11 +183,11 @@ struct SbxValues
SbxBase* pObj;
sal_Unicode* pChar;
- BYTE* pByte;
- INT16* pInteger;
- INT32* pLong;
- UINT16* pUShort;
- UINT32* pULong;
+ sal_uInt8* pByte;
+ sal_Int16* pInteger;
+ sal_Int32* pLong;
+ sal_uInt16* pUShort;
+ sal_uInt32* pULong;
float* pSingle;
double* pDouble;
SbxINT64* pLong64;
@@ -203,11 +203,11 @@ struct SbxValues
SbxValues(): pData( NULL ), eType(SbxEMPTY) {}
SbxValues( SbxDataType e ): eType(e) {}
SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
- SbxValues( BYTE _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
+ SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
- SbxValues( USHORT _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
- SbxValues( ULONG _nULong ): nULong( _nULong ), eType(SbxULONG) {}
+ SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
+ SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
@@ -233,17 +233,17 @@ class SbxValue : public SbxBase
SbxValueImpl* mpSbxValueImplImpl; // Impl data
// #55226 Transport additional infos
- SbxValue* TheRealValue( BOOL bObjInObjError ) const;
+ SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
SbxValue* TheRealValue() const;
protected:
SbxValues aData; // Data
::rtl::OUString aPic; // Picture-String
String aToolString; // tool string copy
- virtual void Broadcast( ULONG ); // Broadcast-Call
+ virtual void Broadcast( sal_uIntPtr ); // Broadcast-Call
virtual ~SbxValue();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
TYPEINFO();
@@ -252,41 +252,41 @@ public:
SbxValue( const SbxValue& );
SbxValue& operator=( const SbxValue& );
virtual void Clear();
- virtual BOOL IsFixed() const;
-
- BOOL IsInteger() const { return BOOL( GetType() == SbxINTEGER ); }
- BOOL IsLong() const { return BOOL( GetType() == SbxLONG ); }
- BOOL IsSingle() const { return BOOL( GetType() == SbxSINGLE ); }
- BOOL IsDouble() const { return BOOL( GetType() == SbxDOUBLE ); }
- BOOL IsString() const { return BOOL( GetType() == SbxSTRING ); }
- BOOL IsDate() const { return BOOL( GetType() == SbxDATE ); }
- BOOL IsCurrency()const { return BOOL( GetType() == SbxCURRENCY ); }
- BOOL IsObject() const { return BOOL( GetType() == SbxOBJECT ); }
- BOOL IsDataObject()const{return BOOL( GetType() == SbxDATAOBJECT);}
- BOOL IsBool() const { return BOOL( GetType() == SbxBOOL ); }
- BOOL IsErr() const { return BOOL( GetType() == SbxERROR ); }
- BOOL IsEmpty() const { return BOOL( GetType() == SbxEMPTY ); }
- BOOL IsNull() const { return BOOL( GetType() == SbxNULL ); }
- BOOL IsChar() const { return BOOL( GetType() == SbxCHAR ); }
- BOOL IsByte() const { return BOOL( GetType() == SbxBYTE ); }
- BOOL IsUShort() const { return BOOL( GetType() == SbxUSHORT ); }
- BOOL IsULong() const { return BOOL( GetType() == SbxULONG ); }
- BOOL IsInt() const { return BOOL( GetType() == SbxINT ); }
- BOOL IsUInt() const { return BOOL( GetType() == SbxUINT ); }
- BOOL IspChar() const { return BOOL( GetType() == SbxLPSTR ); }
- BOOL IsNumeric() const;
- BOOL IsNumericRTL() const; // #41692 Interface for Basic
- BOOL ImpIsNumeric( BOOL bOnlyIntntl ) const; // Implementation
+ virtual sal_Bool IsFixed() const;
+
+ sal_Bool IsInteger() const { return sal_Bool( GetType() == SbxINTEGER ); }
+ sal_Bool IsLong() const { return sal_Bool( GetType() == SbxLONG ); }
+ sal_Bool IsSingle() const { return sal_Bool( GetType() == SbxSINGLE ); }
+ sal_Bool IsDouble() const { return sal_Bool( GetType() == SbxDOUBLE ); }
+ sal_Bool IsString() const { return sal_Bool( GetType() == SbxSTRING ); }
+ sal_Bool IsDate() const { return sal_Bool( GetType() == SbxDATE ); }
+ sal_Bool IsCurrency()const { return sal_Bool( GetType() == SbxCURRENCY ); }
+ sal_Bool IsObject() const { return sal_Bool( GetType() == SbxOBJECT ); }
+ sal_Bool IsDataObject()const{return sal_Bool( GetType() == SbxDATAOBJECT);}
+ sal_Bool IsBool() const { return sal_Bool( GetType() == SbxBOOL ); }
+ sal_Bool IsErr() const { return sal_Bool( GetType() == SbxERROR ); }
+ sal_Bool IsEmpty() const { return sal_Bool( GetType() == SbxEMPTY ); }
+ sal_Bool IsNull() const { return sal_Bool( GetType() == SbxNULL ); }
+ sal_Bool IsChar() const { return sal_Bool( GetType() == SbxCHAR ); }
+ sal_Bool IsByte() const { return sal_Bool( GetType() == SbxBYTE ); }
+ sal_Bool IsUShort() const { return sal_Bool( GetType() == SbxUSHORT ); }
+ sal_Bool IsULong() const { return sal_Bool( GetType() == SbxULONG ); }
+ sal_Bool IsInt() const { return sal_Bool( GetType() == SbxINT ); }
+ sal_Bool IsUInt() const { return sal_Bool( GetType() == SbxUINT ); }
+ sal_Bool IspChar() const { return sal_Bool( GetType() == SbxLPSTR ); }
+ sal_Bool IsNumeric() const;
+ sal_Bool IsNumericRTL() const; // #41692 Interface for Basic
+ sal_Bool ImpIsNumeric( sal_Bool bOnlyIntntl ) const; // Implementation
virtual SbxClassType GetClass() const;
virtual SbxDataType GetType() const;
SbxDataType GetFullType() const;
- BOOL SetType( SbxDataType );
+ sal_Bool SetType( SbxDataType );
- virtual BOOL Get( SbxValues& ) const;
- BOOL GetNoBroadcast( SbxValues& );
+ virtual sal_Bool Get( SbxValues& ) const;
+ sal_Bool GetNoBroadcast( SbxValues& );
const SbxValues& GetValues_Impl() const { return aData; }
- virtual BOOL Put( const SbxValues& );
+ virtual sal_Bool Put( const SbxValues& );
inline SbxValues * data() { return &aData; }
@@ -295,65 +295,65 @@ public:
SbxUINT64 GetULong64() const;
sal_Int64 GetInt64() const;
sal_uInt64 GetUInt64() const;
- INT16 GetInteger() const;
- INT32 GetLong() const;
+ sal_Int16 GetInteger() const;
+ sal_Int32 GetLong() const;
float GetSingle() const;
double GetDouble() const;
double GetDate() const;
- BOOL GetBool() const;
- UINT16 GetErr() const;
+ sal_Bool GetBool() const;
+ sal_uInt16 GetErr() const;
const String& GetString() const;
const String& GetCoreString() const;
::rtl::OUString GetOUString() const;
SbxDecimal* GetDecimal() const;
SbxBase* GetObject() const;
- BOOL HasObject() const;
+ sal_Bool HasObject() const;
void* GetData() const;
sal_Unicode GetChar() const;
- BYTE GetByte() const;
- UINT16 GetUShort() const;
- UINT32 GetULong() const;
+ sal_uInt8 GetByte() const;
+ sal_uInt16 GetUShort() const;
+ sal_uInt32 GetULong() const;
int GetInt() const;
- BOOL PutCurrency( const SbxINT64& );
- BOOL PutLong64( const SbxINT64& );
- BOOL PutULong64( const SbxUINT64& );
- BOOL PutInt64( sal_Int64 );
- BOOL PutUInt64( sal_uInt64 );
- BOOL PutInteger( INT16 );
- BOOL PutLong( INT32 );
- BOOL PutSingle( float );
- BOOL PutDouble( double );
- BOOL PutDate( double );
- BOOL PutBool( BOOL );
- BOOL PutErr( USHORT );
- BOOL PutStringExt( const ::rtl::OUString& ); // with extended analysis (International, "TRUE"/"FALSE")
- BOOL PutString( const ::rtl::OUString& );
- BOOL PutString( const sal_Unicode* ); // Type = SbxSTRING
- BOOL PutpChar( const sal_Unicode* ); // Type = SbxLPSTR
- BOOL PutDecimal( SbxDecimal* pDecimal );
- BOOL PutObject( SbxBase* );
- BOOL PutData( void* );
- BOOL PutChar( sal_Unicode );
- BOOL PutByte( BYTE );
- BOOL PutUShort( UINT16 );
- BOOL PutULong( UINT32 );
- BOOL PutInt( int );
- BOOL PutEmpty();
- BOOL PutNull();
+ sal_Bool PutCurrency( const SbxINT64& );
+ sal_Bool PutLong64( const SbxINT64& );
+ sal_Bool PutULong64( const SbxUINT64& );
+ sal_Bool PutInt64( sal_Int64 );
+ sal_Bool PutUInt64( sal_uInt64 );
+ sal_Bool PutInteger( sal_Int16 );
+ sal_Bool PutLong( sal_Int32 );
+ sal_Bool PutSingle( float );
+ sal_Bool PutDouble( double );
+ sal_Bool PutDate( double );
+ sal_Bool PutBool( sal_Bool );
+ sal_Bool PutErr( sal_uInt16 );
+ sal_Bool PutStringExt( const ::rtl::OUString& ); // with extended analysis (International, "sal_True"/"sal_False")
+ sal_Bool PutString( const ::rtl::OUString& );
+ sal_Bool PutString( const sal_Unicode* ); // Type = SbxSTRING
+ sal_Bool PutpChar( const sal_Unicode* ); // Type = SbxLPSTR
+ sal_Bool PutDecimal( SbxDecimal* pDecimal );
+ sal_Bool PutObject( SbxBase* );
+ sal_Bool PutData( void* );
+ sal_Bool PutChar( sal_Unicode );
+ sal_Bool PutByte( sal_uInt8 );
+ sal_Bool PutUShort( sal_uInt16 );
+ sal_Bool PutULong( sal_uInt32 );
+ sal_Bool PutInt( int );
+ sal_Bool PutEmpty();
+ sal_Bool PutNull();
// Special decimal methods
- BOOL PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
- BOOL fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+ sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+ sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
- virtual BOOL Convert( SbxDataType );
- virtual BOOL Compute( SbxOperator, const SbxValue& );
- virtual BOOL Compare( SbxOperator, const SbxValue& ) const;
- BOOL Scan( const String&, USHORT* = NULL );
+ virtual sal_Bool Convert( SbxDataType );
+ virtual sal_Bool Compute( SbxOperator, const SbxValue& );
+ virtual sal_Bool Compare( SbxOperator, const SbxValue& ) const;
+ sal_Bool Scan( const String&, sal_uInt16* = NULL );
void Format( String&, const String* = NULL ) const;
// Interface for CDbl in Basic
- static SbxError ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle=FALSE );
+ static SbxError ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle=sal_False );
// The following operators are definied for easier handling.
// Error conditions (overflow, conversions) are not
@@ -449,7 +449,7 @@ class SbxVariable : public SbxValue
SfxBroadcaster* pCst; // Broadcaster, if needed
String maName; // Name, if available
SbxArrayRef mpPar; // Parameter-Array, if set
- USHORT nHash; // Hash-ID for search
+ sal_uInt16 nHash; // Hash-ID for search
SbxVariableImpl* getImpl( void );
@@ -458,8 +458,8 @@ protected:
sal_uIntPtr nUserData; // User data for Call()
SbxObject* pParent; // Currently attached object
virtual ~SbxVariable();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
TYPEINFO();
@@ -468,13 +468,13 @@ public:
SbxVariable( const SbxVariable& );
SbxVariable& operator=( const SbxVariable& );
- void Dump( SvStream&, BOOL bDumpAll=FALSE );
+ void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
virtual void SetName( const String& );
virtual const String& GetName( SbxNameType = SbxNAME_NONE ) const;
- USHORT GetHashCode() const { return nHash; }
+ sal_uInt16 GetHashCode() const { return nHash; }
- virtual void SetModified( BOOL );
+ virtual void SetModified( sal_Bool );
sal_uIntPtr GetUserData() const { return nUserData; }
void SetUserData( sal_uIntPtr n ) { nUserData = n; }
@@ -491,8 +491,8 @@ public:
// Sfx-Broadcasting-Support:
// Due to data reduction and better DLL-hierarchie currently via casting
SfxBroadcaster& GetBroadcaster();
- BOOL IsBroadcaster() const { return BOOL( pCst != NULL ); }
- virtual void Broadcast( ULONG nHintId );
+ sal_Bool IsBroadcaster() const { return sal_Bool( pCst != NULL ); }
+ virtual void Broadcast( sal_uIntPtr nHintId );
inline const SbxObject* GetParent() const { return pParent; }
inline SbxObject* GetParent() { return pParent; }
@@ -504,7 +504,7 @@ public:
StarBASIC* pParentBasic );
void ClearComListener( void );
- static USHORT MakeHashCode( const String& rName );
+ static sal_uInt16 MakeHashCode( const String& rName );
};
#ifndef SBX_VARIABLE_DECL_DEFINED
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 37e90bb5cd68..179d28152561 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -40,7 +40,7 @@
// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine );
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
//#include "testapp.hxx"
#define ADD_ERROR_QUIET(nNr, aStr) \
@@ -101,9 +101,9 @@ public:
String aKurzname;
String aSlotname;
String aLangname;
- USHORT nRType;
+ sal_uInt16 nRType;
String aRName;
- BOOL bIsReset;
+ sal_Bool bIsReset;
};
// Defines for syntax Highlighting
@@ -132,20 +132,20 @@ public:
class TTExecutionStatusHint : public SfxSimpleHint
{
private:
- USHORT mnType;
+ sal_uInt16 mnType;
String maExecutionStatus;
String maAdditionalExecutionStatus;
public:
TYPEINFO();
- TTExecutionStatusHint( USHORT nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
+ TTExecutionStatusHint( sal_uInt16 nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
: SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
, mnType( nType )
, maExecutionStatus( pExecutionStatus, RTL_TEXTENCODING_ASCII_US )
, maAdditionalExecutionStatus( pAdditionalExecutionStatus, RTL_TEXTENCODING_ASCII_US )
{;}
- TTExecutionStatusHint( USHORT nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
+ TTExecutionStatusHint( sal_uInt16 nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
: SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
, mnType( nType )
, maExecutionStatus( aExecutionStatus )
@@ -154,7 +154,7 @@ public:
const String& GetExecutionStatus() const { return maExecutionStatus; }
const String& GetAdditionalExecutionStatus() const { return maAdditionalExecutionStatus; }
- USHORT GetType(){ return mnType; }
+ sal_uInt16 GetType(){ return mnType; }
};
#endif // _BASIC_TESTTOOL_HXX_
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 06f4939d61c0..27867a97996d 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -57,20 +57,20 @@
#define ResString(nNumber) MakeStringNumber(ResKenn,nNumber)
#define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText)
-UniString GEN_RES_STR0( ULONG nResId );
-UniString GEN_RES_STR1( ULONG nResId, const String &Text1 );
-UniString GEN_RES_STR2( ULONG nResId, const String &Text1, const String &Text2 );
-UniString GEN_RES_STR3( ULONG nResId, const String &Text1, const String &Text2, const String &Text3 );
+UniString GEN_RES_STR0( sal_uIntPtr nResId );
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const String &Text1 );
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const String &Text1, const String &Text2 );
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const String &Text1, const String &Text2, const String &Text3 );
#define GEN_RES_STR1c( nResId, Text1 ) GEN_RES_STR1( nResId, CUniString(Text1) )
#define GEN_RES_STR2c2( nResId, Text1, Text2 ) GEN_RES_STR2( nResId, Text1, CUniString(Text2) )
#define GEN_RES_STR3c3( nResId, Text1, Text2, Text3 ) GEN_RES_STR3( nResId, Text1, Text2, CUniString(Text3) )
#define IMPL_GEN_RES_STR \
-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_uIntPtr nResId ) { return ResString( nResId ); } \
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
#endif
generated by cgit (git 2.34.1) at 2024-08-22 01:22:12 +0000