diff options
Diffstat (limited to 'basic')
183 files changed, 4589 insertions, 4589 deletions
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx index e486c3880f41..9af9f1603fc2 100644 --- a/basic/inc/basic/basicmanagerrepository.hxx +++ b/basic/inc/basic/basicmanagerrepository.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx index 8f55b4f8f247..5366d9bf10f3 100644 --- a/basic/inc/basic/basicrt.hxx +++ b/basic/inc/basic/basicrt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 360063bbface..6b3a024ec46f 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,47 +44,47 @@ com::sun::star::uno::Reference< com::sun::star::script::XStarBasicAccess > class SotStorage; -#define BASERR_ID_STDLIBOPEN ERRCODE_BASMGR_STDLIBOPEN +#define BASERR_ID_STDLIBOPEN ERRCODE_BASMGR_STDLIBOPEN #define BASERR_ID_STDLIBSAVE ERRCODE_BASMGR_STDLIBSAVE -#define BASERR_ID_LIBLOAD ERRCODE_BASMGR_LIBLOAD -#define BASERR_ID_LIBCREATE ERRCODE_BASMGR_LIBCREATE +#define BASERR_ID_LIBLOAD ERRCODE_BASMGR_LIBLOAD +#define BASERR_ID_LIBCREATE ERRCODE_BASMGR_LIBCREATE #define BASERR_ID_LIBSAVE ERRCODE_BASMGR_LIBSAVE -#define BASERR_ID_LIBDEL ERRCODE_BASMGR_LIBDEL +#define BASERR_ID_LIBDEL ERRCODE_BASMGR_LIBDEL #define BASERR_ID_MGROPEN ERRCODE_BASMGR_MGROPEN -#define BASERR_ID_MGRSAVE ERRCODE_BASMGR_MGRSAVE -#define BASERR_ID_REMOVELIB ERRCODE_BASMGR_REMOVELIB -#define BASERR_ID_UNLOADLIB ERRCODE_BASMGR_UNLOADLIB +#define BASERR_ID_MGRSAVE ERRCODE_BASMGR_MGRSAVE +#define BASERR_ID_REMOVELIB ERRCODE_BASMGR_REMOVELIB +#define BASERR_ID_UNLOADLIB ERRCODE_BASMGR_UNLOADLIB #define BASERR_REASON_OPENSTORAGE 0x0001 #define BASERR_REASON_OPENLIBSTORAGE 0x0002 #define BASERR_REASON_OPENMGRSTREAM 0x0004 #define BASERR_REASON_OPENLIBSTREAM 0x0008 -#define BASERR_REASON_LIBNOTFOUND 0x0010 -#define BASERR_REASON_STORAGENOTFOUND 0x0020 -#define BASERR_REASON_BASICLOADERROR 0x0040 -#define BASERR_REASON_NOSTORAGENAME 0x0080 +#define BASERR_REASON_LIBNOTFOUND 0x0010 +#define BASERR_REASON_STORAGENOTFOUND 0x0020 +#define BASERR_REASON_BASICLOADERROR 0x0040 +#define BASERR_REASON_NOSTORAGENAME 0x0080 -#define BASERR_REASON_STDLIB 0x0100 +#define BASERR_REASON_STDLIB 0x0100 class BasicError { private: - ULONG nErrorId; - USHORT nReason; - String aErrStr; + ULONG nErrorId; + USHORT nReason; + String aErrStr; public: BasicError(); BasicError( const BasicError& rErr ); BasicError( ULONG nId, USHORT nR, const String& rErrStr ); - ULONG GetErrorId() const { return nErrorId; } - USHORT GetReason() const { return nReason; } - String GetErrorStr() { return aErrStr; } + ULONG GetErrorId() const { return nErrorId; } + USHORT GetReason() const { return nReason; } + String GetErrorStr() { return aErrStr; } - void SetErrorId( ULONG n ) { nErrorId = n; } - void SetReason( USHORT n ) { nReason = n; } - void SetErrorStr( const String& rStr) { aErrStr = rStr; } + void SetErrorId( ULONG n ) { nErrorId = n; } + void SetReason( USHORT n ) { nReason = n; } + void SetErrorStr( const String& rStr) { aErrStr = rStr; } }; @@ -132,7 +132,7 @@ struct LibraryContainerInfo struct BasicManagerImpl; -#define LIB_NOTFOUND 0xFFFF +#define LIB_NOTFOUND 0xFFFF class BasicManager : public SfxBroadcaster { @@ -142,32 +142,32 @@ class BasicManager : public SfxBroadcaster friend class ::basic::BasicManagerCleaner; private: - BasicLibs* pLibs; - BasicErrorManager* pErrorMgr; + BasicLibs* pLibs; + BasicErrorManager* pErrorMgr; - String aName; - String maStorageName; - BOOL bBasMgrModified; - BOOL mbDocMgr; + String aName; + String maStorageName; + BOOL bBasMgrModified; + BOOL mbDocMgr; - BasicManagerImpl* mpImpl; + BasicManagerImpl* mpImpl; - void Init(); + void Init(); protected: - BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const; - BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const; - void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); - void ImpMgrNotLoaded( const String& rStorageName ); - BasicLibInfo* CreateLibInfo(); + BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const; + BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const; + void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); + void ImpMgrNotLoaded( const String& rStorageName ); + BasicLibInfo* CreateLibInfo(); void LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadBasics = TRUE ); - void LoadOldBasicManager( SotStorage& rStorage ); - BOOL ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const; - BOOL ImplEncryptStream( SvStream& rStream ) const; - BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const; - void CheckModules( StarBASIC* pBasic, BOOL bReference ) const; - void SetFlagToAllLibs( short nFlag, BOOL bSet ) const; - BasicManager(); // This is used only to customize the paths for 'Save as'. + void LoadOldBasicManager( SotStorage& rStorage ); + BOOL ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const; + BOOL ImplEncryptStream( SvStream& rStream ) const; + BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const; + void CheckModules( StarBASIC* pBasic, BOOL bReference ) const; + void SetFlagToAllLibs( short nFlag, BOOL bSet ) const; + BasicManager(); // This is used only to customize the paths for 'Save as'. ~BasicManager(); public: @@ -184,40 +184,40 @@ public: */ static void LegacyDeleteBasicManager( BasicManager*& _rpManager ); - void SetStorageName( const String& rName ) { maStorageName = rName; } - String GetStorageName() const { return maStorageName; } - void SetName( const String& rName ) { aName = rName; } - String GetName() const { return aName; } + void SetStorageName( const String& rName ) { maStorageName = rName; } + String GetStorageName() const { return maStorageName; } + void SetName( const String& rName ) { aName = rName; } + String GetName() const { return aName; } - USHORT GetLibCount() const; - StarBASIC* GetLib( USHORT nLib ) const; - StarBASIC* GetLib( const String& rName ) const; - USHORT GetLibId( const String& rName ) const; + USHORT GetLibCount() const; + StarBASIC* GetLib( USHORT nLib ) const; + StarBASIC* GetLib( const String& rName ) const; + USHORT GetLibId( const String& rName ) const; - String GetLibName( USHORT nLib ); + String GetLibName( USHORT nLib ); /** announces the library containers which belong to this BasicManager The method will automatically add two global constants, BasicLibraries and DialogLibraries, to the BasicManager. */ - void SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ); + void SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ); const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >& GetDialogLibraryContainer() const; const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >& GetScriptLibraryContainer() const; - BOOL LoadLib( USHORT nLib ); - BOOL RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage ); + BOOL LoadLib( USHORT nLib ); + BOOL RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage ); // Modify-Flag will be reset only during save. - BOOL IsModified() const; - BOOL IsBasicModified() const; + BOOL IsModified() const; + BOOL IsBasicModified() const; - BOOL HasErrors(); - void ClearErrors(); + BOOL HasErrors(); + void ClearErrors(); BasicError* GetFirstError(); BasicError* GetNextError(); @@ -239,16 +239,16 @@ public: bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames ); bool HasExeCode( const String& ); private: - BOOL IsReference( USHORT nLib ); + BOOL IsReference( USHORT nLib ); - BOOL SetLibName( USHORT nLib, const String& rName ); + BOOL SetLibName( USHORT nLib, const String& rName ); - StarBASIC* GetStdLib() const; + StarBASIC* GetStdLib() const; StarBASIC* AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference ); - BOOL RemoveLib( USHORT nLib ); - BOOL HasLib( const String& rName ) const; + BOOL RemoveLib( USHORT nLib ); + BOOL HasLib( const String& rName ) const; - StarBASIC* CreateLibForLibContainer( const String& rLibName, + StarBASIC* CreateLibForLibContainer( const String& rLibName, const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >& xScriptCont ); // For XML import/export: @@ -259,6 +259,6 @@ private: void SetAppBasicManager( BasicManager* pBasMgr ); -#endif //_BASMGR_HXX +#endif //_BASMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx index 2434dd40ea10..c8a59a32fabd 100644 --- a/basic/inc/basic/basrdll.hxx +++ b/basic/inc/basic/basrdll.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,23 +36,23 @@ class ResMgr; class BasicDLL { private: - ResMgr* pSttResMgr; + ResMgr* pSttResMgr; ResMgr* pBasResMgr; - BOOL bDebugMode; - BOOL bBreakEnabled; + BOOL bDebugMode; + BOOL bBreakEnabled; public: BasicDLL(); ~BasicDLL(); - ResMgr* GetSttResMgr() const { return pSttResMgr; } - ResMgr* GetBasResMgr() const { return pBasResMgr; } + ResMgr* GetSttResMgr() const { return pSttResMgr; } + ResMgr* GetBasResMgr() const { return pBasResMgr; } static void BasicBreak(); - static void EnableBreak( BOOL bEnable ); - static void SetDebugMode( BOOL bDebugMode ); + static void EnableBreak( BOOL bEnable ); + static void SetDebugMode( BOOL bDebugMode ); }; #define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) ) diff --git a/basic/inc/basic/dispdefs.hxx b/basic/inc/basic/dispdefs.hxx index 9feb0edbef98..75b7ce2f117c 100644 --- a/basic/inc/basic/dispdefs.hxx +++ b/basic/inc/basic/dispdefs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ #ifndef _BASIC_DISPDEFS_HXX #define _BASIC_DISPDEFS_HXX -#define DH_MODE_DATA_VALID 0x0001 // ModeData (for compatibility with old Office) +#define DH_MODE_DATA_VALID 0x0001 // ModeData (for compatibility with old Office) -#define DH_MODE_KURZNAME 0x0002 // View short name instead of UniqueID (if possible) -#define DH_MODE_LANGNAME 0x0004 // Always view long name -#define DH_MODE_ALLWIN 0x0008 // View all windows -#define DH_MODE_SEND_DATA 0x0010 // Send data to Testtool +#define DH_MODE_KURZNAME 0x0002 // View short name instead of UniqueID (if possible) +#define DH_MODE_LANGNAME 0x0004 // Always view long name +#define DH_MODE_ALLWIN 0x0008 // View all windows +#define DH_MODE_SEND_DATA 0x0010 // Send data to Testtool #endif diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx index 2f520253a6b3..4a32e04a0be1 100644 --- a/basic/inc/basic/mybasic.hxx +++ b/basic/inc/basic/mybasic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ public: DECLARE_LIST( ErrorList, BasicError* ) -#define SBXID_MYBASIC 0x594D // MyBasic: MY -#define SBXCR_TEST 0x54534554 // TEST +#define SBXID_MYBASIC 0x594D // MyBasic: MY +#define SBXCR_TEST 0x54534554 // TEST class MyBasic : public StarBASIC { @@ -80,7 +80,7 @@ public: virtual void LoadIniFile(); - // Determines the extended symbol type for syntax highlighting + // Determines the extended symbol type for syntax highlighting virtual SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl ); virtual const String GetSpechialErrorText(); virtual void ReportRuntimeError( AppBasEd *pEditWin ); diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx index d804ae4c722d..68f3147ac6bb 100644 --- a/basic/inc/basic/process.hxx +++ b/basic/inc/basic/process.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index 1b0b6a3f65b4..03ae7c4dfeea 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #define _BASIC_TEXTPORTIONS // Type of a text token (syntax highlighting) -enum SbTextType +enum SbTextType { SB_KEYWORD = 1, // Keywords SB_SYMBOL, // Symbols @@ -47,7 +47,7 @@ enum SbTextType }; // Active language -enum SbLanguageMode +enum SbLanguageMode { SB_LANG_GLOBAL, // As in SbiGlobals struct SB_LANG_BASIC, // StarBasic (Default) @@ -86,18 +86,18 @@ void setBasicWatchMode( bool bOn ); #define SbDEBUG_BREAK 0x0001 // Break-Callback #define SbDEBUG_STEPINTO 0x0002 // Single Step-Callback #define SbDEBUG_STEPOVER 0x0004 // Additional flag Step Over -#define SbDEBUG_CONTINUE 0x0008 // Do not change flags +#define SbDEBUG_CONTINUE 0x0008 // Do not change flags #define SbDEBUG_STEPOUT 0x0010 // Leave Sub #define SBXID_BASIC 0x6273 // sb: StarBASIC -#define SBXID_BASICMOD 0x6d62 // bm: StarBASIC Module +#define SBXID_BASICMOD 0x6d62 // bm: StarBASIC Module #define SBXID_BASICPROP 0x7262 // pr: StarBASIC Property -#define SBXID_BASICMETHOD 0x6d65 // me: StarBASIC Method -#define SBXID_JSCRIPTMOD 0x6a62 // jm: JavaScript Module -#define SBXID_JSCRIPTMETH 0x6a64 // jm: JavaScript Module +#define SBXID_BASICMETHOD 0x6d65 // me: StarBASIC Method +#define SBXID_JSCRIPTMOD 0x6a62 // jm: JavaScript Module +#define SBXID_JSCRIPTMETH 0x6a64 // jm: JavaScript Module -#define SBX_HINT_BASICSTART SFX_HINT_USER04 -#define SBX_HINT_BASICSTOP SFX_HINT_USER05 +#define SBX_HINT_BASICSTART SFX_HINT_USER04 +#define SBX_HINT_BASICSTOP SFX_HINT_USER05 // #115826 enum PropertyMode diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx index db072193d852..1a7d630f6631 100644 --- a/basic/inc/basic/sberrors.hxx +++ b/basic/inc/basic/sberrors.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,302 +36,302 @@ typedef ULONG SbError; #endif // Mapping to SbxError -#define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error -#define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call -#define ERRCODE_BASIC_MATH_OVERFLOW ERRCODE_SBX_OVERFLOW // Overflow -#define ERRCODE_BASIC_OUT_OF_RANGE ERRCODE_SBX_BOUNDS // Subscript out of range -#define ERRCODE_BASIC_ZERODIV ERRCODE_SBX_ZERODIV // Division by zero -#define ERRCODE_BASIC_CONVERSION ERRCODE_SBX_CONVERSION // Type mismatch -#define ERRCODE_BASIC_BAD_PARAMETER ERRCODE_SBX_BAD_PARAMETER // Invalid Parameter -#define ERRCODE_BASIC_PROC_UNDEFINED ERRCODE_SBX_PROC_UNDEFINED // Sub or Function not defined -#define ERRCODE_BASIC_INTERNAL_ERROR ERRCODE_SBX_ERROR // internal error -#define ERRCODE_BASIC_NO_OBJECT ERRCODE_SBX_NO_OBJECT // Object variable not set -#define ERRCODE_BASIC_CANNOT_LOAD ERRCODE_SBX_CANNOT_LOAD // Can't load module -#define ERRCODE_BASIC_BAD_INDEX ERRCODE_SBX_BAD_INDEX // Invalid object index -#define ERRCODE_BASIC_NO_ACTIVE_OBJECT ERRCODE_SBX_NO_ACTIVE_OBJECT // No active view or document -#define ERRCODE_BASIC_BAD_PROP_VALUE ERRCODE_SBX_BAD_PROP_VALUE // Bad property value -#define ERRCODE_BASIC_PROP_READONLY ERRCODE_SBX_PROP_READONLY // Property is read only -#define ERRCODE_BASIC_PROP_WRITEONLY ERRCODE_SBX_PROP_WRITEONLY // Property is write only -#define ERRCODE_BASIC_INVALID_OBJECT ERRCODE_SBX_INVALID_OBJECT // Invalid object reference -#define ERRCODE_BASIC_NO_METHOD ERRCODE_SBX_NO_METHOD // Property or method not found -#define ERRCODE_BASIC_INVALID_USAGE_OBJECT ERRCODE_SBX_INVALID_USAGE_OBJECT // Invalid usee of object -#define ERRCODE_BASIC_NO_OLE ERRCODE_SBX_NO_OLE // Class does not support OLE -#define ERRCODE_BASIC_BAD_METHOD ERRCODE_SBX_BAD_METHOD // Object doesn't support method -#define ERRCODE_BASIC_OLE_ERROR ERRCODE_SBX_OLE_ERROR // OLE Automation error -#define ERRCODE_BASIC_BAD_ACTION ERRCODE_SBX_BAD_ACTION // Object doesn't support this action -#define ERRCODE_BASIC_NO_NAMED_ARGS ERRCODE_SBX_NO_NAMED_ARGS // Object doesn't support named args -#define ERRCODE_BASIC_BAD_LOCALE ERRCODE_SBX_BAD_LOCALE // Object doesn't support current locale setting -#define ERRCODE_BASIC_NAMED_NOT_FOUND ERRCODE_SBX_NAMED_NOT_FOUND // Named argument not found -#define ERRCODE_BASIC_NOT_OPTIONAL ERRCODE_SBX_NOT_OPTIONAL // Argument not optional -#define ERRCODE_BASIC_WRONG_ARGS ERRCODE_SBX_WRONG_ARGS // Wrong number of arguments -#define ERRCODE_BASIC_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL // Object not a collection +#define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error +#define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call +#define ERRCODE_BASIC_MATH_OVERFLOW ERRCODE_SBX_OVERFLOW // Overflow +#define ERRCODE_BASIC_OUT_OF_RANGE ERRCODE_SBX_BOUNDS // Subscript out of range +#define ERRCODE_BASIC_ZERODIV ERRCODE_SBX_ZERODIV // Division by zero +#define ERRCODE_BASIC_CONVERSION ERRCODE_SBX_CONVERSION // Type mismatch +#define ERRCODE_BASIC_BAD_PARAMETER ERRCODE_SBX_BAD_PARAMETER // Invalid Parameter +#define ERRCODE_BASIC_PROC_UNDEFINED ERRCODE_SBX_PROC_UNDEFINED // Sub or Function not defined +#define ERRCODE_BASIC_INTERNAL_ERROR ERRCODE_SBX_ERROR // internal error +#define ERRCODE_BASIC_NO_OBJECT ERRCODE_SBX_NO_OBJECT // Object variable not set +#define ERRCODE_BASIC_CANNOT_LOAD ERRCODE_SBX_CANNOT_LOAD // Can't load module +#define ERRCODE_BASIC_BAD_INDEX ERRCODE_SBX_BAD_INDEX // Invalid object index +#define ERRCODE_BASIC_NO_ACTIVE_OBJECT ERRCODE_SBX_NO_ACTIVE_OBJECT // No active view or document +#define ERRCODE_BASIC_BAD_PROP_VALUE ERRCODE_SBX_BAD_PROP_VALUE // Bad property value +#define ERRCODE_BASIC_PROP_READONLY ERRCODE_SBX_PROP_READONLY // Property is read only +#define ERRCODE_BASIC_PROP_WRITEONLY ERRCODE_SBX_PROP_WRITEONLY // Property is write only +#define ERRCODE_BASIC_INVALID_OBJECT ERRCODE_SBX_INVALID_OBJECT // Invalid object reference +#define ERRCODE_BASIC_NO_METHOD ERRCODE_SBX_NO_METHOD // Property or method not found +#define ERRCODE_BASIC_INVALID_USAGE_OBJECT ERRCODE_SBX_INVALID_USAGE_OBJECT // Invalid usee of object +#define ERRCODE_BASIC_NO_OLE ERRCODE_SBX_NO_OLE // Class does not support OLE +#define ERRCODE_BASIC_BAD_METHOD ERRCODE_SBX_BAD_METHOD // Object doesn't support method +#define ERRCODE_BASIC_OLE_ERROR ERRCODE_SBX_OLE_ERROR // OLE Automation error +#define ERRCODE_BASIC_BAD_ACTION ERRCODE_SBX_BAD_ACTION // Object doesn't support this action +#define ERRCODE_BASIC_NO_NAMED_ARGS ERRCODE_SBX_NO_NAMED_ARGS // Object doesn't support named args +#define ERRCODE_BASIC_BAD_LOCALE ERRCODE_SBX_BAD_LOCALE // Object doesn't support current locale setting +#define ERRCODE_BASIC_NAMED_NOT_FOUND ERRCODE_SBX_NAMED_NOT_FOUND // Named argument not found +#define ERRCODE_BASIC_NOT_OPTIONAL ERRCODE_SBX_NOT_OPTIONAL // Argument not optional +#define ERRCODE_BASIC_WRONG_ARGS ERRCODE_SBX_WRONG_ARGS // Wrong number of arguments +#define ERRCODE_BASIC_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL // Object not a collection // Append Basic specific error messages to ERRCODE_AREA_SBX -#define ERRCODE_BASIC_NO_GOSUB ((LAST_SBX_ERROR_ID+1UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Return without Gosub -#define ERRCODE_BASIC_REDO_FROM_START ((LAST_SBX_ERROR_ID+2UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Redo form start (SB internal) -#define ERRCODE_BASIC_NO_MEMORY ((LAST_SBX_ERROR_ID+3UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Out of memory -#define ERRCODE_BASIC_ALREADY_DIM ((LAST_SBX_ERROR_ID+4UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Array already dimensioned -#define ERRCODE_BASIC_DUPLICATE_DEF ((LAST_SBX_ERROR_ID+5UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Duplicate definition -#define ERRCODE_BASIC_VAR_UNDEFINED ((LAST_SBX_ERROR_ID+6UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Variable undefined (SB) -#define ERRCODE_BASIC_USER_ABORT ((LAST_SBX_ERROR_ID+7UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // User interrupt occurred -#define ERRCODE_BASIC_BAD_RESUME ((LAST_SBX_ERROR_ID+8UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Resume without error -#define ERRCODE_BASIC_STACK_OVERFLOW ((LAST_SBX_ERROR_ID+9UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Out of stack space -#define ERRCODE_BASIC_BAD_DLL_LOAD ((LAST_SBX_ERROR_ID+10UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Error in loading DLL -#define ERRCODE_BASIC_BAD_DLL_CALL ((LAST_SBX_ERROR_ID+11UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad DLL calling convention -#define ERRCODE_BASIC_BAD_CHANNEL ((LAST_SBX_ERROR_ID+12UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad file name or number -#define ERRCODE_BASIC_FILE_NOT_FOUND ((LAST_SBX_ERROR_ID+13UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // File not found -#define ERRCODE_BASIC_BAD_FILE_MODE ((LAST_SBX_ERROR_ID+14UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad file mode -#define ERRCODE_BASIC_FILE_ALREADY_OPEN ((LAST_SBX_ERROR_ID+15UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // File already open -#define ERRCODE_BASIC_IO_ERROR ((LAST_SBX_ERROR_ID+16UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Device I/O error -#define ERRCODE_BASIC_FILE_EXISTS ((LAST_SBX_ERROR_ID+17UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // File already exists -#define ERRCODE_BASIC_BAD_RECORD_LENGTH ((LAST_SBX_ERROR_ID+18UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // bad record length -#define ERRCODE_BASIC_DISK_FULL ((LAST_SBX_ERROR_ID+19UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // disk full -#define ERRCODE_BASIC_READ_PAST_EOF ((LAST_SBX_ERROR_ID+20UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Input past end of file -#define ERRCODE_BASIC_BAD_RECORD_NUMBER ((LAST_SBX_ERROR_ID+21UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad record number -#define ERRCODE_BASIC_TOO_MANY_FILES ((LAST_SBX_ERROR_ID+22UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Too many files -#define ERRCODE_BASIC_NO_DEVICE ((LAST_SBX_ERROR_ID+23UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Device not available -#define ERRCODE_BASIC_ACCESS_DENIED ((LAST_SBX_ERROR_ID+24UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Permission denied -#define ERRCODE_BASIC_NOT_READY ((LAST_SBX_ERROR_ID+25UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Disk not ready -#define ERRCODE_BASIC_NOT_IMPLEMENTED ((LAST_SBX_ERROR_ID+26UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Feature not implemented -#define ERRCODE_BASIC_DIFFERENT_DRIVE ((LAST_SBX_ERROR_ID+27UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // No rename with different drive -#define ERRCODE_BASIC_ACCESS_ERROR ((LAST_SBX_ERROR_ID+28UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Path/File access error -#define ERRCODE_BASIC_PATH_NOT_FOUND ((LAST_SBX_ERROR_ID+29UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Path not found -#define ERRCODE_BASIC_BAD_PATTERN ((LAST_SBX_ERROR_ID+30UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Invalid pattern string -#define ERRCODE_BASIC_IS_NULL ((LAST_SBX_ERROR_ID+31UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Invalid use of Null +#define ERRCODE_BASIC_NO_GOSUB ((LAST_SBX_ERROR_ID+1UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Return without Gosub +#define ERRCODE_BASIC_REDO_FROM_START ((LAST_SBX_ERROR_ID+2UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Redo form start (SB internal) +#define ERRCODE_BASIC_NO_MEMORY ((LAST_SBX_ERROR_ID+3UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Out of memory +#define ERRCODE_BASIC_ALREADY_DIM ((LAST_SBX_ERROR_ID+4UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Array already dimensioned +#define ERRCODE_BASIC_DUPLICATE_DEF ((LAST_SBX_ERROR_ID+5UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Duplicate definition +#define ERRCODE_BASIC_VAR_UNDEFINED ((LAST_SBX_ERROR_ID+6UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Variable undefined (SB) +#define ERRCODE_BASIC_USER_ABORT ((LAST_SBX_ERROR_ID+7UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // User interrupt occurred +#define ERRCODE_BASIC_BAD_RESUME ((LAST_SBX_ERROR_ID+8UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Resume without error +#define ERRCODE_BASIC_STACK_OVERFLOW ((LAST_SBX_ERROR_ID+9UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Out of stack space +#define ERRCODE_BASIC_BAD_DLL_LOAD ((LAST_SBX_ERROR_ID+10UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Error in loading DLL +#define ERRCODE_BASIC_BAD_DLL_CALL ((LAST_SBX_ERROR_ID+11UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad DLL calling convention +#define ERRCODE_BASIC_BAD_CHANNEL ((LAST_SBX_ERROR_ID+12UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad file name or number +#define ERRCODE_BASIC_FILE_NOT_FOUND ((LAST_SBX_ERROR_ID+13UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // File not found +#define ERRCODE_BASIC_BAD_FILE_MODE ((LAST_SBX_ERROR_ID+14UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad file mode +#define ERRCODE_BASIC_FILE_ALREADY_OPEN ((LAST_SBX_ERROR_ID+15UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // File already open +#define ERRCODE_BASIC_IO_ERROR ((LAST_SBX_ERROR_ID+16UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Device I/O error +#define ERRCODE_BASIC_FILE_EXISTS ((LAST_SBX_ERROR_ID+17UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // File already exists +#define ERRCODE_BASIC_BAD_RECORD_LENGTH ((LAST_SBX_ERROR_ID+18UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // bad record length +#define ERRCODE_BASIC_DISK_FULL ((LAST_SBX_ERROR_ID+19UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // disk full +#define ERRCODE_BASIC_READ_PAST_EOF ((LAST_SBX_ERROR_ID+20UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Input past end of file +#define ERRCODE_BASIC_BAD_RECORD_NUMBER ((LAST_SBX_ERROR_ID+21UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad record number +#define ERRCODE_BASIC_TOO_MANY_FILES ((LAST_SBX_ERROR_ID+22UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Too many files +#define ERRCODE_BASIC_NO_DEVICE ((LAST_SBX_ERROR_ID+23UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Device not available +#define ERRCODE_BASIC_ACCESS_DENIED ((LAST_SBX_ERROR_ID+24UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Permission denied +#define ERRCODE_BASIC_NOT_READY ((LAST_SBX_ERROR_ID+25UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Disk not ready +#define ERRCODE_BASIC_NOT_IMPLEMENTED ((LAST_SBX_ERROR_ID+26UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Feature not implemented +#define ERRCODE_BASIC_DIFFERENT_DRIVE ((LAST_SBX_ERROR_ID+27UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // No rename with different drive +#define ERRCODE_BASIC_ACCESS_ERROR ((LAST_SBX_ERROR_ID+28UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Path/File access error +#define ERRCODE_BASIC_PATH_NOT_FOUND ((LAST_SBX_ERROR_ID+29UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Path not found +#define ERRCODE_BASIC_BAD_PATTERN ((LAST_SBX_ERROR_ID+30UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Invalid pattern string +#define ERRCODE_BASIC_IS_NULL ((LAST_SBX_ERROR_ID+31UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Invalid use of Null // DDE messages from 250-299 -#define ERRCODE_BASIC_DDE_ERROR ((LAST_SBX_ERROR_ID+32UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_ERROR ((LAST_SBX_ERROR_ID+32UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_WAITINGACK ((LAST_SBX_ERROR_ID+33UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_WAITINGACK ((LAST_SBX_ERROR_ID+33UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_OUTOFCHANNELS ((LAST_SBX_ERROR_ID+34UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_OUTOFCHANNELS ((LAST_SBX_ERROR_ID+34UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_RESPONSE ((LAST_SBX_ERROR_ID+35UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_RESPONSE ((LAST_SBX_ERROR_ID+35UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_MULT_RESPONSES ((LAST_SBX_ERROR_ID+36UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_MULT_RESPONSES ((LAST_SBX_ERROR_ID+36UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_CHANNEL_LOCKED ((LAST_SBX_ERROR_ID+37UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_CHANNEL_LOCKED ((LAST_SBX_ERROR_ID+37UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NOTPROCESSED ((LAST_SBX_ERROR_ID+38UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NOTPROCESSED ((LAST_SBX_ERROR_ID+38UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_TIMEOUT ((LAST_SBX_ERROR_ID+39UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_TIMEOUT ((LAST_SBX_ERROR_ID+39UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_USER_INTERRUPT ((LAST_SBX_ERROR_ID+40UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_USER_INTERRUPT ((LAST_SBX_ERROR_ID+40UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_BUSY ((LAST_SBX_ERROR_ID+41UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_BUSY ((LAST_SBX_ERROR_ID+41UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_DATA ((LAST_SBX_ERROR_ID+42UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_DATA ((LAST_SBX_ERROR_ID+42UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT ((LAST_SBX_ERROR_ID+43UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT ((LAST_SBX_ERROR_ID+43UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_PARTNER_QUIT ((LAST_SBX_ERROR_ID+44UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_PARTNER_QUIT ((LAST_SBX_ERROR_ID+44UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_CONV_CLOSED ((LAST_SBX_ERROR_ID+45UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_CONV_CLOSED ((LAST_SBX_ERROR_ID+45UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_CHANNEL ((LAST_SBX_ERROR_ID+46UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_CHANNEL ((LAST_SBX_ERROR_ID+46UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_INVALID_LINK ((LAST_SBX_ERROR_ID+47UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_INVALID_LINK ((LAST_SBX_ERROR_ID+47UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_QUEUE_OVERFLOW ((LAST_SBX_ERROR_ID+48UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_QUEUE_OVERFLOW ((LAST_SBX_ERROR_ID+48UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_LINK_ALREADY_EST ((LAST_SBX_ERROR_ID+49UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_LINK_ALREADY_EST ((LAST_SBX_ERROR_ID+49UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_LINK_INV_TOPIC ((LAST_SBX_ERROR_ID+50UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_LINK_INV_TOPIC ((LAST_SBX_ERROR_ID+50UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_DLL_NOT_FOUND ((LAST_SBX_ERROR_ID+51UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_DLL_NOT_FOUND ((LAST_SBX_ERROR_ID+51UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_NEEDS_OBJECT ((LAST_SBX_ERROR_ID+52UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Object required -#define ERRCODE_BASIC_BAD_ORDINAL ((LAST_SBX_ERROR_ID+53UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Invalid ordinal -#define ERRCODE_BASIC_DLLPROC_NOT_FOUND ((LAST_SBX_ERROR_ID+54UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Specified DLL function not found -#define ERRCODE_BASIC_BAD_CLIPBD_FORMAT ((LAST_SBX_ERROR_ID+55UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Invalid clipboard format +#define ERRCODE_BASIC_NEEDS_OBJECT ((LAST_SBX_ERROR_ID+52UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Object required +#define ERRCODE_BASIC_BAD_ORDINAL ((LAST_SBX_ERROR_ID+53UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Invalid ordinal +#define ERRCODE_BASIC_DLLPROC_NOT_FOUND ((LAST_SBX_ERROR_ID+54UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Specified DLL function not found +#define ERRCODE_BASIC_BAD_CLIPBD_FORMAT ((LAST_SBX_ERROR_ID+55UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Invalid clipboard format // Debugger messages from 700-799 -#define ERRCODE_BASIC_PROPERTY_NOT_FOUND ((LAST_SBX_ERROR_ID+56UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Class not have property -#define ERRCODE_BASIC_METHOD_NOT_FOUND ((LAST_SBX_ERROR_ID+57UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Class does not have method -#define ERRCODE_BASIC_ARG_MISSING ((LAST_SBX_ERROR_ID+58UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Missing required argument -#define ERRCODE_BASIC_BAD_NUMBER_OF_ARGS ((LAST_SBX_ERROR_ID+59UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad number of arguments -#define ERRCODE_BASIC_METHOD_FAILED ((LAST_SBX_ERROR_ID+60UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Method failed -#define ERRCODE_BASIC_SETPROP_FAILED ((LAST_SBX_ERROR_ID+61UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Unable to set property -#define ERRCODE_BASIC_GETPROP_FAILED ((LAST_SBX_ERROR_ID+62UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Unable to get property +#define ERRCODE_BASIC_PROPERTY_NOT_FOUND ((LAST_SBX_ERROR_ID+56UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Class not have property +#define ERRCODE_BASIC_METHOD_NOT_FOUND ((LAST_SBX_ERROR_ID+57UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Class does not have method +#define ERRCODE_BASIC_ARG_MISSING ((LAST_SBX_ERROR_ID+58UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Missing required argument +#define ERRCODE_BASIC_BAD_NUMBER_OF_ARGS ((LAST_SBX_ERROR_ID+59UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad number of arguments +#define ERRCODE_BASIC_METHOD_FAILED ((LAST_SBX_ERROR_ID+60UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Method failed +#define ERRCODE_BASIC_SETPROP_FAILED ((LAST_SBX_ERROR_ID+61UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Unable to set property +#define ERRCODE_BASIC_GETPROP_FAILED ((LAST_SBX_ERROR_ID+62UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Unable to get property // Compiler Errors (do not occure at runtime) // These IDs can shift at any time -#define ERRCODE_BASIC_UNEXPECTED ((LAST_SBX_ERROR_ID+63UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Unexpected symbol: xx -// #define ERRCODE_BASIC_COMPILER_BGN ERRCODE_BASIC_UNEXPECTED -#define ERRCODE_BASIC_EXPECTED ((LAST_SBX_ERROR_ID+64UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Expected: xx -#define ERRCODE_BASIC_SYMBOL_EXPECTED ((LAST_SBX_ERROR_ID+65UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Symbol expected -#define ERRCODE_BASIC_VAR_EXPECTED ((LAST_SBX_ERROR_ID+66UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Variable expected -#define ERRCODE_BASIC_LABEL_EXPECTED ((LAST_SBX_ERROR_ID+67UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Label expected -#define ERRCODE_BASIC_LVALUE_EXPECTED ((LAST_SBX_ERROR_ID+68UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Lvalue expected -#define ERRCODE_BASIC_VAR_DEFINED ((LAST_SBX_ERROR_ID+69UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Variable xxx already defined -#define ERRCODE_BASIC_PROC_DEFINED ((LAST_SBX_ERROR_ID+70UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Procedure xx already defined -#define ERRCODE_BASIC_LABEL_DEFINED ((LAST_SBX_ERROR_ID+71UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Label xxx already defined -#define ERRCODE_BASIC_UNDEF_VAR ((LAST_SBX_ERROR_ID+72UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Variable xx undefined -#define ERRCODE_BASIC_UNDEF_ARRAY ((LAST_SBX_ERROR_ID+73UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Array or function xx undefined -#define ERRCODE_BASIC_UNDEF_PROC ((LAST_SBX_ERROR_ID+74UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Procedure xxx undefined -#define ERRCODE_BASIC_UNDEF_LABEL ((LAST_SBX_ERROR_ID+75UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Label xxx undefined -#define ERRCODE_BASIC_UNDEF_TYPE ((LAST_SBX_ERROR_ID+76UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Unknown user defined type xxx -#define ERRCODE_BASIC_BAD_EXIT ((LAST_SBX_ERROR_ID+77UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Exit XXX expected -#define ERRCODE_BASIC_BAD_BLOCK ((LAST_SBX_ERROR_ID+78UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Unterminated statement block: missing XX -#define ERRCODE_BASIC_BAD_BRACKETS ((LAST_SBX_ERROR_ID+79UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Parentheses do not match -#define ERRCODE_BASIC_BAD_DECLARATION ((LAST_SBX_ERROR_ID+80UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Symbol xx defined differently -#define ERRCODE_BASIC_BAD_PARAMETERS ((LAST_SBX_ERROR_ID+81UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Parameters do not match -#define ERRCODE_BASIC_BAD_CHAR_IN_NUMBER ((LAST_SBX_ERROR_ID+82UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Bad character in number -#define ERRCODE_BASIC_MUST_HAVE_DIMS ((LAST_SBX_ERROR_ID+83UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Array needs dimensioning -#define ERRCODE_BASIC_NO_IF ((LAST_SBX_ERROR_ID+84UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Else/Endif without If -#define ERRCODE_BASIC_NOT_IN_SUBR ((LAST_SBX_ERROR_ID+85UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // xxx not allowed within a sub -#define ERRCODE_BASIC_NOT_IN_MAIN ((LAST_SBX_ERROR_ID+86UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // xxx not allowed outside a sub -#define ERRCODE_BASIC_WRONG_DIMS ((LAST_SBX_ERROR_ID+87UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Dimensions do not match -#define ERRCODE_BASIC_BAD_OPTION ((LAST_SBX_ERROR_ID+88UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Unknown option: xxx -#define ERRCODE_BASIC_CONSTANT_REDECLARED ((LAST_SBX_ERROR_ID+89UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Constant xx redeclared -#define ERRCODE_BASIC_PROG_TOO_LARGE ((LAST_SBX_ERROR_ID+90UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Program is too large -#define ERRCODE_BASIC_NO_STRINGS_ARRAYS ((LAST_SBX_ERROR_ID+91UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNEXPECTED ((LAST_SBX_ERROR_ID+63UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Unexpected symbol: xx +// #define ERRCODE_BASIC_COMPILER_BGN ERRCODE_BASIC_UNEXPECTED +#define ERRCODE_BASIC_EXPECTED ((LAST_SBX_ERROR_ID+64UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Expected: xx +#define ERRCODE_BASIC_SYMBOL_EXPECTED ((LAST_SBX_ERROR_ID+65UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Symbol expected +#define ERRCODE_BASIC_VAR_EXPECTED ((LAST_SBX_ERROR_ID+66UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Variable expected +#define ERRCODE_BASIC_LABEL_EXPECTED ((LAST_SBX_ERROR_ID+67UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Label expected +#define ERRCODE_BASIC_LVALUE_EXPECTED ((LAST_SBX_ERROR_ID+68UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Lvalue expected +#define ERRCODE_BASIC_VAR_DEFINED ((LAST_SBX_ERROR_ID+69UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Variable xxx already defined +#define ERRCODE_BASIC_PROC_DEFINED ((LAST_SBX_ERROR_ID+70UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Procedure xx already defined +#define ERRCODE_BASIC_LABEL_DEFINED ((LAST_SBX_ERROR_ID+71UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Label xxx already defined +#define ERRCODE_BASIC_UNDEF_VAR ((LAST_SBX_ERROR_ID+72UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Variable xx undefined +#define ERRCODE_BASIC_UNDEF_ARRAY ((LAST_SBX_ERROR_ID+73UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Array or function xx undefined +#define ERRCODE_BASIC_UNDEF_PROC ((LAST_SBX_ERROR_ID+74UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Procedure xxx undefined +#define ERRCODE_BASIC_UNDEF_LABEL ((LAST_SBX_ERROR_ID+75UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Label xxx undefined +#define ERRCODE_BASIC_UNDEF_TYPE ((LAST_SBX_ERROR_ID+76UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Unknown user defined type xxx +#define ERRCODE_BASIC_BAD_EXIT ((LAST_SBX_ERROR_ID+77UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Exit XXX expected +#define ERRCODE_BASIC_BAD_BLOCK ((LAST_SBX_ERROR_ID+78UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Unterminated statement block: missing XX +#define ERRCODE_BASIC_BAD_BRACKETS ((LAST_SBX_ERROR_ID+79UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Parentheses do not match +#define ERRCODE_BASIC_BAD_DECLARATION ((LAST_SBX_ERROR_ID+80UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Symbol xx defined differently +#define ERRCODE_BASIC_BAD_PARAMETERS ((LAST_SBX_ERROR_ID+81UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Parameters do not match +#define ERRCODE_BASIC_BAD_CHAR_IN_NUMBER ((LAST_SBX_ERROR_ID+82UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Bad character in number +#define ERRCODE_BASIC_MUST_HAVE_DIMS ((LAST_SBX_ERROR_ID+83UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Array needs dimensioning +#define ERRCODE_BASIC_NO_IF ((LAST_SBX_ERROR_ID+84UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Else/Endif without If +#define ERRCODE_BASIC_NOT_IN_SUBR ((LAST_SBX_ERROR_ID+85UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // xxx not allowed within a sub +#define ERRCODE_BASIC_NOT_IN_MAIN ((LAST_SBX_ERROR_ID+86UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // xxx not allowed outside a sub +#define ERRCODE_BASIC_WRONG_DIMS ((LAST_SBX_ERROR_ID+87UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Dimensions do not match +#define ERRCODE_BASIC_BAD_OPTION ((LAST_SBX_ERROR_ID+88UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Unknown option: xxx +#define ERRCODE_BASIC_CONSTANT_REDECLARED ((LAST_SBX_ERROR_ID+89UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Constant xx redeclared +#define ERRCODE_BASIC_PROG_TOO_LARGE ((LAST_SBX_ERROR_ID+90UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Program is too large +#define ERRCODE_BASIC_NO_STRINGS_ARRAYS ((LAST_SBX_ERROR_ID+91UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) -#define ERRCODE_BASIC_EXCEPTION ((LAST_SBX_ERROR_ID+92UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_EXCEPTION ((LAST_SBX_ERROR_ID+92UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASMGR_STDLIBOPEN (LAST_SBX_ERROR_ID+93UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_STDLIBSAVE (LAST_SBX_ERROR_ID+94UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_LIBLOAD (LAST_SBX_ERROR_ID+95UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_LIBCREATE (LAST_SBX_ERROR_ID+96UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_LIBSAVE (LAST_SBX_ERROR_ID+97UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_LIBDEL (LAST_SBX_ERROR_ID+98UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_MGROPEN (LAST_SBX_ERROR_ID+99UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_MGRSAVE (LAST_SBX_ERROR_ID+100UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_REMOVELIB (LAST_SBX_ERROR_ID+101UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASMGR_UNLOADLIB (LAST_SBX_ERROR_ID+102UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_STDLIBOPEN (LAST_SBX_ERROR_ID+93UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_STDLIBSAVE (LAST_SBX_ERROR_ID+94UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_LIBLOAD (LAST_SBX_ERROR_ID+95UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_LIBCREATE (LAST_SBX_ERROR_ID+96UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_LIBSAVE (LAST_SBX_ERROR_ID+97UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_LIBDEL (LAST_SBX_ERROR_ID+98UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_MGROPEN (LAST_SBX_ERROR_ID+99UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_MGRSAVE (LAST_SBX_ERROR_ID+100UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_REMOVELIB (LAST_SBX_ERROR_ID+101UL) | ERRCODE_AREA_SBX +#define ERRCODE_BASMGR_UNLOADLIB (LAST_SBX_ERROR_ID+102UL) | ERRCODE_AREA_SBX -#define ERRCODE_BASIC_ARRAY_FIX ((LAST_SBX_ERROR_ID+104UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // This array is fixed -#define ERRCODE_BASIC_STRING_OVERFLOW ((LAST_SBX_ERROR_ID+105UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Out of string space -#define ERRCODE_BASIC_EXPR_TOO_COMPLEX ((LAST_SBX_ERROR_ID+106UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Expression too complex -#define ERRCODE_BASIC_OPER_NOT_PERFORM ((LAST_SBX_ERROR_ID+107UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Can't perform requested operation -#define ERRCODE_BASIC_TOO_MANY_DLL ((LAST_SBX_ERROR_ID+108UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Too many dll application clients -#define ERRCODE_BASIC_LOOP_NOT_INIT ((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // For loop not initialized +#define ERRCODE_BASIC_ARRAY_FIX ((LAST_SBX_ERROR_ID+104UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // This array is fixed +#define ERRCODE_BASIC_STRING_OVERFLOW ((LAST_SBX_ERROR_ID+105UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Out of string space +#define ERRCODE_BASIC_EXPR_TOO_COMPLEX ((LAST_SBX_ERROR_ID+106UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Expression too complex +#define ERRCODE_BASIC_OPER_NOT_PERFORM ((LAST_SBX_ERROR_ID+107UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Can't perform requested operation +#define ERRCODE_BASIC_TOO_MANY_DLL ((LAST_SBX_ERROR_ID+108UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Too many dll application clients +#define ERRCODE_BASIC_LOOP_NOT_INIT ((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // For loop not initialized -#define ERRCODE_BASIC_COMPAT ((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME) +#define ERRCODE_BASIC_COMPAT ((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME) // Map old codes to new codes -#define SbERR_SYNTAX ERRCODE_BASIC_SYNTAX -#define SbERR_NO_GOSUB ERRCODE_BASIC_NO_GOSUB -#define SbERR_REDO_FROM_START ERRCODE_BASIC_REDO_FROM_START -#define SbERR_BAD_ARGUMENT ERRCODE_BASIC_BAD_ARGUMENT -#define SbERR_MATH_OVERFLOW ERRCODE_BASIC_MATH_OVERFLOW -#define SbERR_NO_MEMORY ERRCODE_BASIC_NO_MEMORY -#define SbERR_ALREADY_DIM ERRCODE_BASIC_ALREADY_DIM -#define SbERR_OUT_OF_RANGE ERRCODE_BASIC_OUT_OF_RANGE -#define SbERR_DUPLICATE_DEF ERRCODE_BASIC_DUPLICATE_DEF -#define SbERR_ZERODIV ERRCODE_BASIC_ZERODIV -#define SbERR_VAR_UNDEFINED ERRCODE_BASIC_VAR_UNDEFINED -#define SbERR_CONVERSION ERRCODE_BASIC_CONVERSION -#define SbERR_BAD_PARAMETER ERRCODE_BASIC_BAD_PARAMETER -#define SbERR_USER_ABORT ERRCODE_BASIC_USER_ABORT -#define SbERR_BAD_RESUME ERRCODE_BASIC_BAD_RESUME -#define SbERR_STACK_OVERFLOW ERRCODE_BASIC_STACK_OVERFLOW -#define SbERR_PROC_UNDEFINED ERRCODE_BASIC_PROC_UNDEFINED +#define SbERR_SYNTAX ERRCODE_BASIC_SYNTAX +#define SbERR_NO_GOSUB ERRCODE_BASIC_NO_GOSUB +#define SbERR_REDO_FROM_START ERRCODE_BASIC_REDO_FROM_START +#define SbERR_BAD_ARGUMENT ERRCODE_BASIC_BAD_ARGUMENT +#define SbERR_MATH_OVERFLOW ERRCODE_BASIC_MATH_OVERFLOW +#define SbERR_NO_MEMORY ERRCODE_BASIC_NO_MEMORY +#define SbERR_ALREADY_DIM ERRCODE_BASIC_ALREADY_DIM +#define SbERR_OUT_OF_RANGE ERRCODE_BASIC_OUT_OF_RANGE +#define SbERR_DUPLICATE_DEF ERRCODE_BASIC_DUPLICATE_DEF +#define SbERR_ZERODIV ERRCODE_BASIC_ZERODIV +#define SbERR_VAR_UNDEFINED ERRCODE_BASIC_VAR_UNDEFINED +#define SbERR_CONVERSION ERRCODE_BASIC_CONVERSION +#define SbERR_BAD_PARAMETER ERRCODE_BASIC_BAD_PARAMETER +#define SbERR_USER_ABORT ERRCODE_BASIC_USER_ABORT +#define SbERR_BAD_RESUME ERRCODE_BASIC_BAD_RESUME +#define SbERR_STACK_OVERFLOW ERRCODE_BASIC_STACK_OVERFLOW +#define SbERR_PROC_UNDEFINED ERRCODE_BASIC_PROC_UNDEFINED #define SbERR_BAD_DLL_LOAD ERRCODE_BASIC_BAD_DLL_LOAD -#define SbERR_BAD_DLL_CALL ERRCODE_BASIC_BAD_DLL_CALL +#define SbERR_BAD_DLL_CALL ERRCODE_BASIC_BAD_DLL_CALL #define SbERR_INTERNAL_ERROR ERRCODE_BASIC_INTERNAL_ERROR #define SbERR_BAD_CHANNEL ERRCODE_BASIC_BAD_CHANNEL -#define SbERR_FILE_NOT_FOUND ERRCODE_BASIC_FILE_NOT_FOUND -#define SbERR_BAD_FILE_MODE ERRCODE_BASIC_BAD_FILE_MODE -#define SbERR_FILE_ALREADY_OPEN ERRCODE_BASIC_FILE_ALREADY_OPEN -#define SbERR_IO_ERROR ERRCODE_BASIC_IO_ERROR -#define SbERR_FILE_EXISTS ERRCODE_BASIC_FILE_EXISTS +#define SbERR_FILE_NOT_FOUND ERRCODE_BASIC_FILE_NOT_FOUND +#define SbERR_BAD_FILE_MODE ERRCODE_BASIC_BAD_FILE_MODE +#define SbERR_FILE_ALREADY_OPEN ERRCODE_BASIC_FILE_ALREADY_OPEN +#define SbERR_IO_ERROR ERRCODE_BASIC_IO_ERROR +#define SbERR_FILE_EXISTS ERRCODE_BASIC_FILE_EXISTS #define SbERR_BAD_RECORD_LENGTH ERRCODE_BASIC_BAD_RECORD_LENGTH -#define SbERR_DISK_FULL ERRCODE_BASIC_DISK_FULL -#define SbERR_READ_PAST_EOF ERRCODE_BASIC_READ_PAST_EOF +#define SbERR_DISK_FULL ERRCODE_BASIC_DISK_FULL +#define SbERR_READ_PAST_EOF ERRCODE_BASIC_READ_PAST_EOF #define SbERR_BAD_RECORD_NUMBER ERRCODE_BASIC_BAD_RECORD_NUMBER -#define SbERR_TOO_MANY_FILES ERRCODE_BASIC_TOO_MANY_FILES +#define SbERR_TOO_MANY_FILES ERRCODE_BASIC_TOO_MANY_FILES #define SbERR_NO_DEVICE ERRCODE_BASIC_NO_DEVICE -#define SbERR_ACCESS_DENIED ERRCODE_BASIC_ACCESS_DENIED -#define SbERR_NOT_READY ERRCODE_BASIC_NOT_READY +#define SbERR_ACCESS_DENIED ERRCODE_BASIC_ACCESS_DENIED +#define SbERR_NOT_READY ERRCODE_BASIC_NOT_READY #define SbERR_NOT_IMPLEMENTED ERRCODE_BASIC_NOT_IMPLEMENTED -#define SbERR_DIFFERENT_DRIVE ERRCODE_BASIC_DIFFERENT_DRIVE -#define SbERR_ACCESS_ERROR ERRCODE_BASIC_ACCESS_ERROR -#define SbERR_PATH_NOT_FOUND ERRCODE_BASIC_PATH_NOT_FOUND -#define SbERR_NO_OBJECT ERRCODE_BASIC_NO_OBJECT +#define SbERR_DIFFERENT_DRIVE ERRCODE_BASIC_DIFFERENT_DRIVE +#define SbERR_ACCESS_ERROR ERRCODE_BASIC_ACCESS_ERROR +#define SbERR_PATH_NOT_FOUND ERRCODE_BASIC_PATH_NOT_FOUND +#define SbERR_NO_OBJECT ERRCODE_BASIC_NO_OBJECT #define SbERR_BAD_PATTERN ERRCODE_BASIC_BAD_PATTERN -#define SBERR_IS_NULL ERRCODE_BASIC_IS_NULL +#define SBERR_IS_NULL ERRCODE_BASIC_IS_NULL #define SbERR_DDE_ERROR ERRCODE_BASIC_DDE_ERROR #define SbERR_DDE_WAITINGACK ERRCODE_BASIC_DDE_WAITINGACK #define SbERR_DDE_OUTOFCHANNELS ERRCODE_BASIC_DDE_OUTOFCHANNELS @@ -352,209 +352,209 @@ typedef ULONG SbError; #define SbERR_DDE_LINK_ALREADY_EST ERRCODE_BASIC_DDE_LINK_ALREADY_EST #define SbERR_DDE_LINK_INV_TOPIC ERRCODE_BASIC_DDE_LINK_INV_TOPIC #define SbERR_DDE_DLL_NOT_FOUND ERRCODE_BASIC_DDE_DLL_NOT_FOUND -#define SbERR_CANNOT_LOAD ERRCODE_BASIC_CANNOT_LOAD -#define SbERR_BAD_INDEX ERRCODE_BASIC_BAD_INDEX +#define SbERR_CANNOT_LOAD ERRCODE_BASIC_CANNOT_LOAD +#define SbERR_BAD_INDEX ERRCODE_BASIC_BAD_INDEX #define SbERR_NO_ACTIVE_OBJECT ERRCODE_BASIC_NO_ACTIVE_OBJECT -#define SbERR_BAD_PROP_VALUE ERRCODE_BASIC_BAD_PROP_VALUE -#define SbERR_PROP_READONLY ERRCODE_BASIC_PROP_READONLY -#define SbERR_PROP_WRITEONLY ERRCODE_BASIC_PROP_WRITEONLY -#define SbERR_INVALID_OBJECT ERRCODE_BASIC_INVALID_OBJECT -#define SbERR_NO_METHOD ERRCODE_BASIC_NO_METHOD -#define SbERR_NEEDS_OBJECT ERRCODE_BASIC_NEEDS_OBJECT -#define SbERR_INVALID_USAGE_OBJECT ERRCODE_BASIC_INVALID_USAGE_OBJECT -#define SbERR_NO_OLE ERRCODE_BASIC_NO_OLE -#define SbERR_BAD_METHOD ERRCODE_BASIC_BAD_METHOD -#define SbERR_OLE_ERROR ERRCODE_BASIC_OLE_ERROR -#define SbERR_BAD_ACTION ERRCODE_BASIC_BAD_ACTION -#define SbERR_NO_NAMED_ARGS ERRCODE_BASIC_NO_NAMED_ARGS -#define SbERR_BAD_LOCALE ERRCODE_BASIC_BAD_LOCALE -#define SbERR_NAMED_NOT_FOUND ERRCODE_BASIC_NAMED_NOT_FOUND -#define SbERR_NOT_OPTIONAL ERRCODE_BASIC_NOT_OPTIONAL -#define SbERR_WRONG_ARGS ERRCODE_BASIC_WRONG_ARGS -#define SbERR_NOT_A_COLL ERRCODE_BASIC_NOT_A_COLL -#define SbERR_BAD_ORDINAL ERRCODE_BASIC_BAD_ORDINAL -#define SbERR_DLLPROC_NOT_FOUND ERRCODE_BASIC_DLLPROC_NOT_FOUND +#define SbERR_BAD_PROP_VALUE ERRCODE_BASIC_BAD_PROP_VALUE +#define SbERR_PROP_READONLY ERRCODE_BASIC_PROP_READONLY +#define SbERR_PROP_WRITEONLY ERRCODE_BASIC_PROP_WRITEONLY +#define SbERR_INVALID_OBJECT ERRCODE_BASIC_INVALID_OBJECT +#define SbERR_NO_METHOD ERRCODE_BASIC_NO_METHOD +#define SbERR_NEEDS_OBJECT ERRCODE_BASIC_NEEDS_OBJECT +#define SbERR_INVALID_USAGE_OBJECT ERRCODE_BASIC_INVALID_USAGE_OBJECT +#define SbERR_NO_OLE ERRCODE_BASIC_NO_OLE +#define SbERR_BAD_METHOD ERRCODE_BASIC_BAD_METHOD +#define SbERR_OLE_ERROR ERRCODE_BASIC_OLE_ERROR +#define SbERR_BAD_ACTION ERRCODE_BASIC_BAD_ACTION +#define SbERR_NO_NAMED_ARGS ERRCODE_BASIC_NO_NAMED_ARGS +#define SbERR_BAD_LOCALE ERRCODE_BASIC_BAD_LOCALE +#define SbERR_NAMED_NOT_FOUND ERRCODE_BASIC_NAMED_NOT_FOUND +#define SbERR_NOT_OPTIONAL ERRCODE_BASIC_NOT_OPTIONAL +#define SbERR_WRONG_ARGS ERRCODE_BASIC_WRONG_ARGS +#define SbERR_NOT_A_COLL ERRCODE_BASIC_NOT_A_COLL +#define SbERR_BAD_ORDINAL ERRCODE_BASIC_BAD_ORDINAL +#define SbERR_DLLPROC_NOT_FOUND ERRCODE_BASIC_DLLPROC_NOT_FOUND #define SbERR_BAD_CLIPBD_FORMAT ERRCODE_BASIC_BAD_CLIPBD_FORMAT -#define SbERR_PROPERTY_NOT_FOUND ERRCODE_BASIC_PROPERTY_NOT_FOUND -#define SbERR_METHOD_NOT_FOUND ERRCODE_BASIC_METHOD_NOT_FOUND -#define SbERR_ARG_MISSING ERRCODE_BASIC_ARG_MISSING -#define SbERR_BAD_NUMBER_OF_ARGS ERRCODE_BASIC_BAD_NUMBER_OF_ARGS -#define SbERR_METHOD_FAILED ERRCODE_BASIC_METHOD_FAILED -#define SbERR_SETPROP_FAILED ERRCODE_BASIC_SETPROP_FAILED -#define SbERR_GETPROP_FAILED ERRCODE_BASIC_GETPROP_FAILED -// #define SbERR_COMPILER_BGN ERRCODE_BASIC_COMPILER_BGN +#define SbERR_PROPERTY_NOT_FOUND ERRCODE_BASIC_PROPERTY_NOT_FOUND +#define SbERR_METHOD_NOT_FOUND ERRCODE_BASIC_METHOD_NOT_FOUND +#define SbERR_ARG_MISSING ERRCODE_BASIC_ARG_MISSING +#define SbERR_BAD_NUMBER_OF_ARGS ERRCODE_BASIC_BAD_NUMBER_OF_ARGS +#define SbERR_METHOD_FAILED ERRCODE_BASIC_METHOD_FAILED +#define SbERR_SETPROP_FAILED ERRCODE_BASIC_SETPROP_FAILED +#define SbERR_GETPROP_FAILED ERRCODE_BASIC_GETPROP_FAILED +// #define SbERR_COMPILER_BGN ERRCODE_BASIC_COMPILER_BGN #define SbERR_UNEXPECTED ERRCODE_BASIC_UNEXPECTED #define SbERR_EXPECTED ERRCODE_BASIC_EXPECTED #define SbERR_SYMBOL_EXPECTED ERRCODE_BASIC_SYMBOL_EXPECTED -#define SbERR_VAR_EXPECTED ERRCODE_BASIC_VAR_EXPECTED +#define SbERR_VAR_EXPECTED ERRCODE_BASIC_VAR_EXPECTED #define SbERR_LABEL_EXPECTED ERRCODE_BASIC_LABEL_EXPECTED -#define SbERR_LVALUE_EXPECTED ERRCODE_BASIC_LVALUE_EXPECTED -#define SbERR_VAR_DEFINED ERRCODE_BASIC_VAR_DEFINED -#define SbERR_PROC_DEFINED ERRCODE_BASIC_PROC_DEFINED -#define SbERR_LABEL_DEFINED ERRCODE_BASIC_LABEL_DEFINED -#define SbERR_UNDEF_VAR ERRCODE_BASIC_UNDEF_VAR -#define SbERR_UNDEF_ARRAY ERRCODE_BASIC_UNDEF_ARRAY -#define SbERR_UNDEF_PROC ERRCODE_BASIC_UNDEF_PROC -#define SbERR_UNDEF_LABEL ERRCODE_BASIC_UNDEF_LABEL -#define SbERR_UNDEF_TYPE ERRCODE_BASIC_UNDEF_TYPE -#define SbERR_BAD_EXIT ERRCODE_BASIC_BAD_EXIT -#define SbERR_BAD_BLOCK ERRCODE_BASIC_BAD_BLOCK -#define SbERR_BAD_BRACKETS ERRCODE_BASIC_BAD_BRACKETS -#define SbERR_BAD_DECLARATION ERRCODE_BASIC_BAD_DECLARATION -#define SbERR_BAD_PARAMETERS ERRCODE_BASIC_BAD_PARAMETERS +#define SbERR_LVALUE_EXPECTED ERRCODE_BASIC_LVALUE_EXPECTED +#define SbERR_VAR_DEFINED ERRCODE_BASIC_VAR_DEFINED +#define SbERR_PROC_DEFINED ERRCODE_BASIC_PROC_DEFINED +#define SbERR_LABEL_DEFINED ERRCODE_BASIC_LABEL_DEFINED +#define SbERR_UNDEF_VAR ERRCODE_BASIC_UNDEF_VAR +#define SbERR_UNDEF_ARRAY ERRCODE_BASIC_UNDEF_ARRAY +#define SbERR_UNDEF_PROC ERRCODE_BASIC_UNDEF_PROC +#define SbERR_UNDEF_LABEL ERRCODE_BASIC_UNDEF_LABEL +#define SbERR_UNDEF_TYPE ERRCODE_BASIC_UNDEF_TYPE +#define SbERR_BAD_EXIT ERRCODE_BASIC_BAD_EXIT +#define SbERR_BAD_BLOCK ERRCODE_BASIC_BAD_BLOCK +#define SbERR_BAD_BRACKETS ERRCODE_BASIC_BAD_BRACKETS +#define SbERR_BAD_DECLARATION ERRCODE_BASIC_BAD_DECLARATION +#define SbERR_BAD_PARAMETERS ERRCODE_BASIC_BAD_PARAMETERS #define SbERR_BAD_CHAR_IN_NUMBER ERRCODE_BASIC_BAD_CHAR_IN_NUMBER -#define SbERR_MUST_HAVE_DIMS ERRCODE_BASIC_MUST_HAVE_DIMS -#define SbERR_NO_IF ERRCODE_BASIC_NO_IF -#define SbERR_NOT_IN_SUBR ERRCODE_BASIC_NOT_IN_SUBR -#define SbERR_NOT_IN_MAIN ERRCODE_BASIC_NOT_IN_MAIN -#define SbERR_WRONG_DIMS ERRCODE_BASIC_WRONG_DIMS -#define SbERR_BAD_OPTION ERRCODE_BASIC_BAD_OPTION -#define SbERR_CONSTANT_REDECLARED ERRCODE_BASIC_CONSTANT_REDECLARED -#define SbERR_PROG_TOO_LARGE ERRCODE_BASIC_PROG_TOO_LARGE -#define SbERR_NO_STRINGS_ARRAYS ERRCODE_BASIC_NO_STRINGS_ARRAYS -#define SbERR_BASIC_EXCEPTION ERRCODE_BASIC_EXCEPTION -#define SbERR_BASIC_COMPAT ERRCODE_BASIC_COMPAT -#define SbERR_BASIC_ARRAY_FIX ERRCODE_BASIC_ARRAY_FIX -#define SbERR_BASIC_STRING_OVERFLOW ERRCODE_BASIC_STRING_OVERFLOW -#define SbERR_BASIC_EXPR_TOO_COMPLEX ERRCODE_BASIC_EXPR_TOO_COMPLEX -#define SbERR_BASIC_OPER_NOT_PERFORM ERRCODE_BASIC_OPER_NOT_PERFORM -#define SbERR_BASIC_TOO_MANY_DLL ERRCODE_BASIC_TOO_MANY_DLL -#define SbERR_BASIC_LOOP_NOT_INIT ERRCODE_BASIC_LOOP_NOT_INIT -// #define SbERR_COMPILER_END ERRCODE_BASIC_COMPILER_END +#define SbERR_MUST_HAVE_DIMS ERRCODE_BASIC_MUST_HAVE_DIMS +#define SbERR_NO_IF ERRCODE_BASIC_NO_IF +#define SbERR_NOT_IN_SUBR ERRCODE_BASIC_NOT_IN_SUBR +#define SbERR_NOT_IN_MAIN ERRCODE_BASIC_NOT_IN_MAIN +#define SbERR_WRONG_DIMS ERRCODE_BASIC_WRONG_DIMS +#define SbERR_BAD_OPTION ERRCODE_BASIC_BAD_OPTION +#define SbERR_CONSTANT_REDECLARED ERRCODE_BASIC_CONSTANT_REDECLARED +#define SbERR_PROG_TOO_LARGE ERRCODE_BASIC_PROG_TOO_LARGE +#define SbERR_NO_STRINGS_ARRAYS ERRCODE_BASIC_NO_STRINGS_ARRAYS +#define SbERR_BASIC_EXCEPTION ERRCODE_BASIC_EXCEPTION +#define SbERR_BASIC_COMPAT ERRCODE_BASIC_COMPAT +#define SbERR_BASIC_ARRAY_FIX ERRCODE_BASIC_ARRAY_FIX +#define SbERR_BASIC_STRING_OVERFLOW ERRCODE_BASIC_STRING_OVERFLOW +#define SbERR_BASIC_EXPR_TOO_COMPLEX ERRCODE_BASIC_EXPR_TOO_COMPLEX +#define SbERR_BASIC_OPER_NOT_PERFORM ERRCODE_BASIC_OPER_NOT_PERFORM +#define SbERR_BASIC_TOO_MANY_DLL ERRCODE_BASIC_TOO_MANY_DLL +#define SbERR_BASIC_LOOP_NOT_INIT ERRCODE_BASIC_LOOP_NOT_INIT +// #define SbERR_COMPILER_END ERRCODE_BASIC_COMPILER_END /* ALT -#define SbERR_SYNTAX 2 // unspecified syntax error -#define SbERR_NO_GOSUB 3 // Return without Gosub -#define SbERR_REDO_FROM_START 4 // Redo form start (SB internal) -#define SbERR_BAD_ARGUMENT 5 // Invalid procedure call -#define SbERR_MATH_OVERFLOW 6 // Overflow -#define SbERR_NO_MEMORY 7 // Out of memory -#define SbERR_ALREADY_DIM 8 // Array already dimensioned -#define SbERR_OUT_OF_RANGE 9 // Subscript out of range -#define SbERR_DUPLICATE_DEF 10 // Duplicate definition -#define SbERR_ZERODIV 11 // Division by zero -#define SbERR_VAR_UNDEFINED 12 // Variable undefined (SB) -#define SbERR_CONVERSION 13 // Type mismatch -#define SbERR_BAD_PARAMETER 14 // Invalid Parameter -#define SbERR_USER_ABORT 18 // User interrupt occurred -#define SbERR_BAD_RESUME 20 // Resume without error -#define SbERR_STACK_OVERFLOW 28 // Out of stack space -#define SbERR_PROC_UNDEFINED 35 // Sub or Function not defined -#define SbERR_BAD_DLL_LOAD 48 // Error in loading DLL -#define SbERR_BAD_DLL_CALL 49 // Bad DLL calling convention -#define SbERR_INTERNAL_ERROR 51 // internal error -#define SbERR_BAD_CHANNEL 52 // Bad file name or number -#define SbERR_FILE_NOT_FOUND 53 // File not found -#define SbERR_BAD_FILE_MODE 54 // Bad file mode -#define SbERR_FILE_ALREADY_OPEN 55 // File already open -#define SbERR_IO_ERROR 57 // Device I/O error -#define SbERR_FILE_EXISTS 58 // File already exists -#define SbERR_BAD_RECORD_LENGTH 59 // bad record length -#define SbERR_DISK_FULL 61 // disk full -#define SbERR_READ_PAST_EOF 62 // Input past end of file -#define SbERR_BAD_RECORD_NUMBER 63 // Bad record number -#define SbERR_TOO_MANY_FILES 67 // Too many files -#define SbERR_NO_DEVICE 68 // Device not available -#define SbERR_ACCESS_DENIED 70 // Permission denied -#define SbERR_NOT_READY 71 // Disk not ready -#define SbERR_NOT_IMPLEMENTED 73 // Feature not implemented -#define SbERR_DIFFERENT_DRIVE 74 // No rename with different drive -#define SbERR_ACCESS_ERROR 75 // Path/File access error -#define SbERR_PATH_NOT_FOUND 76 // Path not found -#define SbERR_NO_OBJECT 91 // Object variable not set -#define SbERR_BAD_PATTERN 93 // Invalid pattern string -#define SBERR_IS_NULL 94 // Invalid use of Null +#define SbERR_SYNTAX 2 // unspecified syntax error +#define SbERR_NO_GOSUB 3 // Return without Gosub +#define SbERR_REDO_FROM_START 4 // Redo form start (SB internal) +#define SbERR_BAD_ARGUMENT 5 // Invalid procedure call +#define SbERR_MATH_OVERFLOW 6 // Overflow +#define SbERR_NO_MEMORY 7 // Out of memory +#define SbERR_ALREADY_DIM 8 // Array already dimensioned +#define SbERR_OUT_OF_RANGE 9 // Subscript out of range +#define SbERR_DUPLICATE_DEF 10 // Duplicate definition +#define SbERR_ZERODIV 11 // Division by zero +#define SbERR_VAR_UNDEFINED 12 // Variable undefined (SB) +#define SbERR_CONVERSION 13 // Type mismatch +#define SbERR_BAD_PARAMETER 14 // Invalid Parameter +#define SbERR_USER_ABORT 18 // User interrupt occurred +#define SbERR_BAD_RESUME 20 // Resume without error +#define SbERR_STACK_OVERFLOW 28 // Out of stack space +#define SbERR_PROC_UNDEFINED 35 // Sub or Function not defined +#define SbERR_BAD_DLL_LOAD 48 // Error in loading DLL +#define SbERR_BAD_DLL_CALL 49 // Bad DLL calling convention +#define SbERR_INTERNAL_ERROR 51 // internal error +#define SbERR_BAD_CHANNEL 52 // Bad file name or number +#define SbERR_FILE_NOT_FOUND 53 // File not found +#define SbERR_BAD_FILE_MODE 54 // Bad file mode +#define SbERR_FILE_ALREADY_OPEN 55 // File already open +#define SbERR_IO_ERROR 57 // Device I/O error +#define SbERR_FILE_EXISTS 58 // File already exists +#define SbERR_BAD_RECORD_LENGTH 59 // bad record length +#define SbERR_DISK_FULL 61 // disk full +#define SbERR_READ_PAST_EOF 62 // Input past end of file +#define SbERR_BAD_RECORD_NUMBER 63 // Bad record number +#define SbERR_TOO_MANY_FILES 67 // Too many files +#define SbERR_NO_DEVICE 68 // Device not available +#define SbERR_ACCESS_DENIED 70 // Permission denied +#define SbERR_NOT_READY 71 // Disk not ready +#define SbERR_NOT_IMPLEMENTED 73 // Feature not implemented +#define SbERR_DIFFERENT_DRIVE 74 // No rename with different drive +#define SbERR_ACCESS_ERROR 75 // Path/File access error +#define SbERR_PATH_NOT_FOUND 76 // Path not found +#define SbERR_NO_OBJECT 91 // Object variable not set +#define SbERR_BAD_PATTERN 93 // Invalid pattern string +#define SBERR_IS_NULL 94 // Invalid use of Null // DDE messages from 250-299 -#define SbERR_DDE_ERROR 250 -#define SbERR_DDE_WAITINGACK 280 -#define SbERR_DDE_OUTOFCHANNELS 281 -#define SbERR_DDE_NO_RESPONSE 282 -#define SbERR_DDE_MULT_RESPONSES 283 -#define SbERR_DDE_CHANNEL_LOCKED 284 -#define SbERR_DDE_NOTPROCESSED 285 -#define SbERR_DDE_TIMEOUT 286 -#define SbERR_DDE_USER_INTERRUPT 287 -#define SbERR_DDE_BUSY 288 -#define SbERR_DDE_NO_DATA 289 -#define SbERR_DDE_WRONG_DATA_FORMAT 290 -#define SbERR_DDE_PARTNER_QUIT 291 -#define SbERR_DDE_CONV_CLOSED 292 -#define SbERR_DDE_NO_CHANNEL 293 -#define SbERR_DDE_INVALID_LINK 294 -#define SbERR_DDE_QUEUE_OVERFLOW 295 -#define SbERR_DDE_LINK_ALREADY_EST 296 -#define SbERR_DDE_LINK_INV_TOPIC 297 -#define SbERR_DDE_DLL_NOT_FOUND 298 +#define SbERR_DDE_ERROR 250 +#define SbERR_DDE_WAITINGACK 280 +#define SbERR_DDE_OUTOFCHANNELS 281 +#define SbERR_DDE_NO_RESPONSE 282 +#define SbERR_DDE_MULT_RESPONSES 283 +#define SbERR_DDE_CHANNEL_LOCKED 284 +#define SbERR_DDE_NOTPROCESSED 285 +#define SbERR_DDE_TIMEOUT 286 +#define SbERR_DDE_USER_INTERRUPT 287 +#define SbERR_DDE_BUSY 288 +#define SbERR_DDE_NO_DATA 289 +#define SbERR_DDE_WRONG_DATA_FORMAT 290 +#define SbERR_DDE_PARTNER_QUIT 291 +#define SbERR_DDE_CONV_CLOSED 292 +#define SbERR_DDE_NO_CHANNEL 293 +#define SbERR_DDE_INVALID_LINK 294 +#define SbERR_DDE_QUEUE_OVERFLOW 295 +#define SbERR_DDE_LINK_ALREADY_EST 296 +#define SbERR_DDE_LINK_INV_TOPIC 297 +#define SbERR_DDE_DLL_NOT_FOUND 298 -#define SbERR_CANNOT_LOAD 323 // Can't load module -#define SbERR_BAD_INDEX 341 // Invalid object index -#define SbERR_NO_ACTIVE_OBJECT 366 // No active view or document -#define SbERR_BAD_PROP_VALUE 380 // Bad property value -#define SbERR_PROP_READONLY 382 // Property is read only -#define SbERR_PROP_WRITEONLY 394 // Property is write only -#define SbERR_INVALID_OBJECT 420 // Invalid object reference -#define SbERR_NO_METHOD 423 // Property or method not found -#define SbERR_NEEDS_OBJECT 424 // Object required -#define SbERR_INVALID_USAGE_OBJECT 425 // Invalid usee of object -#define SbERR_NO_OLE 430 // Class does not support OLE -#define SbERR_BAD_METHOD 438 // Object doesn't support method -#define SbERR_OLE_ERROR 440 // OLE Automation error -#define SbERR_BAD_ACTION 445 // Object doesn't support this action -#define SbERR_NO_NAMED_ARGS 446 // Object doesn't support named args -#define SbERR_BAD_LOCALE 447 // Object doesn't support current locale setting -#define SbERR_NAMED_NOT_FOUND 448 // Named argument not found -#define SbERR_NOT_OPTIONAL 449 // Argument not optional -#define SbERR_WRONG_ARGS 450 // Wrong number of arguments -#define SbERR_NOT_A_COLL 451 // Object not a collection -#define SbERR_BAD_ORDINAL 452 // Invalid ordinal -#define SbERR_DLLPROC_NOT_FOUND 453 // Specified DLL function not found -#define SbERR_BAD_CLIPBD_FORMAT 460 // Invalid clipboard format +#define SbERR_CANNOT_LOAD 323 // Can't load module +#define SbERR_BAD_INDEX 341 // Invalid object index +#define SbERR_NO_ACTIVE_OBJECT 366 // No active view or document +#define SbERR_BAD_PROP_VALUE 380 // Bad property value +#define SbERR_PROP_READONLY 382 // Property is read only +#define SbERR_PROP_WRITEONLY 394 // Property is write only +#define SbERR_INVALID_OBJECT 420 // Invalid object reference +#define SbERR_NO_METHOD 423 // Property or method not found +#define SbERR_NEEDS_OBJECT 424 // Object required +#define SbERR_INVALID_USAGE_OBJECT 425 // Invalid usee of object +#define SbERR_NO_OLE 430 // Class does not support OLE +#define SbERR_BAD_METHOD 438 // Object doesn't support method +#define SbERR_OLE_ERROR 440 // OLE Automation error +#define SbERR_BAD_ACTION 445 // Object doesn't support this action +#define SbERR_NO_NAMED_ARGS 446 // Object doesn't support named args +#define SbERR_BAD_LOCALE 447 // Object doesn't support current locale setting +#define SbERR_NAMED_NOT_FOUND 448 // Named argument not found +#define SbERR_NOT_OPTIONAL 449 // Argument not optional +#define SbERR_WRONG_ARGS 450 // Wrong number of arguments +#define SbERR_NOT_A_COLL 451 // Object not a collection +#define SbERR_BAD_ORDINAL 452 // Invalid ordinal +#define SbERR_DLLPROC_NOT_FOUND 453 // Specified DLL function not found +#define SbERR_BAD_CLIPBD_FORMAT 460 // Invalid clipboard format // Debugger messages from 700-799 -#define SbERR_PROPERTY_NOT_FOUND 1000 // Class not have property -#define SbERR_METHOD_NOT_FOUND 1001 // Class does not have method -#define SbERR_ARG_MISSING 1002 // Missing required argument -#define SbERR_BAD_NUMBER_OF_ARGS 1003 // Bad number of arguments -#define SbERR_METHOD_FAILED 1004 // Method failed -#define SbERR_SETPROP_FAILED 1005 // Unable to set property -#define SbERR_GETPROP_FAILED 1006 // Unable to get property +#define SbERR_PROPERTY_NOT_FOUND 1000 // Class not have property +#define SbERR_METHOD_NOT_FOUND 1001 // Class does not have method +#define SbERR_ARG_MISSING 1002 // Missing required argument +#define SbERR_BAD_NUMBER_OF_ARGS 1003 // Bad number of arguments +#define SbERR_METHOD_FAILED 1004 // Method failed +#define SbERR_SETPROP_FAILED 1005 // Unable to set property +#define SbERR_GETPROP_FAILED 1006 // Unable to get property // Compiler Errors (do not happen at runtime) // These IDs can shift at any time -#define SbERR_COMPILER_BGN 950 -#define SbERR_UNEXPECTED 951 // Unexpected symbol: xx -#define SbERR_EXPECTED 952 // Expected: xx -#define SbERR_SYMBOL_EXPECTED 953 // Symbol expected -#define SbERR_VAR_EXPECTED 954 // Variable expected -#define SbERR_LABEL_EXPECTED 955 // Label expected -#define SbERR_LVALUE_EXPECTED 956 // Lvalue expected -#define SbERR_VAR_DEFINED 957 // Variable xxx already defined -#define SbERR_PROC_DEFINED 958 // Procedure xx already defined -#define SbERR_LABEL_DEFINED 959 // Label xxx already defined -#define SbERR_UNDEF_VAR 960 // Variable xx undefined -#define SbERR_UNDEF_ARRAY 961 // Array or function xx undefined -#define SbERR_UNDEF_PROC 962 // Procedure xxx undefined -#define SbERR_UNDEF_LABEL 963 // Label xxx undefined -#define SbERR_UNDEF_TYPE 964 // Unknown user defined type xxx -#define SbERR_BAD_EXIT 965 // Exit XXX expexted -#define SbERR_BAD_BLOCK 966 // Unterminated statement block: missing XX -#define SbERR_BAD_BRACKETS 967 // Parentheses do not match -#define SbERR_BAD_DECLARATION 968 // Symbol xx defined differently -#define SbERR_BAD_PARAMETERS 969 // Parameters do not match -#define SbERR_BAD_CHAR_IN_NUMBER 970 // Bad character in number -#define SbERR_MUST_HAVE_DIMS 971 // Array needs dimensioning -#define SbERR_NO_IF 972 // Else/Endif without If -#define SbERR_NOT_IN_SUBR 973 // xxx not allowed within a sub -#define SbERR_NOT_IN_MAIN 974 // xxx not allowed outside a sub -#define SbERR_WRONG_DIMS 975 // Dimensions do not match -#define SbERR_BAD_OPTION 976 // Unknown option: xxx -#define SbERR_CONSTANT_REDECLARED 977 // Constant xx redeclared -#define SbERR_PROG_TOO_LARGE 978 // Program is too large -#define SbERR_NO_STRINGS_ARRAYS 979 -#define SbERR_COMPILER_END 299 +#define SbERR_COMPILER_BGN 950 +#define SbERR_UNEXPECTED 951 // Unexpected symbol: xx +#define SbERR_EXPECTED 952 // Expected: xx +#define SbERR_SYMBOL_EXPECTED 953 // Symbol expected +#define SbERR_VAR_EXPECTED 954 // Variable expected +#define SbERR_LABEL_EXPECTED 955 // Label expected +#define SbERR_LVALUE_EXPECTED 956 // Lvalue expected +#define SbERR_VAR_DEFINED 957 // Variable xxx already defined +#define SbERR_PROC_DEFINED 958 // Procedure xx already defined +#define SbERR_LABEL_DEFINED 959 // Label xxx already defined +#define SbERR_UNDEF_VAR 960 // Variable xx undefined +#define SbERR_UNDEF_ARRAY 961 // Array or function xx undefined +#define SbERR_UNDEF_PROC 962 // Procedure xxx undefined +#define SbERR_UNDEF_LABEL 963 // Label xxx undefined +#define SbERR_UNDEF_TYPE 964 // Unknown user defined type xxx +#define SbERR_BAD_EXIT 965 // Exit XXX expexted +#define SbERR_BAD_BLOCK 966 // Unterminated statement block: missing XX +#define SbERR_BAD_BRACKETS 967 // Parentheses do not match +#define SbERR_BAD_DECLARATION 968 // Symbol xx defined differently +#define SbERR_BAD_PARAMETERS 969 // Parameters do not match +#define SbERR_BAD_CHAR_IN_NUMBER 970 // Bad character in number +#define SbERR_MUST_HAVE_DIMS 971 // Array needs dimensioning +#define SbERR_NO_IF 972 // Else/Endif without If +#define SbERR_NOT_IN_SUBR 973 // xxx not allowed within a sub +#define SbERR_NOT_IN_MAIN 974 // xxx not allowed outside a sub +#define SbERR_WRONG_DIMS 975 // Dimensions do not match +#define SbERR_BAD_OPTION 976 // Unknown option: xxx +#define SbERR_CONSTANT_REDECLARED 977 // Constant xx redeclared +#define SbERR_PROG_TOO_LARGE 978 // Program is too large +#define SbERR_NO_STRINGS_ARRAYS 979 +#define SbERR_COMPILER_END 299 */ // Grid messages from 30000-30999 diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx index 8b1c9a9ce77f..defc2c641815 100644 --- a/basic/inc/basic/sbmeth.hxx +++ b/basic/inc/basic/sbmeth.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,13 +46,13 @@ class SbMethod : public SbxMethod friend class SbJScriptMethod; friend class SbIfaceMapperMethod; - SbMethodImpl* mpSbMethodImpl; // Impl data + SbMethodImpl* mpSbMethodImpl; // Impl data SbxVariable* mCaller; // caller SbModule* pMod; USHORT nDebugFlags; - USHORT nLine1, nLine2; - UINT32 nStart; - BOOL bInvalid; + USHORT nLine1, nLine2; + UINT32 nStart; + BOOL bInvalid; SbxArrayRef refStatics; SbMethod( const String&, SbxDataType, SbModule* ); SbMethod( const SbMethod& ); @@ -67,11 +67,11 @@ public: SbxArray* GetLocals(); 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& ); + SbModule* GetModule() { return pMod; } + UINT32 GetId() const { return nStart; } + USHORT GetDebugFlags() { return nDebugFlags; } + void SetDebugFlags( USHORT n ) { nDebugFlags = n; } + void GetLineRange( USHORT&, USHORT& ); // Interface to execute a method from the applications virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index 94fd9d845e12..678da3648701 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,14 +51,14 @@ class SbModuleImpl; class SbModule : public SbxObject { - friend class TestToolObj; // allows module initialisation at runtime - friend class SbiCodeGen; - friend class SbMethod; - friend class SbiRuntime; - friend class StarBASIC; - friend class SbClassModuleObject; - - SbModuleImpl* mpSbModuleImpl; // Impl data + friend class TestToolObj; // allows module initialisation at runtime + friend class SbiCodeGen; + friend class SbMethod; + friend class SbiRuntime; + friend class StarBASIC; + friend class SbClassModuleObject; + + SbModuleImpl* mpSbModuleImpl; // Impl data std::vector< String > mModuleVariableNames; SbModule(); SbModule(const SbModule&); @@ -71,24 +71,24 @@ protected: SbiBreakpoints* pBreaks; // Breakpoints SbClassData* pClassData; BOOL mbVBACompat; - INT32 mnType; + INT32 mnType; SbxObjectRef pDocObject; // an impl object ( used by Document Modules ) - bool bIsProxyModule; + bool bIsProxyModule; - static void implProcessModuleRunInit( ClassModuleRunInitItem& rItem ); - void StartDefinitions(); - SbMethod* GetMethod( const String&, SbxDataType ); - SbProperty* GetProperty( const String&, SbxDataType ); + static void implProcessModuleRunInit( ClassModuleRunInitItem& rItem ); + void StartDefinitions(); + SbMethod* GetMethod( const String&, SbxDataType ); + SbProperty* GetProperty( const String&, SbxDataType ); SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType ); SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* ); - void EndDefinitions( BOOL=FALSE ); - USHORT Run( SbMethod* ); - void RunInit(); - void ClearPrivateVars(); - void GlobalRunInit( BOOL bBasicStart ); // for all modules - void GlobalRunDeInit( void ); - const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const; - const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT&, + void EndDefinitions( BOOL=FALSE ); + USHORT Run( SbMethod* ); + void RunInit(); + void ClearPrivateVars(); + void GlobalRunInit( 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; @@ -100,37 +100,37 @@ public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2); TYPEINFO(); SbModule( const String&, BOOL bCompat = FALSE ); - virtual void SetParent( SbxObject* ); - virtual void Clear(); + virtual void SetParent( SbxObject* ); + virtual void Clear(); virtual SbxVariable* Find( const String&, SbxClassType ); - virtual const String& GetSource() const; - const ::rtl::OUString& GetSource32() const; - const String& GetComment() const { return aComment; } - virtual void SetSource( const String& r ); - void SetSource32( const ::rtl::OUString& r ); - void SetComment( const String& r ); + virtual const String& GetSource() const; + const ::rtl::OUString& GetSource32() const; + const String& GetComment() const { return aComment; } + virtual void SetSource( const String& r ); + void SetSource32( const ::rtl::OUString& r ); + void SetComment( const String& r ); - virtual BOOL Compile(); - BOOL Disassemble( String& rText ); - virtual BOOL IsCompiled() const; + virtual BOOL Compile(); + BOOL Disassemble( String& rText ); + virtual BOOL IsCompiled() const; const SbxObject* FindType( String aTypeName ) const; - virtual BOOL IsBreakable( USHORT nLine ) const; - virtual USHORT GetBPCount() const; - virtual USHORT GetBP( USHORT n ) const; - virtual BOOL IsBP( USHORT nLine ) const; - virtual BOOL SetBP( USHORT nLine ); - virtual BOOL ClearBP( USHORT nLine ); - virtual void ClearAllBP(); + virtual BOOL IsBreakable( USHORT nLine ) const; + virtual USHORT GetBPCount() const; + virtual USHORT GetBP( USHORT n ) const; + virtual BOOL IsBP( USHORT nLine ) const; + virtual BOOL SetBP( USHORT nLine ); + virtual BOOL ClearBP( USHORT nLine ); + virtual void ClearAllBP(); // Lines of Subs - virtual SbMethod* GetFunctionForLine( USHORT ); + virtual SbMethod* GetFunctionForLine( USHORT ); // Store only image, no source (needed for new password protection) - BOOL StoreBinaryData( SvStream& ); - BOOL StoreBinaryData( SvStream&, USHORT nVer ); + BOOL StoreBinaryData( SvStream& ); + BOOL StoreBinaryData( SvStream&, USHORT nVer ); BOOL LoadBinaryData( SvStream&, USHORT nVer ); BOOL LoadBinaryData( SvStream& ); BOOL ExceedsLegacyModuleSize(); @@ -161,8 +161,8 @@ class SbClassModuleObject : public SbModule { SbClassModuleImpl* mpSbClassModuleImpl; - SbModule* mpClassModule; - bool mbInitializeEventDone; + SbModule* mpClassModule; + bool mbInitializeEventDone; public: TYPEINFO(); diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx index fc39c2e5f936..e2920dffb02b 100644 --- a/basic/inc/basic/sbprop.hxx +++ b/basic/inc/basic/sbprop.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class SbProperty : public SbxProperty friend class SbModule; friend class SbProcedureProperty; SbModule* pMod; - BOOL bInvalid; + BOOL bInvalid; SbProperty( const String&, SbxDataType, SbModule* ); virtual ~SbProperty(); public: @@ -56,7 +56,7 @@ SV_DECL_IMPL_REF(SbProperty) class SbProcedureProperty : public SbxProperty { - bool mbSet; // Flag for set command + bool mbSet; // Flag for set command virtual ~SbProcedureProperty(); diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index f25ddcf02c09..a40ac394334e 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,40 +57,40 @@ class StarBASIC : public SbxObject friend class SbiInstance; friend class SbiRuntime; - StarBASICImpl* mpStarBASICImpl; - - SbxArrayRef pModules; // List of all modules - SbxObjectRef pRtl; // Runtime Library - SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener + StarBASICImpl* mpStarBASICImpl; + SbxArrayRef pModules; // List of all modules + SbxObjectRef pRtl; // Runtime Library + SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener + // 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; - BasicLibInfo* pLibInfo; // Info block for basic manager - SbLanguageMode eLanguageMode; // LanguageMode of the basic object - BOOL bQuit; - - SbxObjectRef pVBAGlobals; + 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; + BasicLibInfo* pLibInfo; // Info block for basic manager + SbLanguageMode eLanguageMode; // LanguageMode of the basic object + BOOL bQuit; + + SbxObjectRef pVBAGlobals; SbxObject* getVBAGlobals( ); protected: - BOOL CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen ); + 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 ); + 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; protected: - virtual BOOL ErrorHdl(); - virtual USHORT BreakHdl(); + virtual BOOL ErrorHdl(); + virtual USHORT BreakHdl(); virtual ~StarBASIC(); public: @@ -104,67 +104,67 @@ public: // not delivered to Parent. virtual void SetModified( BOOL ); - void* operator new( size_t ); - void operator delete( void* ); + void* operator new( size_t ); + void operator delete( void* ); virtual void Insert( SbxVariable* ); using SbxObject::Remove; virtual void Remove( SbxVariable* ); - virtual void Clear(); + virtual void Clear(); - BasicLibInfo* GetLibInfo() { return pLibInfo; } - void SetLibInfo( BasicLibInfo* p ) { pLibInfo = p; } + BasicLibInfo* GetLibInfo() { return pLibInfo; } + void SetLibInfo( BasicLibInfo* p ) { pLibInfo = p; } // Compiler-Interface - SbModule* MakeModule( const String& rName, const String& rSrc ); - SbModule* MakeModule32( const String& rName, const ::rtl::OUString& rSrc ); + 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 ); - 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 SbError GetErrBasic(); + BOOL Compile( SbModule* ); + 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 SbError GetErrBasic(); // #66536 make additional message accessible by RTL function Error - static String GetErrorMsg(); + static String GetErrorMsg(); static xub_StrLen GetErl(); // Highlighting - void Highlight( const String& rSrc, SbTextPortions& rList ); + void Highlight( const String& rSrc, SbTextPortions& rList ); virtual SbxVariable* Find( const String&, SbxClassType ); virtual BOOL Call( const String&, SbxArray* = NULL ); - SbxArray* GetModules() { return pModules; } - SbxObject* GetRtl() { return pRtl; } - SbModule* FindModule( const String& ); + SbxArray* GetModules() { return pModules; } + SbxObject* GetRtl() { return pRtl; } + SbModule* FindModule( const String& ); // Run init code of all modules (including the inserted Doc-Basics) - void InitAllModules( StarBASIC* pBasicNotToInit = NULL ); - void DeInitAllModules( void ); - void ClearAllModuleVars( void ); - void ActivateObject( const String*, BOOL ); - BOOL LoadOldModules( SvStream& ); + void InitAllModules( StarBASIC* pBasicNotToInit = NULL ); + void DeInitAllModules( void ); + void ClearAllModuleVars( void ); + void ActivateObject( const String*, BOOL ); + BOOL LoadOldModules( SvStream& ); // #43011 For TestTool; deletes global vars - void ClearGlobalVars( void ); + 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, + static USHORT GetLine(); + static USHORT GetCol1(); + static USHORT GetCol2(); + static void SetErrorData( SbError nCode, USHORT nLine, USHORT nCol1, USHORT 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 void SetGlobalLanguageMode( SbLanguageMode eLangMode ); + 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 void SetGlobalLanguageMode( SbLanguageMode eLangMode ); static SbLanguageMode GetGlobalLanguageMode(); // Local settings void SetLanguageMode( SbLanguageMode eLangMode ) @@ -172,22 +172,22 @@ public: SbLanguageMode GetLanguageMode(); // Specific for break handler - BOOL IsBreak() const { return bBreak; } + BOOL IsBreak() const { return bBreak; } - static Link GetGlobalErrorHdl(); - static void SetGlobalErrorHdl( const Link& rNewHdl ); - Link GetErrorHdl() const { return aErrorHdl; } - void SetErrorHdl( const Link& r ) { aErrorHdl = r; } + static Link GetGlobalErrorHdl(); + static void SetGlobalErrorHdl( const Link& rNewHdl ); + Link GetErrorHdl() const { return aErrorHdl; } + void SetErrorHdl( const Link& r ) { aErrorHdl = r; } - static Link GetGlobalBreakHdl(); - static void SetGlobalBreakHdl( const Link& rNewHdl ); - Link GetBreakHdl() const { return aBreakHdl; } - void SetBreakHdl( const Link& r ) { aBreakHdl = r; } + static Link GetGlobalBreakHdl(); + static void SetGlobalBreakHdl( const Link& rNewHdl ); + Link GetBreakHdl() const { return aBreakHdl; } + void SetBreakHdl( const Link& r ) { aBreakHdl = r; } - SbxArrayRef getUnoListeners( void ); + SbxArrayRef getUnoListeners( void ); - static SbxBase* FindSBXInCurrentScope( const String& rName ); - static SbxVariable* FindVarInCurrentScopy + static SbxBase* FindSBXInCurrentScope( const String& rName ); + static SbxVariable* FindVarInCurrentScopy ( const String& rName, USHORT& rStatus ); static SbMethod* GetActiveMethod( USHORT nLevel = 0 ); static SbModule* GetActiveModule(); diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx index a33b1c343bdc..3ae022073c7b 100644 --- a/basic/inc/basic/sbstdobj.hxx +++ b/basic/inc/basic/sbstdobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,15 +52,15 @@ public: class SbStdPicture : public SbxObject { protected: - Graphic aGraphic; + Graphic aGraphic; ~SbStdPicture(); 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, BOOL bWrite ); + void PropWidth( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); + void PropHeight( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); public: TYPEINFO(); @@ -69,7 +69,7 @@ public: virtual SbxVariable* Find( const String&, SbxClassType ); Graphic GetGraphic() const { return aGraphic; } - void SetGraphic( const Graphic& rGrf ) { aGraphic = rGrf; } + void SetGraphic( const Graphic& rGrf ) { aGraphic = rGrf; } }; //----------------- @@ -78,23 +78,23 @@ public: class SbStdFont : public SbxObject { protected: - BOOL bBold; - BOOL bItalic; - BOOL bStrikeThrough; - BOOL bUnderline; - USHORT nSize; - String aName; + BOOL bBold; + BOOL bItalic; + BOOL bStrikeThrough; + BOOL bUnderline; + USHORT 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, 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 ); public: TYPEINFO(); @@ -102,18 +102,18 @@ 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 SetFontName( const String& rName ) { aName = rName; } - String GetFontName() const { return aName; } + 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 SetFontName( const String& rName ) { aName = rName; } + String GetFontName() const { return aName; } }; //---------------------- @@ -127,12 +127,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_, 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 ); public: TYPEINFO(); diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx index 0539246e071b..cb0c670fbeb6 100644 --- a/basic/inc/basic/sbuno.hxx +++ b/basic/inc/basic/sbuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index a4fa718c8467..54450c623acf 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,10 +90,10 @@ class SbxInfo : public SvRefBase friend class SbxVariable; friend class SbMethod; - String aComment; - String aHelpFile; - UINT32 nHelpId; - SbxParams aParams; + String aComment; + String aHelpFile; + UINT32 nHelpId; + SbxParams aParams; protected: BOOL LoadData( SvStream&, USHORT ); @@ -103,16 +103,16 @@ public: SbxInfo(); SbxInfo( const String&, UINT32 ); - void AddParam( const String&, SbxDataType, USHORT=SBX_READ ); - void AddParam( const SbxParamInfo& ); - const SbxParamInfo* GetParam( USHORT n ) const; // index starts with 1! - const String& GetComment() const { return aComment; } - const String& GetHelpFile() const { return aHelpFile; } - UINT32 GetHelpId() const { return nHelpId; } + void AddParam( const String&, SbxDataType, USHORT=SBX_READ ); + void AddParam( const SbxParamInfo& ); + const SbxParamInfo* GetParam( USHORT n ) const; // index starts with 1! + const String& GetComment() const { return aComment; } + const String& GetHelpFile() const { return aHelpFile; } + 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 SetComment( const String& r ) { aComment = r; } + void SetHelpFile( const String& r ) { aHelpFile = r; } + void SetHelpId( UINT32 nId ) { nHelpId = nId; } }; #endif diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 275007de807e..2925f99b17e3 100644 --- a/basic/inc/basic/sbxbase.hxx +++ b/basic/inc/basic/sbxbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ DECLARE_LIST(SbxVarList_Impl, SbxVariable*) // AppData-Struktur for SBX: struct SbxAppData { - SbxError eSbxError; // Error code - SbxFacs aFacs; // Factories - SbxVarList_Impl aVars; // for Dump - SbxBasicFormater *pBasicFormater; // Pointer to Format()-Command helper class + SbxError eSbxError; // Error code + SbxFacs aFacs; // Factories + SbxVarList_Impl aVars; // for Dump + SbxBasicFormater *pBasicFormater; // Pointer to Format()-Command helper class LanguageType eBasicFormaterLangType; // It might be useful to store this class 'global' because some string reosurces are saved here diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx index 786a5213f646..5f37de70c2ef 100644 --- a/basic/inc/basic/sbxcore.hxx +++ b/basic/inc/basic/sbxcore.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,31 +45,31 @@ class UniString; // Load() and Store() must not be overridden. // 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; } - -#define SBX_DECL_PERSIST_NODATA_() \ - virtual UINT32 GetCreator() const; \ - virtual UINT16 GetVersion() const; \ +#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; } + +#define SBX_DECL_PERSIST_NODATA_() \ + virtual UINT32 GetCreator() const; \ + virtual UINT16 GetVersion() const; \ virtual 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; \ +#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \ + virtual BOOL LoadPrivateData( SvStream&, USHORT ); \ + virtual 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; \ +#define SBX_DECL_PERSIST_() \ + virtual BOOL LoadPrivateData( SvStream&, USHORT ); \ + virtual 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; } +#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; } class SbxBase; class SbxFactory; @@ -81,12 +81,12 @@ class SbxBaseImpl; class SbxBase : virtual public SvRefBase { - SbxBaseImpl* mpSbxBaseImpl; // Impl data + SbxBaseImpl* mpSbxBaseImpl; // Impl data virtual BOOL LoadData( SvStream&, USHORT ); virtual BOOL StoreData( SvStream& ) const; protected: - USHORT nFlags; // Flag-Bits + USHORT nFlags; // Flag-Bits SbxBase(); SbxBase( const SbxBase& ); @@ -95,18 +95,18 @@ 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; + 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 ); diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx index ca707168687b..e5881ab5c2e6 100644 --- a/basic/inc/basic/sbxdef.hxx +++ b/basic/inc/basic/sbxdef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ #ifndef _SBX_CLASS_TYPE #define _SBX_CLASS_TYPE -enum SbxClassType { // SBX-class-IDs (order is important!) - SbxCLASS_DONTCARE = 1, // don't care (search, not 0 due to StarBASIC) - SbxCLASS_ARRAY, // Array of SbxVariables - SbxCLASS_VALUE, // simple value - SbxCLASS_VARIABLE, // Variable (from here there is Broadcaster) - SbxCLASS_METHOD, // Method (Function or Sub) - SbxCLASS_PROPERTY, // Property - SbxCLASS_OBJECT // Object +enum SbxClassType { // SBX-class-IDs (order is important!) + SbxCLASS_DONTCARE = 1, // don't care (search, not 0 due to StarBASIC) + SbxCLASS_ARRAY, // Array of SbxVariables + SbxCLASS_VALUE, // simple value + SbxCLASS_VARIABLE, // Variable (from here there is Broadcaster) + SbxCLASS_METHOD, // Method (Function or Sub) + SbxCLASS_PROPERTY, // Property + SbxCLASS_OBJECT // Object }; #endif @@ -54,58 +54,58 @@ enum SbxClassType { // SBX-class-IDs (order is important!) #define _SBX_DATA_TYPE enum SbxDataType { - SbxEMPTY = 0, // * Uninitialized - SbxNULL = 1, // * Contains no valid data - SbxINTEGER = 2, // * Integer (INT16) - SbxLONG = 3, // * Long integer (INT32) - SbxSINGLE = 4, // * Single-precision floating point number (float) - SbxDOUBLE = 5, // * Double-precision floating point number (double) - SbxCURRENCY = 6, // Currency (INT64) - SbxDATE = 7, // * Date (double) - SbxSTRING = 8, // * String (StarView) - SbxOBJECT = 9, // * SbxBase object pointer - SbxERROR = 10, // * Error (UINT16) - SbxBOOL = 11, // * Boolean (0 or -1) - SbxVARIANT = 12, // * Display for variant datatype - 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) - SbxLONG64 = 20, // signed 64-bit int - SbxULONG64 = 21, // unsigned 64-bit int - SbxINT = 22, // * signed machine-dependent int - SbxUINT = 23, // * unsigned machine-dependent int - SbxVOID = 24, // * no value (= SbxEMPTY) - SbxHRESULT = 25, // HRESULT - SbxPOINTER = 26, // generic pointer - SbxDIMARRAY = 27, // dimensioned array - SbxCARRAY = 28, // C style array - SbxUSERDEF = 29, // user defined - SbxLPSTR = 30, // * null terminated string - SbxLPWSTR = 31, // wide null terminated string - SbxCoreSTRING = 32, // from 1997-4-10 for GetCoreString(), only for converting - SbxWSTRING = 33, // from 2000-10-4 Reimplemented for backwards compatibility (#78919) - SbxWCHAR = 34, // from 2000-10-4 Reimplemented for backwards compatibility (#78919) - SbxSALINT64 = 35, // for UNO hyper - SbxSALUINT64 = 36, // for UNO unsigned hyper - SbxDECIMAL = 37, // for UNO/automation Decimal - - SbxVECTOR = 0x1000, // simple counted array - SbxARRAY = 0x2000, // array - SbxBYREF = 0x4000, // access by reference - - SbxSV1 = 128, // first defined data type for StarView - SbxMEMORYSTREAM, // SvMemoryStream - SbxSTORAGE, // SvStorage - - SbxUSER1 = 256, // first user defined data type - SbxUSERn = 2047 // last user defined data type + SbxEMPTY = 0, // * Uninitialized + SbxNULL = 1, // * Contains no valid data + SbxINTEGER = 2, // * Integer (INT16) + SbxLONG = 3, // * Long integer (INT32) + SbxSINGLE = 4, // * Single-precision floating point number (float) + SbxDOUBLE = 5, // * Double-precision floating point number (double) + SbxCURRENCY = 6, // Currency (INT64) + SbxDATE = 7, // * Date (double) + SbxSTRING = 8, // * String (StarView) + SbxOBJECT = 9, // * SbxBase object pointer + SbxERROR = 10, // * Error (UINT16) + SbxBOOL = 11, // * Boolean (0 or -1) + SbxVARIANT = 12, // * Display for variant datatype + 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) + SbxLONG64 = 20, // signed 64-bit int + SbxULONG64 = 21, // unsigned 64-bit int + SbxINT = 22, // * signed machine-dependent int + SbxUINT = 23, // * unsigned machine-dependent int + SbxVOID = 24, // * no value (= SbxEMPTY) + SbxHRESULT = 25, // HRESULT + SbxPOINTER = 26, // generic pointer + SbxDIMARRAY = 27, // dimensioned array + SbxCARRAY = 28, // C style array + SbxUSERDEF = 29, // user defined + SbxLPSTR = 30, // * null terminated string + SbxLPWSTR = 31, // wide null terminated string + SbxCoreSTRING = 32, // from 1997-4-10 for GetCoreString(), only for converting + SbxWSTRING = 33, // from 2000-10-4 Reimplemented for backwards compatibility (#78919) + SbxWCHAR = 34, // from 2000-10-4 Reimplemented for backwards compatibility (#78919) + SbxSALINT64 = 35, // for UNO hyper + SbxSALUINT64 = 36, // for UNO unsigned hyper + SbxDECIMAL = 37, // for UNO/automation Decimal + + SbxVECTOR = 0x1000, // simple counted array + SbxARRAY = 0x2000, // array + SbxBYREF = 0x4000, // access by reference + + SbxSV1 = 128, // first defined data type for StarView + SbxMEMORYSTREAM, // SvMemoryStream + SbxSTORAGE, // SvStorage + + SbxUSER1 = 256, // first user defined data type + SbxUSERn = 2047 // last user defined data type }; const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000; -const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible +const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible #endif @@ -114,30 +114,30 @@ const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no enum SbxOperator { // Arithmetical: - SbxEXP, // this ^ var - SbxMUL, // this * var - SbxDIV, // this / var - SbxMOD, // this MOD var - SbxPLUS, // this + var - SbxMINUS, // this - var - SbxNEG, // -this (var is ignored) - SbxIDIV, // this / var (both operands max. INT32!) + SbxEXP, // this ^ var + SbxMUL, // this * var + SbxDIV, // this / var + SbxMOD, // this MOD var + SbxPLUS, // this + var + SbxMINUS, // this - var + SbxNEG, // -this (var is ignored) + SbxIDIV, // this / var (both operands max. INT32!) // Boolean operators (max INT32!): - SbxAND, // this & var - SbxOR, // this | var - SbxXOR, // this ^ var - SbxEQV, // ~this ^ var - SbxIMP, // ~this | var - SbxNOT, // ~this (var is ignored) + SbxAND, // this & var + SbxOR, // this | var + SbxXOR, // this ^ var + SbxEQV, // ~this ^ var + SbxIMP, // ~this | var + SbxNOT, // ~this (var is ignored) // String-concat: - SbxCAT, // this & var + SbxCAT, // this & var // Comparisons: - SbxEQ, // this = var - SbxNE, // this <> var - SbxLT, // this < var - SbxGT, // this > var - SbxLE, // this <= var - SbxGE // this >= var + SbxEQ, // this = var + SbxNE, // this <> var + SbxLT, // this < var + SbxGT, // this > var + SbxLE, // this <= var + SbxGE // this >= var }; #endif @@ -145,199 +145,199 @@ enum SbxOperator { #ifndef _SBX_NAME_TYPE #define _SBX_NAME_TYPE -enum SbxNameType { // Type of the questioned name of a variable - SbxNAME_NONE, // plain name - SbxNAME_SHORT, // Name(A,B) - SbxNAME_SHORT_TYPES, // Name%(A%,B$) - SbxNAME_LONG_TYPES // Name(A As Integer, B As String) As Integer +enum SbxNameType { // Type of the questioned name of a variable + SbxNAME_NONE, // plain name + SbxNAME_SHORT, // Name(A,B) + SbxNAME_SHORT_TYPES, // Name%(A%,B$) + SbxNAME_LONG_TYPES // Name(A As Integer, B As String) As Integer }; #endif // from 1996/3/20: New error messages -typedef ULONG SbxError; // Preserve old type +typedef ULONG SbxError; // Preserve old type #endif // von #ifndef __RSC // New error codes per define -#define ERRCODE_SBX_OK ERRCODE_NONE // processed -#define ERRCODE_SBX_SYNTAX (1UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_COMPILER) // Syntaxerror in parser (where else could syntax errors happen? ;-) -#define ERRCODE_SBX_NOTIMP (2UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_NOTSUPPORTED) // not possible -#define ERRCODE_SBX_OVERFLOW (3UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // overflow -#define ERRCODE_SBX_BOUNDS (4UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // Invalid array index -#define ERRCODE_SBX_ZERODIV (5UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // Division by zero -#define ERRCODE_SBX_CONVERSION (6UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // wrong data type -#define ERRCODE_SBX_BAD_PARAMETER (7UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // invalid Parameter -#define ERRCODE_SBX_PROC_UNDEFINED (8UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // BASIC-Sub or Function undefined -#define ERRCODE_SBX_ERROR (9UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_UNKNOWN) // other object-related error -#define ERRCODE_SBX_NO_OBJECT (10UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Object variable unassigned -#define ERRCODE_SBX_CANNOT_LOAD (11UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_CREATE) // Object cannot be loaded or initialized -#define ERRCODE_SBX_BAD_INDEX (12UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // Invalid object index -#define ERRCODE_SBX_NO_ACTIVE_OBJECT (13UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_ACCESS) // Object is not activated -#define ERRCODE_SBX_BAD_PROP_VALUE (14UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Bad property value -#define ERRCODE_SBX_PROP_READONLY (15UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_READ) // Property is read only -#define ERRCODE_SBX_PROP_WRITEONLY (16UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_WRITE) // Property is write only -#define ERRCODE_SBX_INVALID_OBJECT (17UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_ACCESS) // Invalid object reference -#define ERRCODE_SBX_NO_METHOD (18UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Property oder Methode unbekannt -#define ERRCODE_SBX_INVALID_USAGE_OBJECT (19UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_ACCESS) // Invalid object usage -#define ERRCODE_SBX_NO_OLE (20UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_ACCESS) // No OLE-Object -#define ERRCODE_SBX_BAD_METHOD (21UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Method not supported -#define ERRCODE_SBX_OLE_ERROR (22UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // OLE Automation Error -#define ERRCODE_SBX_BAD_ACTION (23UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_NOTSUPPORTED) // Action not supported -#define ERRCODE_SBX_NO_NAMED_ARGS (24UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // No named arguments -#define ERRCODE_SBX_BAD_LOCALE (25UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_NOTSUPPORTED) // Locale settings not supported -#define ERRCODE_SBX_NAMED_NOT_FOUND (26UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Unknown named argument -#define ERRCODE_SBX_NOT_OPTIONAL (27UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Argument not optional -#define ERRCODE_SBX_WRONG_ARGS (28UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_SBX) // Invalid number of arguments -#define ERRCODE_SBX_NOT_A_COLL (29UL | ERRCODE_AREA_SBX | \ - ERRCODE_CLASS_RUNTIME) // Object contains no elements -#define LAST_SBX_ERROR_ID 29UL +#define ERRCODE_SBX_OK ERRCODE_NONE // processed +#define ERRCODE_SBX_SYNTAX (1UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_COMPILER) // Syntaxerror in parser (where else could syntax errors happen? ;-) +#define ERRCODE_SBX_NOTIMP (2UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_NOTSUPPORTED) // not possible +#define ERRCODE_SBX_OVERFLOW (3UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // overflow +#define ERRCODE_SBX_BOUNDS (4UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // Invalid array index +#define ERRCODE_SBX_ZERODIV (5UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // Division by zero +#define ERRCODE_SBX_CONVERSION (6UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // wrong data type +#define ERRCODE_SBX_BAD_PARAMETER (7UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // invalid Parameter +#define ERRCODE_SBX_PROC_UNDEFINED (8UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // BASIC-Sub or Function undefined +#define ERRCODE_SBX_ERROR (9UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_UNKNOWN) // other object-related error +#define ERRCODE_SBX_NO_OBJECT (10UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Object variable unassigned +#define ERRCODE_SBX_CANNOT_LOAD (11UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_CREATE) // Object cannot be loaded or initialized +#define ERRCODE_SBX_BAD_INDEX (12UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // Invalid object index +#define ERRCODE_SBX_NO_ACTIVE_OBJECT (13UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_ACCESS) // Object is not activated +#define ERRCODE_SBX_BAD_PROP_VALUE (14UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Bad property value +#define ERRCODE_SBX_PROP_READONLY (15UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_READ) // Property is read only +#define ERRCODE_SBX_PROP_WRITEONLY (16UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_WRITE) // Property is write only +#define ERRCODE_SBX_INVALID_OBJECT (17UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_ACCESS) // Invalid object reference +#define ERRCODE_SBX_NO_METHOD (18UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Property oder Methode unbekannt +#define ERRCODE_SBX_INVALID_USAGE_OBJECT (19UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_ACCESS) // Invalid object usage +#define ERRCODE_SBX_NO_OLE (20UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_ACCESS) // No OLE-Object +#define ERRCODE_SBX_BAD_METHOD (21UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Method not supported +#define ERRCODE_SBX_OLE_ERROR (22UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // OLE Automation Error +#define ERRCODE_SBX_BAD_ACTION (23UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_NOTSUPPORTED) // Action not supported +#define ERRCODE_SBX_NO_NAMED_ARGS (24UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // No named arguments +#define ERRCODE_SBX_BAD_LOCALE (25UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_NOTSUPPORTED) // Locale settings not supported +#define ERRCODE_SBX_NAMED_NOT_FOUND (26UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Unknown named argument +#define ERRCODE_SBX_NOT_OPTIONAL (27UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Argument not optional +#define ERRCODE_SBX_WRONG_ARGS (28UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_SBX) // Invalid number of arguments +#define ERRCODE_SBX_NOT_A_COLL (29UL | ERRCODE_AREA_SBX | \ + ERRCODE_CLASS_RUNTIME) // Object contains no elements +#define LAST_SBX_ERROR_ID 29UL // Less important for resources #ifndef __RSC // Map old codes to new ones -#define SbxERR_OK ERRCODE_SBX_OK -#define SbxERR_SYNTAX ERRCODE_SBX_SYNTAX -#define SbxERR_NOTIMP ERRCODE_SBX_NOTIMP -#define SbxERR_OVERFLOW ERRCODE_SBX_OVERFLOW -#define SbxERR_BOUNDS ERRCODE_SBX_BOUNDS -#define SbxERR_ZERODIV ERRCODE_SBX_ZERODIV -#define SbxERR_CONVERSION ERRCODE_SBX_CONVERSION -#define SbxERR_BAD_PARAMETER ERRCODE_SBX_BAD_PARAMETER -#define SbxERR_PROC_UNDEFINED ERRCODE_SBX_PROC_UNDEFINED -#define SbxERR_ERROR ERRCODE_SBX_ERROR -#define SbxERR_NO_OBJECT ERRCODE_SBX_NO_OBJECT -#define SbxERR_CANNOT_LOAD ERRCODE_SBX_CANNOT_LOAD -#define SbxERR_BAD_INDEX ERRCODE_SBX_BAD_INDEX -#define SbxERR_NO_ACTIVE_OBJECT ERRCODE_SBX_NO_ACTIVE_OBJECT -#define SbxERR_BAD_PROP_VALUE ERRCODE_SBX_BAD_PROP_VALUE -#define SbxERR_PROP_READONLY ERRCODE_SBX_PROP_READONLY -#define SbxERR_PROP_WRITEONLY ERRCODE_SBX_PROP_WRITEONLY -#define SbxERR_INVALID_OBJECT ERRCODE_SBX_INVALID_OBJECT -#define SbxERR_NO_METHOD ERRCODE_SBX_NO_METHOD -#define SbxERR_INVALID_USAGE_OBJECT ERRCODE_SBX_INVALID_USAGE_OBJECT -#define SbxERR_NO_OLE ERRCODE_SBX_NO_OLE -#define SbxERR_BAD_METHOD ERRCODE_SBX_BAD_METHOD -#define SbxERR_OLE_ERROR ERRCODE_SBX_OLE_ERROR -#define SbxERR_BAD_ACTION ERRCODE_SBX_BAD_ACTION -#define SbxERR_NO_NAMED_ARGS ERRCODE_SBX_NO_NAMED_ARGS -#define SbxERR_BAD_LOCALE ERRCODE_SBX_BAD_LOCALE -#define SbxERR_NAMED_NOT_FOUND ERRCODE_SBX_NAMED_NOT_FOUND -#define SbxERR_NOT_OPTIONAL ERRCODE_SBX_NOT_OPTIONAL -#define SbxERR_WRONG_ARGS ERRCODE_SBX_WRONG_ARGS -#define SbxERR_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL +#define SbxERR_OK ERRCODE_SBX_OK +#define SbxERR_SYNTAX ERRCODE_SBX_SYNTAX +#define SbxERR_NOTIMP ERRCODE_SBX_NOTIMP +#define SbxERR_OVERFLOW ERRCODE_SBX_OVERFLOW +#define SbxERR_BOUNDS ERRCODE_SBX_BOUNDS +#define SbxERR_ZERODIV ERRCODE_SBX_ZERODIV +#define SbxERR_CONVERSION ERRCODE_SBX_CONVERSION +#define SbxERR_BAD_PARAMETER ERRCODE_SBX_BAD_PARAMETER +#define SbxERR_PROC_UNDEFINED ERRCODE_SBX_PROC_UNDEFINED +#define SbxERR_ERROR ERRCODE_SBX_ERROR +#define SbxERR_NO_OBJECT ERRCODE_SBX_NO_OBJECT +#define SbxERR_CANNOT_LOAD ERRCODE_SBX_CANNOT_LOAD +#define SbxERR_BAD_INDEX ERRCODE_SBX_BAD_INDEX +#define SbxERR_NO_ACTIVE_OBJECT ERRCODE_SBX_NO_ACTIVE_OBJECT +#define SbxERR_BAD_PROP_VALUE ERRCODE_SBX_BAD_PROP_VALUE +#define SbxERR_PROP_READONLY ERRCODE_SBX_PROP_READONLY +#define SbxERR_PROP_WRITEONLY ERRCODE_SBX_PROP_WRITEONLY +#define SbxERR_INVALID_OBJECT ERRCODE_SBX_INVALID_OBJECT +#define SbxERR_NO_METHOD ERRCODE_SBX_NO_METHOD +#define SbxERR_INVALID_USAGE_OBJECT ERRCODE_SBX_INVALID_USAGE_OBJECT +#define SbxERR_NO_OLE ERRCODE_SBX_NO_OLE +#define SbxERR_BAD_METHOD ERRCODE_SBX_BAD_METHOD +#define SbxERR_OLE_ERROR ERRCODE_SBX_OLE_ERROR +#define SbxERR_BAD_ACTION ERRCODE_SBX_BAD_ACTION +#define SbxERR_NO_NAMED_ARGS ERRCODE_SBX_NO_NAMED_ARGS +#define SbxERR_BAD_LOCALE ERRCODE_SBX_BAD_LOCALE +#define SbxERR_NAMED_NOT_FOUND ERRCODE_SBX_NAMED_NOT_FOUND +#define SbxERR_NOT_OPTIONAL ERRCODE_SBX_NOT_OPTIONAL +#define SbxERR_WRONG_ARGS ERRCODE_SBX_WRONG_ARGS +#define SbxERR_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL // Flag-Bits: #define SBX_READ 0x0001 // Read permission #define SBX_WRITE 0x0002 // Write permission #define SBX_READWRITE 0x0003 // Read/Write permission -#define SBX_DONTSTORE 0x0004 // Don't store object -#define SBX_MODIFIED 0x0008 // Object was changed +#define SBX_DONTSTORE 0x0004 // Don't store object +#define SBX_MODIFIED 0x0008 // Object was changed #define SBX_FIXED 0x0010 // Fixed data type (SbxVariable) -#define SBX_CONST 0x0020 // Definition of const value -#define SBX_OPTIONAL 0x0040 // Parameter is optional -#define SBX_HIDDEN 0x0080 // Element is invisible -#define SBX_INVISIBLE 0x0100 // Element is not found by Find() -#define SBX_EXTSEARCH 0x0200 // Object is searched completely -#define SBX_EXTFOUND 0x0400 // Variable was found through extended search -#define SBX_GBLSEARCH 0x0800 // Global search via Parents -#define SBX_RESERVED 0x1000 // reserved -#define SBX_PRIVATE 0x1000 // #110004, #112015, cannot conflict with SBX_RESERVED -#define SBX_NO_BROADCAST 0x2000 // No broadcast on Get/Put -#define SBX_REFERENCE 0x4000 // Parameter is Reference (DLL-call) -#define SBX_NO_MODIFY 0x8000 // SetModified is suppressed -#define SBX_WITH_EVENTS 0x0080 // Same value as unused SBX_HIDDEN +#define SBX_CONST 0x0020 // Definition of const value +#define SBX_OPTIONAL 0x0040 // Parameter is optional +#define SBX_HIDDEN 0x0080 // Element is invisible +#define SBX_INVISIBLE 0x0100 // Element is not found by Find() +#define SBX_EXTSEARCH 0x0200 // Object is searched completely +#define SBX_EXTFOUND 0x0400 // Variable was found through extended search +#define SBX_GBLSEARCH 0x0800 // Global search via Parents +#define SBX_RESERVED 0x1000 // reserved +#define SBX_PRIVATE 0x1000 // #110004, #112015, cannot conflict with SBX_RESERVED +#define SBX_NO_BROADCAST 0x2000 // No broadcast on Get/Put +#define SBX_REFERENCE 0x4000 // Parameter is Reference (DLL-call) +#define SBX_NO_MODIFY 0x8000 // SetModified is suppressed +#define SBX_WITH_EVENTS 0x0080 // Same value as unused SBX_HIDDEN // Broadcaster-IDs: -#define SBX_HINT_DYING SFX_HINT_DYING -#define SBX_HINT_DATAWANTED SFX_HINT_USER00 -#define SBX_HINT_DATACHANGED SFX_HINT_DATACHANGED -#define SBX_HINT_CONVERTED SFX_HINT_USER01 -#define SBX_HINT_INFOWANTED SFX_HINT_USER02 -#define SBX_HINT_OBJECTCHANGED SFX_HINT_USER03 +#define SBX_HINT_DYING SFX_HINT_DYING +#define SBX_HINT_DATAWANTED SFX_HINT_USER00 +#define SBX_HINT_DATACHANGED SFX_HINT_DATACHANGED +#define SBX_HINT_CONVERTED SFX_HINT_USER01 +#define SBX_HINT_INFOWANTED SFX_HINT_USER02 +#define SBX_HINT_OBJECTCHANGED SFX_HINT_USER03 // List of all creators for Load/Store -#define SBXCR_SBX 0x20584253 // SBX(blank) +#define SBXCR_SBX 0x20584253 // SBX(blank) // List of predefined SBX-IDs. New SBX-IDs must be precisly defined so that // they are unique within the Stream and appropriate Factory. -#define SBXID_VALUE 0x4E4E // NN: SbxValue -#define SBXID_VARIABLE 0x4156 // VA: SbxVariable -#define SBXID_ARRAY 0x5241 // AR: SbxArray -#define SBXID_DIMARRAY 0x4944 // DI: SbxDimArray -#define SBXID_OBJECT 0x424F // OB: SbxObject -#define SBXID_COLLECTION 0x4F43 // CO: SbxCollection -#define SBXID_FIXCOLLECTION 0x4346 // FC: SbxStdCollection -#define SBXID_METHOD 0x454D // ME: SbxMethod -#define SBXID_PROPERTY 0x5250 // PR: SbxProperty +#define SBXID_VALUE 0x4E4E // NN: SbxValue +#define SBXID_VARIABLE 0x4156 // VA: SbxVariable +#define SBXID_ARRAY 0x5241 // AR: SbxArray +#define SBXID_DIMARRAY 0x4944 // DI: SbxDimArray +#define SBXID_OBJECT 0x424F // OB: SbxObject +#define SBXID_COLLECTION 0x4F43 // CO: SbxCollection +#define SBXID_FIXCOLLECTION 0x4346 // FC: SbxStdCollection +#define SBXID_METHOD 0x454D // ME: SbxMethod +#define SBXID_PROPERTY 0x5250 // PR: SbxProperty // StarBASIC restricts the base data type to different intervals. // These intervals are fixed due to portability and independent // of the implementation. Only type double is greedy and takes // what it gets. -#define SbxMAXCHAR ((sal_Unicode)65535) -#define SbxMINCHAR (0) -#define SbxMAXBYTE ( 255) -#define SbxMAXINT ( 32767) -#define SbxMININT (-32768) -#define SbxMAXUINT ((UINT16) 65535) -#define SbxMAXLNG ( 2147483647) -#define SbxMINLNG ((INT32)(-2147483647-1)) -#define SbxMAXULNG ((UINT32) 0xffffffff) - -#define SbxMAXSALINT64 SAL_MAX_INT64 -#define SbxMINSALINT64 SAL_MIN_INT64 -#define SbxMAXSALUINT64 SAL_MAX_UINT64 - -#define SbxMAXSNG ( 3.402823e+38) -#define SbxMINSNG (-3.402823e+38) -#define SbxMAXSNG2 ( 1.175494351e-38) -#define SbxMINSNG2 (-1.175494351e-38) -#define SbxMAXCURR ( 922337203685477.5807) -#define SbxMINCURR (-922337203685477.5808) -#define CURRENCY_FACTOR 10000 -#define SbxMAXCURRLNG (SbxMAXLNG/CURRENCY_FACTOR) -#define SbxMINCURRLNG (SbxMINLNG/CURRENCY_FACTOR) +#define SbxMAXCHAR ((sal_Unicode)65535) +#define SbxMINCHAR (0) +#define SbxMAXBYTE ( 255) +#define SbxMAXINT ( 32767) +#define SbxMININT (-32768) +#define SbxMAXUINT ((UINT16) 65535) +#define SbxMAXLNG ( 2147483647) +#define SbxMINLNG ((INT32)(-2147483647-1)) +#define SbxMAXULNG ((UINT32) 0xffffffff) + +#define SbxMAXSALINT64 SAL_MAX_INT64 +#define SbxMINSALINT64 SAL_MIN_INT64 +#define SbxMAXSALUINT64 SAL_MAX_UINT64 + +#define SbxMAXSNG ( 3.402823e+38) +#define SbxMINSNG (-3.402823e+38) +#define SbxMAXSNG2 ( 1.175494351e-38) +#define SbxMINSNG2 (-1.175494351e-38) +#define SbxMAXCURR ( 922337203685477.5807) +#define SbxMINCURR (-922337203685477.5808) +#define CURRENCY_FACTOR 10000 +#define SbxMAXCURRLNG (SbxMAXLNG/CURRENCY_FACTOR) +#define SbxMINCURRLNG (SbxMINLNG/CURRENCY_FACTOR) // Max valid offset index of a Sbx-Array (due to 64K limit) -#define SBX_MAXINDEX 0x3FF0 -#define SBX_MAXINDEX32 SbxMAXLNG +#define SBX_MAXINDEX 0x3FF0 +#define SBX_MAXINDEX32 SbxMAXLNG // The numeric values of TRUE and FALSE enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 }; diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx index 986339d48aac..bb58cf2d7663 100644 --- a/basic/inc/basic/sbxfac.hxx +++ b/basic/inc/basic/sbxfac.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ class UniString; class SbxFactory { - BOOL bHandleLast; // TRUE: Factory is asked at last because of its expensiveness + BOOL bHandleLast; // TRUE: Factory is asked at last because of its expensiveness public: - SbxFactory( BOOL bLast=FALSE ) { bHandleLast = bLast; } - BOOL IsHandleLast( void ) { return bHandleLast; } + SbxFactory( BOOL bLast=FALSE ) { bHandleLast = bLast; } + BOOL IsHandleLast( void ) { return bHandleLast; } virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX ); virtual SbxObject* CreateObject( const String& ); }; diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx index 0e20dbfd0279..e1d25b979f81 100644 --- a/basic/inc/basic/sbxform.hxx +++ b/basic/inc/basic/sbxform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,18 +36,18 @@ Grammar of format string (a try): ----------------------------------------------- - format_string := {\special_char} general_format | scientific_format {\special_char} {;format_string} - general_format := {#[,]}{0[,]}[.{0}{#}] + format_string := {\special_char} general_format | scientific_format {\special_char} {;format_string} + general_format := {#[,]}{0[,]}[.{0}{#}] scientific_format := {0}[.{0}{#}](e | E)(+ | -){#}{0} - percent_char := '%' - special_char := \char | + | - | ( | ) | $ | space_char - char := all_ascii_chars - space_char := ' ' + percent_char := '%' + special_char := \char | + | - | ( | ) | $ | space_char + char := all_ascii_chars + space_char := ' ' - {} repeated multiple times (incl. zero times) - [] exactly one or zero times - () parenthesis, e.g. (e | E) means e or E times + {} repeated multiple times (incl. zero times) + [] exactly one or zero times + () parenthesis, e.g. (e | E) means e or E times Additional predefined formats for the format string: "General Number" @@ -60,7 +60,7 @@ "True/False" "On/Off" - Note: invalid format string are ignored just as in VisualBasic, the output is + Note: invalid format string are ignored just as in VisualBasic, the output is probably 'undefined'. ASCII letters are outputted directly. Constraints in VisualBasic: @@ -82,7 +82,7 @@ a) use sprintf() b) use log10() and pow() digit */ -#define _with_sprintf // use a) +#define _with_sprintf // use a) #include <tools/string.hxx> @@ -103,47 +103,47 @@ class SbxBasicFormater { /* Basic command: Format$( number,format-string ) Parameter: - dNumber : number to be formated - sFormatStrg : the Format-String, e.g. ###0.0### + dNumber : number to be formated + sFormatStrg : the Format-String, e.g. ###0.0### Return value: String containing the formatted output */ - String BasicFormat( double dNumber, String sFormatStrg ); + String BasicFormat( double dNumber, String sFormatStrg ); String BasicFormatNull( String sFormatStrg ); static BOOL isBasicFormat( String sFormatStrg ); private: //*** some helper methods *** - //void ShowError( char *sErrMsg ); - inline void ShiftString( String& sStrg, USHORT 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 ); - void ParseBack( String& sStrg, const String& sFormatStrg, + //void ShowError( char *sErrMsg ); + inline void ShiftString( String& sStrg, USHORT 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 ); + void ParseBack( String& sStrg, const String& sFormatStrg, short nFormatPos ); #ifdef _with_sprintf // Methods for string conversion with sprintf(): - void InitScan( double _dNum ); - void InitExp( double _dNewExp ); - short GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit ); - short GetDigitAtPosExpScan( double dNewExponent, short nPos, + void InitScan( double _dNum ); + void InitExp( double _dNewExp ); + short GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit ); + short GetDigitAtPosExpScan( double dNewExponent, short nPos, BOOL& bFoundFirstDigit ); - short GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit ); + short GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit ); #else // Methods for direct 'calculation' with log10() and pow(): - short GetDigitAtPos( double dNumber, short nPos, double& dNextNumber, + short GetDigitAtPos( double dNumber, short nPos, double& dNextNumber, BOOL& bFoundFirstDigit ); - short RoundDigit( double dNumber ); + 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 ); - short AnalyseFormatString( const String& sFormatStrg, + 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 ); + short AnalyseFormatString( const String& sFormatStrg, short& nNoOfDigitsLeft, short& nNoOfDigitsRight, short& nNoOfOptionalDigitsLeft, short& nNoOfExponentDigits, @@ -151,31 +151,31 @@ class SbxBasicFormater { BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific, BOOL& bGenerateThousandSeparator, short& nMultipleThousandSeparators ); - void ScanFormatString( double dNumber, const String& sFormatStrg, + void ScanFormatString( double dNumber, const String& sFormatStrg, String& sReturnStrg, BOOL bCreateSign ); //*** Data *** - sal_Unicode cDecPoint; // sign for the decimal point - sal_Unicode cThousandSep; // sign for thousand delimiter + sal_Unicode cDecPoint; // sign for the decimal point + sal_Unicode cThousandSep; // sign for thousand delimiter // Text for output: - String sOnStrg; - String sOffStrg; - String sYesStrg; - String sNoStrg; - String sTrueStrg; - String sFalseStrg; + String sOnStrg; + String sOffStrg; + String sYesStrg; + String sNoStrg; + String sTrueStrg; + String sFalseStrg; String sCurrencyStrg; String sCurrencyFormatStrg; //*** temporary data for scan loop *** //----------------------------------------------- // String containing the number in scientific format - String sSciNumStrg; + String sSciNumStrg; // String containing the exponent of the number String sNumExpStrg; - double dNum; // the number that is scanned - short nNumExp; // the exponent of the number - short nExpExp; // the number of digits in the exponent + double dNum; // the number that is scanned + short nNumExp; // the exponent of the number + short nExpExp; // the number of digits in the exponent }; #endif diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx index d508d1c3e11e..875627f233a1 100644 --- a/basic/inc/basic/sbxmeth.hxx +++ b/basic/inc/basic/sbxmeth.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class SbxMethodImpl; class SbxMethod : public SbxVariable { - SbxMethodImpl* mpSbxMethodImpl; // Impl data + SbxMethodImpl* mpSbxMethodImpl; // Impl data public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1); diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx index f4c6fd7c5ad5..dfee8ecadecb 100644 --- a/basic/inc/basic/sbxmstrm.hxx +++ b/basic/inc/basic/sbxmstrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx index 387dc4c7caa5..cdcced040b98 100644 --- a/basic/inc/basic/sbxobj.hxx +++ b/basic/inc/basic/sbxobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class SbxObjectImpl; class SbxObject : public SbxVariable, public SfxListener { - SbxObjectImpl* mpSbxObjectImpl; // Impl data + SbxObjectImpl* mpSbxObjectImpl; // Impl data SbxArray* FindVar( SbxVariable*, USHORT& ); // AB 23.3.1997, special method for VCPtrRemove (see below) @@ -70,7 +70,7 @@ public: virtual BOOL IsClass( const String& ) const; const String& GetClassName() const { return aClassName; } - void SetClassName( const String &rNew ) { aClassName = rNew; } + void SetClassName( const String &rNew ) { aClassName = rNew; } // Default-Property SbxProperty* GetDfltProperty(); void SetDfltProperty( const String& r ); @@ -88,7 +88,7 @@ public: SbxVariable* Make( const String&, SbxClassType, SbxDataType ); virtual SbxObject* MakeObject( const String&, const String& ); virtual void Insert( SbxVariable* ); - // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and + // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and // without Broadcasts, only used in SO2/auto.cxx void QuickInsert( SbxVariable* ); // AB 23.3.1997, Special-Method, allow corresponding controls @@ -102,10 +102,10 @@ public: // Macro-Recording virtual String GenerateSource( const String &rLinePrefix, const SbxObject *pRelativeTo ); - // Direct access on arrays - SbxArray* GetMethods() { return pMethods; } - SbxArray* GetProperties() { return pProps; } - SbxArray* GetObjects() { return pObjs; } + // Direct access on arrays + SbxArray* GetMethods() { return pMethods; } + SbxArray* GetProperties() { return pProps; } + SbxArray* GetObjects() { return pObjs; } // Hooks virtual SvDispatch* GetSvDispatch(); // Debugging diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx index 25c875df9222..33bbdd418820 100644 --- a/basic/inc/basic/sbxprop.hxx +++ b/basic/inc/basic/sbxprop.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class SbxPropertyImpl; class SbxProperty : public SbxVariable { - SbxPropertyImpl* mpSbxPropertyImpl; // Impl data + SbxPropertyImpl* mpSbxPropertyImpl; // Impl data public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1); diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx index f1af839f2471..6e6aee88e833 100644 --- a/basic/inc/basic/sbxvar.hxx +++ b/basic/inc/basic/sbxvar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,9 +165,9 @@ class SbxDecimal; struct SbxValues { union { - sal_Unicode nChar; - BYTE nByte; - INT16 nInteger; + sal_Unicode nChar; + BYTE nByte; + INT16 nInteger; INT32 nLong; UINT16 nUShort; UINT32 nULong; @@ -180,26 +180,26 @@ struct SbxValues int nInt; unsigned int nUInt; ::rtl::OUString* pOUString; - SbxDecimal* pDecimal; + SbxDecimal* pDecimal; SbxBase* pObj; sal_Unicode* pChar; - BYTE* pByte; - INT16* pInteger; - INT32* pLong; - UINT16* pUShort; - UINT32* pULong; - float* pSingle; - double* pDouble; + BYTE* pByte; + INT16* pInteger; + INT32* pLong; + UINT16* pUShort; + UINT32* pULong; + float* pSingle; + double* pDouble; SbxINT64* pLong64; SbxUINT64* pULong64; sal_Int64* pnInt64; sal_uInt64* puInt64; - int* pInt; + int* pInt; unsigned int* pUInt; - void* pData; + void* pData; }; - SbxDataType eType; + SbxDataType eType; SbxValues(): pData( NULL ), eType(SbxEMPTY) {} SbxValues( SbxDataType e ): eType(e) {} @@ -231,7 +231,7 @@ class SbxValueImpl; class SbxValue : public SbxBase { - SbxValueImpl* mpSbxValueImplImpl; // Impl data + SbxValueImpl* mpSbxValueImplImpl; // Impl data // #55226 Transport additional infos SbxValue* TheRealValue( BOOL bObjInObjError ) const; @@ -241,7 +241,7 @@ protected: ::rtl::OUString aPic; // Picture-String String aToolString; // tool string copy - virtual void Broadcast( ULONG ); // Broadcast-Call + virtual void Broadcast( ULONG ); // Broadcast-Call virtual ~SbxValue(); virtual BOOL LoadData( SvStream&, USHORT ); virtual BOOL StoreData( SvStream& ) const; @@ -276,8 +276,8 @@ public: 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 + BOOL IsNumericRTL() const; // #41692 Interface for Basic + BOOL ImpIsNumeric( BOOL bOnlyIntntl ) const; // Implementation virtual SbxClassType GetClass() const; virtual SbxDataType GetType() const; @@ -308,13 +308,13 @@ public: ::rtl::OUString GetOUString() const; SbxDecimal* GetDecimal() const; SbxBase* GetObject() const; - BOOL HasObject() const; + BOOL HasObject() const; void* GetData() const; sal_Unicode GetChar() const; BYTE GetByte() const; UINT16 GetUShort() const; UINT32 GetULong() const; - int GetInt() const; + int GetInt() const; BOOL PutCurrency( const SbxINT64& ); BOOL PutLong64( const SbxINT64& ); @@ -445,8 +445,8 @@ class SbxVariable : public SbxValue { friend class SbMethod; - SbxVariableImpl* mpSbxVariableImpl; // Impl data - SfxBroadcaster* pCst; // Broadcaster, if needed + SbxVariableImpl* mpSbxVariableImpl; // Impl data + SfxBroadcaster* pCst; // Broadcaster, if needed String maName; // Name, if available SbxArrayRef mpPar; // Parameter-Array, if set USHORT nHash; // Hash-ID for search @@ -472,11 +472,11 @@ public: virtual void SetName( const String& ); virtual const String& GetName( SbxNameType = SbxNAME_NONE ) const; - USHORT GetHashCode() const { return nHash; } + USHORT GetHashCode() const { return nHash; } virtual void SetModified( BOOL ); - sal_uIntPtr GetUserData() const { return nUserData; } + sal_uIntPtr GetUserData() const { return nUserData; } void SetUserData( sal_uIntPtr n ) { nUserData = n; } virtual SbxDataType GetType() const; @@ -486,7 +486,7 @@ public: virtual SbxInfo* GetInfo(); void SetInfo( SbxInfo* p ); void SetParameters( SbxArray* p ); - SbxArray* GetParameters() const { return mpPar; } + SbxArray* GetParameters() const { return mpPar; } // Sfx-Broadcasting-Support: // Due to data reduction and better DLL-hierarchie currently via casting @@ -512,6 +512,6 @@ SV_DECL_REF(SbxVariable) #endif -#endif // _SBXVAR_HXX +#endif // _SBXVAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx index 81570d3f60c8..80a8dc4b9087 100644 --- a/basic/inc/basic/testtool.hxx +++ b/basic/inc/basic/testtool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,29 +43,29 @@ // this routine became necessary BOOL IsTTSignatureForUnicodeTextfile( String aLine ); -#define ADD_ERROR_QUIET(nNr, aStr) \ -{ \ - ErrorEntry *pErr; \ - if ( BasicRuntimeAccess::HasRuntime() ) \ - { \ - BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \ - xub_StrLen aErrLn = StarBASIC::GetErl(); \ - if ( 0 == aErrLn ) \ - aErrLn = aRun.GetLine(); \ - pErr = new ErrorEntry(nNr, aStr, \ - aErrLn, aRun.GetCol1(), aRun.GetCol2()); \ - } \ - else \ - { \ - pErr = new ErrorEntry(nNr, aStr); \ - } \ +#define ADD_ERROR_QUIET(nNr, aStr) \ +{ \ + ErrorEntry *pErr; \ + if ( BasicRuntimeAccess::HasRuntime() ) \ + { \ + BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \ + xub_StrLen aErrLn = StarBASIC::GetErl(); \ + if ( 0 == aErrLn ) \ + aErrLn = aRun.GetLine(); \ + pErr = new ErrorEntry(nNr, aStr, \ + aErrLn, aRun.GetCol1(), aRun.GetCol2()); \ + } \ + else \ + { \ + pErr = new ErrorEntry(nNr, aStr); \ + } \ P_FEHLERLISTE->C40_INSERT(ErrorEntry, pErr, P_FEHLERLISTE->Count());\ } // ??? Irgendwann noch was mit der UID anfangen !! #define ADD_ERROR(nNr, aStr) { \ - if ( !SbxBase::IsError() ) \ - SbxBase::SetError( nNr ); \ - ADD_ERROR_QUIET(nNr, aStr); \ + if ( !SbxBase::IsError() ) \ + SbxBase::SetError( nNr ); \ + ADD_ERROR_QUIET(nNr, aStr); \ } #define POP_ERROR() P_FEHLERLISTE->DeleteAndDestroy(0) @@ -107,27 +107,27 @@ public: }; // Defines for syntax Highlighting -#define TT_KEYWORD ((SbTextType)100) // Including locally executed commands like 'use' ... -#define TT_REMOTECMD ((SbTextType)101) // Remotely executed commands like 'nodebug' -#define TT_LOCALCMD ((SbTextType)102) // Locally executed commands like 'use' -#define TT_CONTROL ((SbTextType)103) // Possibly available control loaded by 'use' -#define TT_SLOT ((SbTextType)104) // Available Slots loaded by 'use' -#define TT_METHOD ((SbTextType)105) // Possibly allowed Method for controls -#define TT_NOMETHOD ((SbTextType)106) // No Possibly allowed Method for controls - -#define FILELIST1 ((SbTextType)111) // Symbols in file 1 -#define FILELIST2 ((SbTextType)112) // Symbols in file 2 -#define FILELIST3 ((SbTextType)113) // Symbols in file 3 -#define FILELIST4 ((SbTextType)114) // Symbols in file 4 +#define TT_KEYWORD ((SbTextType)100) // Including locally executed commands like 'use' ... +#define TT_REMOTECMD ((SbTextType)101) // Remotely executed commands like 'nodebug' +#define TT_LOCALCMD ((SbTextType)102) // Locally executed commands like 'use' +#define TT_CONTROL ((SbTextType)103) // Possibly available control loaded by 'use' +#define TT_SLOT ((SbTextType)104) // Available Slots loaded by 'use' +#define TT_METHOD ((SbTextType)105) // Possibly allowed Method for controls +#define TT_NOMETHOD ((SbTextType)106) // No Possibly allowed Method for controls + +#define FILELIST1 ((SbTextType)111) // Symbols in file 1 +#define FILELIST2 ((SbTextType)112) // Symbols in file 2 +#define FILELIST3 ((SbTextType)113) // Symbols in file 3 +#define FILELIST4 ((SbTextType)114) // Symbols in file 4 /// defines for hints from TestToolObj to the Application -#define SBX_HINT_LANGUAGE_EXTENSION_LOADED SFX_HINT_USER06 -#define SBX_HINT_EXECUTION_STATUS_INFORMATION SFX_HINT_USER07 +#define SBX_HINT_LANGUAGE_EXTENSION_LOADED SFX_HINT_USER06 +#define SBX_HINT_EXECUTION_STATUS_INFORMATION SFX_HINT_USER07 -#define TT_EXECUTION_ENTERWAIT 0x01 -#define TT_EXECUTION_LEAVEWAIT 0x02 -#define TT_EXECUTION_SHOW_ACTION 0x03 -#define TT_EXECUTION_HIDE_ACTION 0x04 +#define TT_EXECUTION_ENTERWAIT 0x01 +#define TT_EXECUTION_LEAVEWAIT 0x02 +#define TT_EXECUTION_SHOW_ACTION 0x03 +#define TT_EXECUTION_HIDE_ACTION 0x04 class TTExecutionStatusHint : public SfxSimpleHint { diff --git a/basic/inc/basic/ttglobal.hrc b/basic/inc/basic/ttglobal.hrc index 0248a06c7247..4fa6130c7c5e 100644 --- a/basic/inc/basic/ttglobal.hrc +++ b/basic/inc/basic/ttglobal.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ /////////////////////////////// // Error message that go to the Resultfile. // ********************* -// *** !!ATTENTION!! *** +// *** !!ATTENTION!! *** // ********************* // Theses numbers MUST NOT change ever! // Because they are stored in the Resultfiles and if you showed them again @@ -40,9 +40,9 @@ // Start of Ressources for the Testtool (own file) // > 256 and > 9100 (Biggest res in TT itself) -#define TT_START 20000 // Messages from /basic/source/testtool -#define BAS_START 21000 // Messages from /basic/source/app -#define SVT_START 22000 // Messages from /svtools/source/plugapp +#define TT_START 20000 // Messages from /basic/source/testtool +#define BAS_START 21000 // Messages from /basic/source/app +#define SVT_START 22000 // Messages from /svtools/source/plugapp #endif diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx index be65e0ed3092..7600e7231ff9 100644 --- a/basic/inc/basic/ttstrhlp.hxx +++ b/basic/inc/basic/ttstrhlp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,16 +33,16 @@ #define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) ) #define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) ) -#define StartKenn CUniString("%") -#define EndKenn CUniString("%") -#define UIdKenn ( StartKenn.AppendAscii("UId") ) -#define MethodKenn ( StartKenn.AppendAscii("Method") ) -#define TypeKenn ( StartKenn.AppendAscii("RType") ) -#define SlotKenn ( StartKenn.AppendAscii("SlotId") ) -#define RcKenn ( StartKenn.AppendAscii("RCommand") ) -#define TabKenn ( StartKenn.AppendAscii("Tab") ) -#define MakeStringParam(Type,aText) ( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) ) -#define MakeStringNumber(Type,nNumber) MakeStringParam (Type, UniString::CreateFromInt32(nNumber)) +#define StartKenn CUniString("%") +#define EndKenn CUniString("%") +#define UIdKenn ( StartKenn.AppendAscii("UId") ) +#define MethodKenn ( StartKenn.AppendAscii("Method") ) +#define TypeKenn ( StartKenn.AppendAscii("RType") ) +#define SlotKenn ( StartKenn.AppendAscii("SlotId") ) +#define RcKenn ( StartKenn.AppendAscii("RCommand") ) +#define TabKenn ( StartKenn.AppendAscii("Tab") ) +#define MakeStringParam(Type,aText) ( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) ) +#define MakeStringNumber(Type,nNumber) MakeStringParam (Type, UniString::CreateFromInt32(nNumber)) #define UIdString(aID) MakeStringParam(UIdKenn,aID.GetText()) #define MethodString(nNumber) MakeStringNumber(MethodKenn,nNumber) #define TypeString(nNumber) MakeStringNumber(TypeKenn,nNumber) @@ -50,9 +50,9 @@ #define RcString(nNumber) MakeStringNumber(RcKenn,nNumber) #define TabString(nNumber) MakeStringNumber(TabKenn,nNumber) -#define ResKenn ( StartKenn.AppendAscii("ResId") ) -#define BaseArgKenn ( StartKenn.AppendAscii("Arg") ) -#define ArgKenn(nNumber) ( BaseArgKenn.Append( UniString::CreateFromInt32(nNumber) ) ) +#define ResKenn ( StartKenn.AppendAscii("ResId") ) +#define BaseArgKenn ( StartKenn.AppendAscii("Arg") ) +#define ArgKenn(nNumber) ( BaseArgKenn.Append( UniString::CreateFromInt32(nNumber) ) ) #define ResString(nNumber) MakeStringNumber(ResKenn,nNumber) #define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText) diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx index f79778c61ee0..a08e5d51e970 100644 --- a/basic/inc/basrid.hxx +++ b/basic/inc/basrid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/modsizeexceeded.hxx index 414b7aff72e0..6e290b82a982 100644 --- a/basic/inc/modsizeexceeded.hxx +++ b/basic/inc/modsizeexceeded.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com::sun::star::tas { // C++ interface public: - ModuleSizeExceeded( const com::sun::star::uno::Sequence< ::rtl::OUString>& sModules ); + ModuleSizeExceeded( const com::sun::star::uno::Sequence< ::rtl::OUString>& sModules ); sal_Bool isAbort() const; sal_Bool isApprove() const; @@ -55,7 +55,7 @@ class ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com::sun::star::tas com::sun::star::uno::Any m_aRequest; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_lContinuations; com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > m_xAbort; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation> m_xApprove; + com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation> m_xApprove; }; #endif diff --git a/basic/inc/pch/precompiled_basic.cxx b/basic/inc/pch/precompiled_basic.cxx index 29280bf5059a..6c546e131ba7 100644 --- a/basic/inc/pch/precompiled_basic.cxx +++ b/basic/inc/pch/precompiled_basic.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index dd755b1294bf..162f20a12602 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc index c371d2abc046..340b594bf047 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ #define IDS_SBERR_START RID_BASIC_START #endif -#define IDS_SBERR_TERMINATED IDS_SBERR_START+2000 -#define IDS_SBERR_STOREREF IDS_SBERR_START+2001 +#define IDS_SBERR_TERMINATED IDS_SBERR_START+2000 +#define IDS_SBERR_STOREREF IDS_SBERR_START+2001 -// #define IDS_SBERR_LIBLOAD IDS_SBERR_START+2002 -// #define IDS_SBERR_LIBSAVE IDS_SBERR_START+2003 -// #define IDS_SBERR_MGROPEN IDS_SBERR_START+2004 -// #define IDS_SBERR_MGRSAVE IDS_SBERR_START+2005 -// #define IDS_SBERR_REMOVELIB IDS_SBERR_START+2006 -// #define IDS_SBERR_UNLOADLIB IDS_SBERR_START+2007 +// #define IDS_SBERR_LIBLOAD IDS_SBERR_START+2002 +// #define IDS_SBERR_LIBSAVE IDS_SBERR_START+2003 +// #define IDS_SBERR_MGROPEN IDS_SBERR_START+2004 +// #define IDS_SBERR_MGRSAVE IDS_SBERR_START+2005 +// #define IDS_SBERR_REMOVELIB IDS_SBERR_START+2006 +// #define IDS_SBERR_UNLOADLIB IDS_SBERR_START+2007 #endif diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx index b54d77974fef..19b72d1a2273 100644 --- a/basic/inc/sb.hxx +++ b/basic/inc/sb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/inc/svtmsg.hrc b/basic/inc/svtmsg.hrc index ff215d3fc9cb..f94fca403d18 100644 --- a/basic/inc/svtmsg.hrc +++ b/basic/inc/svtmsg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,77 +39,77 @@ // the appropriate new or no Strings are viewed. /////////////////////////////// -#define S_GPF_ABORT ( SVT_START + 0 ) -#define S_APP_SHUTDOWN ( SVT_START + 1 ) -#define S_SID_EXECUTE_FAILED_NO_DISPATCHER ( SVT_START + 2 ) -#define S_SID_EXECUTE_FAILED ( SVT_START + 3 ) -#define S_UNO_PROPERTY_NITIALIZE_FAILED ( SVT_START + 4 ) -#define S_RESETAPPLICATION_FAILED_COMPLEX ( SVT_START + 5 ) -#define S_RESETAPPLICATION_FAILED_UNKNOWN ( SVT_START + 6 ) -#define S_NO_ACTIVE_WINDOW ( SVT_START + 7 ) -#define S_NO_DIALOG_IN_GETACTIVE ( SVT_START + 8 ) -#define S_NO_POPUP ( SVT_START + 9 ) -#define S_NO_SUBMENU ( SVT_START + 10 ) -#define S_CONTROLTYPE_NOT_SUPPORTED ( SVT_START + 11 ) -#define S_SELECTION_BY_ATTRIBUTE_ONLY_DIRECTORIES ( SVT_START + 12 ) -#define S_NO_MORE_FILES ( SVT_START + 13 ) -#define S_UNKNOWN_METHOD ( SVT_START + 14 ) -#define S_INVALID_PARAMETERS ( SVT_START + 15 ) -#define S_POINTER_OUTSIDE_APPWIN ( SVT_START + 16 ) -#define S_UNKNOWN_COMMAND ( SVT_START + 17 ) -#define S_WIN_NOT_FOUND ( SVT_START + 18 ) -#define S_WIN_INVISIBLE ( SVT_START + 19 ) -#define S_WIN_DISABLED ( SVT_START + 20 ) -#define S_NUMBER_TOO_BIG ( SVT_START + 21 ) -#define S_NUMBER_TOO_SMALL ( SVT_START + 22 ) -#define S_WINDOW_DISAPPEARED ( SVT_START + 23 ) -#define S_ERROR_SAVING_IMAGE ( SVT_START + 24 ) -#define S_INVALID_POSITION ( SVT_START + 25 ) -#define S_SPLITWIN_NOT_FOUND ( SVT_START + 26 ) -#define S_INTERNAL_ERROR ( SVT_START + 27 ) -#define S_NO_STATUSBAR ( SVT_START + 28 ) -#define S_ITEMS_INVISIBLE ( SVT_START + 29 ) -#define S_TABPAGE_NOT_FOUND ( SVT_START + 30 ) -#define S_TRISTATE_NOT_ALLOWED ( SVT_START + 31 ) -#define S_ERROR_IN_SET_TEXT ( SVT_START + 32 ) -#define S_ATTEMPT_TO_WRITE_READONLY ( SVT_START + 33 ) -#define S_NO_SELECT_FALSE ( SVT_START + 34 ) -#define S_ENTRY_NOT_FOUND ( SVT_START + 35 ) -#define S_METHOD_FAILED ( SVT_START + 36 ) -#define S_HELPID_ON_TOOLBOX_NOT_FOUND ( SVT_START + 37 ) -#define S_BUTTON_DISABLED_ON_TOOLBOX ( SVT_START + 38 ) -#define S_BUTTON_HIDDEN_ON_TOOLBOX ( SVT_START + 39 ) -#define S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX ( SVT_START + 40 ) -#define S_TEAROFF_FAILED ( SVT_START + 41 ) -#define S_NO_SELECTED_ENTRY_DEPRECATED ( SVT_START + 42 ) // Has to stay in for old res files +#define S_GPF_ABORT ( SVT_START + 0 ) +#define S_APP_SHUTDOWN ( SVT_START + 1 ) +#define S_SID_EXECUTE_FAILED_NO_DISPATCHER ( SVT_START + 2 ) +#define S_SID_EXECUTE_FAILED ( SVT_START + 3 ) +#define S_UNO_PROPERTY_NITIALIZE_FAILED ( SVT_START + 4 ) +#define S_RESETAPPLICATION_FAILED_COMPLEX ( SVT_START + 5 ) +#define S_RESETAPPLICATION_FAILED_UNKNOWN ( SVT_START + 6 ) +#define S_NO_ACTIVE_WINDOW ( SVT_START + 7 ) +#define S_NO_DIALOG_IN_GETACTIVE ( SVT_START + 8 ) +#define S_NO_POPUP ( SVT_START + 9 ) +#define S_NO_SUBMENU ( SVT_START + 10 ) +#define S_CONTROLTYPE_NOT_SUPPORTED ( SVT_START + 11 ) +#define S_SELECTION_BY_ATTRIBUTE_ONLY_DIRECTORIES ( SVT_START + 12 ) +#define S_NO_MORE_FILES ( SVT_START + 13 ) +#define S_UNKNOWN_METHOD ( SVT_START + 14 ) +#define S_INVALID_PARAMETERS ( SVT_START + 15 ) +#define S_POINTER_OUTSIDE_APPWIN ( SVT_START + 16 ) +#define S_UNKNOWN_COMMAND ( SVT_START + 17 ) +#define S_WIN_NOT_FOUND ( SVT_START + 18 ) +#define S_WIN_INVISIBLE ( SVT_START + 19 ) +#define S_WIN_DISABLED ( SVT_START + 20 ) +#define S_NUMBER_TOO_BIG ( SVT_START + 21 ) +#define S_NUMBER_TOO_SMALL ( SVT_START + 22 ) +#define S_WINDOW_DISAPPEARED ( SVT_START + 23 ) +#define S_ERROR_SAVING_IMAGE ( SVT_START + 24 ) +#define S_INVALID_POSITION ( SVT_START + 25 ) +#define S_SPLITWIN_NOT_FOUND ( SVT_START + 26 ) +#define S_INTERNAL_ERROR ( SVT_START + 27 ) +#define S_NO_STATUSBAR ( SVT_START + 28 ) +#define S_ITEMS_INVISIBLE ( SVT_START + 29 ) +#define S_TABPAGE_NOT_FOUND ( SVT_START + 30 ) +#define S_TRISTATE_NOT_ALLOWED ( SVT_START + 31 ) +#define S_ERROR_IN_SET_TEXT ( SVT_START + 32 ) +#define S_ATTEMPT_TO_WRITE_READONLY ( SVT_START + 33 ) +#define S_NO_SELECT_FALSE ( SVT_START + 34 ) +#define S_ENTRY_NOT_FOUND ( SVT_START + 35 ) +#define S_METHOD_FAILED ( SVT_START + 36 ) +#define S_HELPID_ON_TOOLBOX_NOT_FOUND ( SVT_START + 37 ) +#define S_BUTTON_DISABLED_ON_TOOLBOX ( SVT_START + 38 ) +#define S_BUTTON_HIDDEN_ON_TOOLBOX ( SVT_START + 39 ) +#define S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX ( SVT_START + 40 ) +#define S_TEAROFF_FAILED ( SVT_START + 41 ) +#define S_NO_SELECTED_ENTRY_DEPRECATED ( SVT_START + 42 ) // Has to stay in for old res files #define S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED ( SVT_START + 43 ) -#define S_ALLOWED_ONLY_IN_FLOATING_MODE ( SVT_START + 44 ) -#define S_ALLOWED_ONLY_IN_DOCKING_MODE ( SVT_START + 45 ) -#define S_SIZE_NOT_CHANGEABLE ( SVT_START + 46 ) -#define S_NO_OK_BUTTON ( SVT_START + 47 ) -#define S_NO_CANCEL_BUTTON ( SVT_START + 48 ) -#define S_NO_YES_BUTTON ( SVT_START + 49 ) -#define S_NO_NO_BUTTON ( SVT_START + 50 ) -#define S_NO_RETRY_BUTTON ( SVT_START + 51 ) -#define S_NO_HELP_BUTTON ( SVT_START + 52 ) -#define S_NO_DEFAULT_BUTTON ( SVT_START + 53 ) -#define S_BUTTON_ID_NOT_THERE ( SVT_START + 54 ) -#define S_BUTTONID_REQUIRED ( SVT_START + 55 ) -#define S_UNKNOWN_TYPE ( SVT_START + 56 ) -#define S_UNPACKING_STORAGE_FAILED ( SVT_START + 57 ) -#define S_NO_LIST_BOX_BUTTON ( SVT_START + 58 ) +#define S_ALLOWED_ONLY_IN_FLOATING_MODE ( SVT_START + 44 ) +#define S_ALLOWED_ONLY_IN_DOCKING_MODE ( SVT_START + 45 ) +#define S_SIZE_NOT_CHANGEABLE ( SVT_START + 46 ) +#define S_NO_OK_BUTTON ( SVT_START + 47 ) +#define S_NO_CANCEL_BUTTON ( SVT_START + 48 ) +#define S_NO_YES_BUTTON ( SVT_START + 49 ) +#define S_NO_NO_BUTTON ( SVT_START + 50 ) +#define S_NO_RETRY_BUTTON ( SVT_START + 51 ) +#define S_NO_HELP_BUTTON ( SVT_START + 52 ) +#define S_NO_DEFAULT_BUTTON ( SVT_START + 53 ) +#define S_BUTTON_ID_NOT_THERE ( SVT_START + 54 ) +#define S_BUTTONID_REQUIRED ( SVT_START + 55 ) +#define S_UNKNOWN_TYPE ( SVT_START + 56 ) +#define S_UNPACKING_STORAGE_FAILED ( SVT_START + 57 ) +#define S_NO_LIST_BOX_BUTTON ( SVT_START + 58 ) #define S_UNO_URL_EXECUTE_FAILED_NO_DISPATCHER ( SVT_START + 59 ) #define S_UNO_URL_EXECUTE_FAILED_NO_FRAME ( SVT_START + 60 ) -#define S_NO_MENU ( SVT_START + 61 ) -#define S_NO_SELECTED_ENTRY ( SVT_START + 62 ) +#define S_NO_MENU ( SVT_START + 61 ) +#define S_NO_SELECTED_ENTRY ( SVT_START + 62 ) #define S_UNO_URL_EXECUTE_FAILED_DISABLED ( SVT_START + 63 ) #define S_NO_SCROLLBAR ( SVT_START + 64 ) #define S_NO_SAX_PARSER ( SVT_START + 65 ) #define S_CANNOT_CREATE_DIRECTORY ( SVT_START + 66 ) #define S_DIRECTORY_NOT_EMPTY ( SVT_START + 67 ) #define S_DEPRECATED ( SVT_START + 68 ) -#define S_SIZE_BELOW_MINIMUM ( SVT_START + 69 ) -#define S_CANNOT_FIND_FLOATING_WIN ( SVT_START + 70 ) +#define S_SIZE_BELOW_MINIMUM ( SVT_START + 69 ) +#define S_CANNOT_FIND_FLOATING_WIN ( SVT_START + 70 ) #define S_NO_LIST_BOX_STRING ( SVT_START + 71 ) #define S_SLOT_IN_EXECUTE ( SVT_START + 72 ) #define S_MENU_NOT_CLOSING ( SVT_START + 73 ) diff --git a/basic/inc/testtool.hrc b/basic/inc/testtool.hrc index 075b462944c9..c61c2282f21c 100644 --- a/basic/inc/testtool.hrc +++ b/basic/inc/testtool.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,13 +24,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define S_INVALID_KEYCODE 257 -#define S_MANDATORY_FILE 258 -#define S_READING_LONGNAMES 259 -#define S_READING_SLOT_IDS 260 -#define S_READING_CONTROLS 261 -#define S_READING_BASIC_MODULE 262 -#define S_STARTING_APPLICATION 263 +#define S_INVALID_KEYCODE 257 +#define S_MANDATORY_FILE 258 +#define S_READING_LONGNAMES 259 +#define S_READING_SLOT_IDS 260 +#define S_READING_CONTROLS 261 +#define S_READING_BASIC_MODULE 262 +#define S_STARTING_APPLICATION 263 diff --git a/basic/inc/ttmsg.hrc b/basic/inc/ttmsg.hrc index 26f250bc6a6a..07da20096a90 100644 --- a/basic/inc/ttmsg.hrc +++ b/basic/inc/ttmsg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,73 +39,73 @@ // the appropriate new or no Strings are viewed. /////////////////////////////// -#define S_NAME_NOT_THERE ( TT_START + 0 ) -#define S_DOUBLE_NAME ( TT_START + 1 ) -#define S_READING_FILE ( TT_START + 2 ) -#define S_CANNOT_OPEN_FILE ( TT_START + 3 ) -#define S_INVALID_LINE ( TT_START + 4 ) -#define S_SHORTNAME_UNKNOWN ( TT_START + 5 ) -#define S_LONGNAME_UNKNOWN ( TT_START + 6 ) -#define S_FIRST_SHORTNAME_REQ_ASTRX ( TT_START + 7 ) -#define S_TIMOUT_WAITING ( TT_START + 8 ) -#define S_APPLICATION_RESTARTED ( TT_START + 9 ) -#define S_APPLICATION_START_FAILED ( TT_START + 10 ) -#define S_TIMOUT_SENDING ( TT_START + 11 ) -#define S_NO_CONNECTION ( TT_START + 12 ) -#define S_NO_FILES_FOUND ( TT_START + 13 ) // Not used anymore. needed only for old *.res files -#define S_ERRORS_DETECTED ( TT_START + 14 ) -#define S_NO_ERRORS_DETECTED ( TT_START + 15 ) -#define S_WARNINGS_DETECTED ( TT_START + 16 ) -#define S_NO_WARNINGS_DETECTED ( TT_START + 17 ) -#define S_UNKNOWN_SLOT_CONTROL ( TT_START + 18 ) -#define S_RETURN_SEQUENCE_MISSMATCH ( TT_START + 19 ) -#define S_RETURNED_VALUE_ID_MISSMATCH ( TT_START + 20 ) -#define S_RETURNED_VALUE_NO_RECEIVER ( TT_START + 21 ) -#define S_UNKNOWN_METHOD ( TT_START + 22 ) -#define S_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 23 ) -#define S_NO_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 24 ) +#define S_NAME_NOT_THERE ( TT_START + 0 ) +#define S_DOUBLE_NAME ( TT_START + 1 ) +#define S_READING_FILE ( TT_START + 2 ) +#define S_CANNOT_OPEN_FILE ( TT_START + 3 ) +#define S_INVALID_LINE ( TT_START + 4 ) +#define S_SHORTNAME_UNKNOWN ( TT_START + 5 ) +#define S_LONGNAME_UNKNOWN ( TT_START + 6 ) +#define S_FIRST_SHORTNAME_REQ_ASTRX ( TT_START + 7 ) +#define S_TIMOUT_WAITING ( TT_START + 8 ) +#define S_APPLICATION_RESTARTED ( TT_START + 9 ) +#define S_APPLICATION_START_FAILED ( TT_START + 10 ) +#define S_TIMOUT_SENDING ( TT_START + 11 ) +#define S_NO_CONNECTION ( TT_START + 12 ) +#define S_NO_FILES_FOUND ( TT_START + 13 ) // Not used anymore. needed only for old *.res files +#define S_ERRORS_DETECTED ( TT_START + 14 ) +#define S_NO_ERRORS_DETECTED ( TT_START + 15 ) +#define S_WARNINGS_DETECTED ( TT_START + 16 ) +#define S_NO_WARNINGS_DETECTED ( TT_START + 17 ) +#define S_UNKNOWN_SLOT_CONTROL ( TT_START + 18 ) +#define S_RETURN_SEQUENCE_MISSMATCH ( TT_START + 19 ) +#define S_RETURNED_VALUE_ID_MISSMATCH ( TT_START + 20 ) +#define S_RETURNED_VALUE_NO_RECEIVER ( TT_START + 21 ) +#define S_UNKNOWN_METHOD ( TT_START + 22 ) +#define S_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 23 ) +#define S_NO_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 24 ) // Strings /* -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) -#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) +#define S_ ( TT_START + 0 ) */ diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 8f6f21aa3240..c7a613fbb410 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ uno::Reference< XContentProviderManager > InitializeUCB( void ) // set global factory setProcessServiceFactory( xSMgr ); -/* // Create simple ConfigManager +/* // Create simple ConfigManager Sequence< Any > aConfArgs(3); aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); @@ -218,7 +218,7 @@ uno::Reference< XContentProviderManager > InitializeUCB( void ) // Create unconfigured Ucb: -/* Sequence< Any > aArgs(1); +/* Sequence< Any > aArgs(1); aArgs[1] = makeAny ( xConfProvider );*/ Sequence< Any > aArgs; ::ucbhelper::ContentBroker::initialize( xSMgr, aArgs ); @@ -230,7 +230,7 @@ uno::Reference< XContentProviderManager > InitializeUCB( void ) xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True ); -/* uno::Reference< XContentProvider > xPackageProvider +/* uno::Reference< XContentProvider > xPackageProvider ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY ); xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True ); */ @@ -315,30 +315,30 @@ void BasicApp::Main( ) AllSettings aSettings = GetSettings(); aSettings.SetUILanguage( aRequestedLanguage ); aSettings.SetLanguage( aRequestedLanguage ); -// International aInternational; -// aInternational = GetSettings().GetInternational(); -// aInternational = International( aRequestedLanguage ); -// aSettings.SetInternational( aInternational ); +// International aInternational; +// aInternational = GetSettings().GetInternational(); +// aInternational = International( aRequestedLanguage ); +// aSettings.SetInternational( aInternational ); SetSettings( aSettings ); -// aInternational = GetSettings().GetInternational(); +// aInternational = GetSettings().GetInternational(); } -// ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ), ) +// ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ), ) //const char* ResMgr::GetLang( LanguageType& nType, USHORT nPrio ) -// ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ) -// ResMgr *pRes = new ResMgr( "testtool.res" ); -// Resource::SetResManager( pRes ); +// ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ) +// ResMgr *pRes = new ResMgr( "testtool.res" ); +// Resource::SetResManager( pRes ); BasicDLL aBasicDLL; nWait = 0; // Hilfe: -// pHelp = new Help; -// SetHelp( pHelp ); -// Help::EnableContextHelp(); -// Help::EnableExtHelp(); -// DeactivateExtHelp(); +// pHelp = new Help; +// SetHelp( pHelp ); +// Help::EnableContextHelp(); +// Help::EnableExtHelp(); +// DeactivateExtHelp(); // Acceleratoren Accelerator aAccel( SttResId( MAIN_ACCEL ) ); @@ -363,7 +363,7 @@ void BasicApp::Main( ) PostUserEvent( LINK( this, BasicApp, LateInit ) ); Execute(); -// delete pHelp; +// delete pHelp; delete pFrame; RemoveAccel( pMainAccel ); @@ -398,7 +398,7 @@ void BasicApp::SetFocus() IMPL_LINK( BasicApp, LateInit, void *, pDummy ) { - (void) pDummy; /* avoid warning about unused parameter */ + (void) pDummy; /* avoid warning about unused parameter */ USHORT i; for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { @@ -506,7 +506,7 @@ void FloatingExecutionStatus::SetAdditionalInfo( String aF ) IMPL_LINK(FloatingExecutionStatus, HideNow, FloatingExecutionStatus*, pFLC ) { - (void) pFLC; /* avoid warning about unused parameter */ + (void) pFLC; /* avoid warning about unused parameter */ Hide(); return 0; } @@ -532,20 +532,20 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, Application::SetDefDialogParent( this ); AlwaysEnableInput( TRUE ); - pBasic = TTBasic::CreateMyBasic(); // depending on what was linked to the executable + pBasic = TTBasic::CreateMyBasic(); // depending on what was linked to the executable bInBreak = FALSE; bDisas = FALSE; nFlags = 0; -// Icon aAppIcon; +// Icon aAppIcon; - if ( pBasic->pTestObject ) // Are we the testtool? + if ( pBasic->pTestObject ) // Are we the testtool? { -// aAppIcon = Icon( ResId( RID_APPICON2 ) ); +// aAppIcon = Icon( ResId( RID_APPICON2 ) ); aAppName = String( SttResId( IDS_APPNAME2 ) ); } else { -// aAppIcon = Icon( ResId( RID_APPICON ) ); +// aAppIcon = Icon( ResId( RID_APPICON ) ); aAppName = String( SttResId( IDS_APPNAME ) ); } @@ -562,9 +562,9 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, pFileMenu->SetHighlightHdl( LINK( this, BasicFrame, HighlightMenu ) ); pFileMenu->SetActivateHdl( LINK( this, BasicFrame, InitMenu ) ); pFileMenu->SetDeactivateHdl( LINK( this, BasicFrame, DeInitMenu ) ); - if (Basic().pTestObject ) // Are we TestTool? + if (Basic().pTestObject ) // Are we TestTool? { - pFileMenu->RemoveItem( pFileMenu->GetItemPos( RID_FILELOADLIB ) -1 ); // Separator before + pFileMenu->RemoveItem( pFileMenu->GetItemPos( RID_FILELOADLIB ) -1 ); // Separator before pFileMenu->RemoveItem( pFileMenu->GetItemPos( RID_FILELOADLIB ) ); pFileMenu->RemoveItem( pFileMenu->GetItemPos( RID_FILESAVELIB ) ); } @@ -579,14 +579,14 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, pRunMenu->SetHighlightHdl( LINK( this, BasicFrame, HighlightMenu ) ); pRunMenu->SetActivateHdl( LINK( this, BasicFrame, InitMenu ) ); pRunMenu->SetDeactivateHdl( LINK( this, BasicFrame, DeInitMenu ) ); - if (Basic().pTestObject ) // Are we TestTool? + if (Basic().pTestObject ) // Are we TestTool? { pRunMenu->RemoveItem( pRunMenu->GetItemPos( RID_RUNDISAS ) ); pRunMenu->RemoveItem( pRunMenu->GetItemPos( RID_RUNCOMPILE ) ); } PopupMenu *pExtras; - if (Basic().pTestObject ) // Are we TestTool? + if (Basic().pTestObject ) // Are we TestTool? { pExtras = new PopupMenu( SttResId( RID_TT_EXTRAS ) ); pBar->InsertItem( RID_TT_EXTRAS, String( SttResId( RID_TT_EXTRAS_NAME ) ), 0, pBar->GetItemPos( RID_APPWINDOW ) ); @@ -618,7 +618,7 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, LoadIniFile(); UpdateTitle(); -// SetIcon( aAppIcon ); +// SetIcon( aAppIcon ); // Size: half width, 0.75 * height - 2 * IconSize { @@ -627,9 +627,9 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, SetWindowState( aConf.ReadKey("WinParams", "") ); } -// pWork = new AppEdit( this, NULL ); -// pWork->Show(); -// pWork->Close(); +// pWork = new AppEdit( this, NULL ); +// pWork->Show(); +// pWork->Close(); aLineNum.SetTimeoutHdl( LINK( this, BasicFrame, ShowLineNr ) ); aLineNum.SetTimeout(200); @@ -700,12 +700,12 @@ BasicFrame::~BasicFrame() delete pStatus; delete pPrn; delete pList; -// delete pExecutionStatus; -// delete pBasic; +// delete pExecutionStatus; +// delete pBasic; pBasic.Clear(); } -void BasicFrame::Command( const CommandEvent& rCEvt ) +void BasicFrame::Command( const CommandEvent& rCEvt ) { switch( rCEvt.GetCommand() ) { case COMMAND_SHOWDIALOG: @@ -803,7 +803,7 @@ void BasicFrame::Notify( SfxBroadcaster&, const SfxHint& rHint ) aTotalStatus.AppendAscii( " " ); aTotalStatus.Append( pStatusHint->GetAdditionalExecutionStatus() ); pStatus->Message( aTotalStatus ); -/* if ( !pExecutionStatus ) +/* if ( !pExecutionStatus ) pExecutionStatus = new FloatingExecutionStatus( this ); pExecutionStatus->SetStatus( pStatusHint->GetExecutionStatus() ); pExecutionStatus->SetAdditionalInfo( pStatusHint->GetAdditionalExecutionStatus() );*/ @@ -811,7 +811,7 @@ void BasicFrame::Notify( SfxBroadcaster&, const SfxHint& rHint ) break; case TT_EXECUTION_HIDE_ACTION: { -/* if ( pExecutionStatus ) +/* if ( pExecutionStatus ) { delete pExecutionStatus; pExecutionStatus = NULL; @@ -904,7 +904,7 @@ void BasicFrame::WinShow_Hide() { if ( p->pDataEdit ) { - if ( p->GetWinState() & TT_WIN_STATE_HIDE // Hidden + if ( p->GetWinState() & TT_WIN_STATE_HIDE // Hidden || ( bWasFullscreen && ( !p->IsPined() || p->GetWinState() & TT_WIN_STATE_MAX )) ) p->Hide( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); @@ -928,7 +928,7 @@ void BasicFrame::WinMax_Restore() void BasicFrame::RemoveWindow( AppWin *pWin ) { -// delete pIcon; +// delete pIcon; pList->Remove( pWin ); pWork = pList->Last(); @@ -942,7 +942,7 @@ void BasicFrame::RemoveWindow( AppWin *pWin ) Menu* pMenu = GetMenuBar(); if( pList->Count() == 0 ) { pMenu->EnableItem( RID_APPEDIT, FALSE ); - pMenu->EnableItem( RID_APPRUN, FALSE ); + pMenu->EnableItem( RID_APPRUN, FALSE ); pMenu->EnableItem( RID_APPWINDOW, FALSE ); } @@ -968,7 +968,7 @@ void BasicFrame::AddWindow( AppWin *pWin ) MenuBar* pMenu = GetMenuBar(); if( pList->Count() > 0 ) { pMenu->EnableItem( RID_APPEDIT, TRUE ); - pMenu->EnableItem( RID_APPRUN, TRUE ); + pMenu->EnableItem( RID_APPRUN, TRUE ); pMenu->EnableItem( RID_APPWINDOW, TRUE ); } @@ -1154,31 +1154,31 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu ) BOOL bHasEdit = BOOL( /*bNormal &&*/ pWork != NULL ); -// pMenu->EnableItem( RID_FILENEW, bNormal ); // always possible -// pMenu->EnableItem( RID_FILEOPEN, bNormal ); - pMenu->EnableItem( RID_FILECLOSE, bHasEdit ); - pMenu->EnableItem( RID_FILESAVE, bHasEdit ); - pMenu->EnableItem( RID_FILESAVEAS, bHasEdit ); - pMenu->EnableItem( RID_FILEPRINT, bHasEdit ); - pMenu->EnableItem( RID_FILESETUP, bHasEdit ); - pMenu->EnableItem( RID_FILELOADLIB, bNormal ); - pMenu->EnableItem( RID_FILESAVELIB, bHasEdit ); +// pMenu->EnableItem( RID_FILENEW, bNormal ); // always possible +// pMenu->EnableItem( RID_FILEOPEN, bNormal ); + pMenu->EnableItem( RID_FILECLOSE, bHasEdit ); + pMenu->EnableItem( RID_FILESAVE, bHasEdit ); + pMenu->EnableItem( RID_FILESAVEAS, bHasEdit ); + pMenu->EnableItem( RID_FILEPRINT, bHasEdit ); + pMenu->EnableItem( RID_FILESETUP, bHasEdit ); + pMenu->EnableItem( RID_FILELOADLIB, bNormal ); + pMenu->EnableItem( RID_FILESAVELIB, bHasEdit ); BOOL bHasErr = BOOL( bNormal && pBasic->GetErrors() != 0 ); BOOL bNext = bHasErr & bNormal; BOOL bPrev = bHasErr & bNormal; - if( bHasErr ) + if( bHasErr ) { ULONG n = pBasic->aErrors.GetCurPos(); if( n == 0 ) bPrev = FALSE; - if( USHORT(n+1) == pBasic->GetErrors() ) + if( USHORT(n+1) == pBasic->GetErrors() ) bNext = FALSE; } pMenu->EnableItem( RID_RUNNEXTERR, bNext ); pMenu->EnableItem( RID_RUNPREVERR, bPrev ); pMenu->CheckItem( RID_RUNDISAS, bDisas ); - if( pWork ) + if( pWork ) pWork->InitMenu( pMenu ); return TRUE; @@ -1186,8 +1186,8 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu ) IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu ) { - (void) pMenu; /* avoid warning about unused parameter */ -/* pMenu->EnableItem( RID_RUNCOMPILE ); + (void) pMenu; /* avoid warning about unused parameter */ +/* pMenu->EnableItem( RID_RUNCOMPILE ); pMenu->EnableItem( RID_FILECLOSE ); pMenu->EnableItem( RID_FILESAVE ); @@ -1233,7 +1233,7 @@ IMPL_LINK_INLINE_END( BasicFrame, Accel, Accelerator*, pAcc ) IMPL_LINK_INLINE_START( BasicFrame, ShowLineNr, AutoTimer *, pTimer ) { - (void) pTimer; /* avoid warning about unused parameter */ + (void) pTimer; /* avoid warning about unused parameter */ String aPos; if ( pWork && pWork->ISA(AppBasEd)) { @@ -1252,7 +1252,7 @@ MsgEdit* BasicFrame::GetMsgTree( String aLogFileName ) return FindErrorWin( aLogFileName )->GetMsgTree(); } else - { // create new Window on the fly + { // create new Window on the fly AppError *pNewWindow = new AppError( this, aLogFileName ); pNewWindow->Show(); pNewWindow->GrabFocus(); @@ -1334,7 +1334,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) AppBasEd* p = new AppBasEd( this, NULL ); p->Show(); p->GrabFocus(); - // InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); + // InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); } break; case RID_FILEOPEN: { @@ -1342,7 +1342,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) { AddToLRU( s ); LoadFile( s ); -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); } } break; case RID_FILELOADLIB: @@ -1353,7 +1353,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) break; case RID_FILECLOSE: if( pWork && pWork->Close() ){}; -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); break; case RID_FILEPRINT: if( pWork ) @@ -1398,7 +1398,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) nFlags = SbDEBUG_BREAK; goto start; start: { -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); if ( !Basic().IsRunning() || bInBreak ) { AppBasEd* p = NULL; @@ -1437,11 +1437,11 @@ long BasicFrame::Command( short nID, BOOL bChecked ) p->Run(); BasicDLL::SetDebugMode( FALSE ); // If cancelled during Interactive=FALSE -// BasicDLL::EnableBreak( TRUE ); +// BasicDLL::EnableBreak( TRUE ); } }} } -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); // after run +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); // after run break; case RID_RUNCOMPILE: if( pWork && pWork->ISA(AppBasEd) && SaveAll() ) @@ -1457,7 +1457,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) case RID_RUNBREAK: if ( Basic().IsRunning() && !bInBreak ) { -// pINST->CalcBreakCallLevel(SbDEBUG_STEPINTO); +// pINST->CalcBreakCallLevel(SbDEBUG_STEPINTO); pINST->nBreakCallLvl = pINST->nCallLvl; } break; @@ -1533,10 +1533,10 @@ long BasicFrame::Command( short nID, BOOL bChecked ) } break; case RID_WINTILEVERT: -//#define WINDOWARRANGE_TILE 1 -//#define WINDOWARRANGE_HORZ 2 -//#define WINDOWARRANGE_VERT 3 -//#define WINDOWARRANGE_CASCADE 4 +//#define WINDOWARRANGE_TILE 1 +//#define WINDOWARRANGE_HORZ 2 +//#define WINDOWARRANGE_VERT 3 +//#define WINDOWARRANGE_CASCADE 4 { WindowArrange aArange; for ( ULONG i = 0 ; i < pList->Count() ; i++ ) @@ -1569,7 +1569,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) } break; -/* case RID_HELPTOPIC: +/* case RID_HELPTOPIC: if( pWork ) pWork->Help(); break; case RID_HELPKEYS: @@ -1581,7 +1581,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) case RID_HELPINTRO: aBasicApp.pHelp->Start( OOO_HELP_HELPONHELP ); break; -*/ case RID_HELPABOUT: +*/ case RID_HELPABOUT: { SttResId aResId( IDD_ABOUT_DIALOG ); if ( Basic().pTestObject ) // Are we TestTool? @@ -1614,14 +1614,14 @@ long BasicFrame::Command( short nID, BOOL bChecked ) AddToLRU( s ); LoadFile( s ); -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); } else { -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT )); // So daß Delete richtig ist +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT )); // So daß Delete richtig ist if( pWork ) pWork->Command( CommandEvent( Point(), nID ) ); -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT )); // So daß Delete richtig ist +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT )); // So daß Delete richtig ist } } return TRUE; @@ -1720,8 +1720,8 @@ private: public: ByteString aFilterType; NewFileDialog( Window* pParent, WinBits nWinStyle ):FileDialog( pParent, nWinStyle ){}; - virtual short Execute(); - virtual void FilterSelect(); + virtual short Execute(); + virtual void FilterSelect(); }; void NewFileDialog::FilterSelect() @@ -1730,7 +1730,7 @@ void NewFileDialog::FilterSelect() if ( aLastPath.Len() == 0 ) aLastPath = DirEntry( GetPath() ).GetPath().GetFull(); if ( aLastPath.CompareIgnoreCaseToAscii( DirEntry( GetPath() ).GetPath().GetFull() ) != COMPARE_EQUAL ) - return; // User decides after he has changed the path + return; // User decides after he has changed the path String aCurFilter = GetCurFilter(); USHORT nFilterNr = 0; @@ -1746,8 +1746,8 @@ void NewFileDialog::FilterSelect() aConf.SetGroup( aCurrentProfile ); aLastPath = UniString( aConf.ReadKey( aFilterType, aConf.ReadKey( "BaseDir" ) ), RTL_TEXTENCODING_UTF8 ); SetPath( aLastPath ); -// if ( IsInExecute() ) -// SetPath( "" ); +// if ( IsInExecute() ) +// SetPath( "" ); } short NewFileDialog::Execute() @@ -1806,14 +1806,14 @@ BOOL BasicFrame::QueryFileName aDlg.SetCurFilter( String( SttResId( IDS_BASFILTER ) ) ); aDlg.FilterSelect(); // Selects the last used path -// if ( bSave ) +// if ( bSave ) if ( rName.Len() > 0 ) aDlg.SetPath( rName ); if( aDlg.Execute() ) { rName = aDlg.GetPath(); -/* rExtension = aDlg.GetCurrentFilter(); +/* rExtension = aDlg.GetCurrentFilter(); var i:integer; for ( i = 0 ; i < aDlg.GetFilterCount() ; i++ ) if ( rExtension == aDlg.GetFilterName( i ) ) @@ -1826,15 +1826,15 @@ BOOL BasicFrame::QueryFileName USHORT BasicFrame::BreakHandler() { bInBreak = TRUE; -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); -// MenuBar aBar( ResId( RID_APPMENUBAR ) ); -// aBar.EnableItem( RID_APPEDIT, FALSE ); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// MenuBar aBar( ResId( RID_APPMENUBAR ) ); +// aBar.EnableItem( RID_APPEDIT, FALSE ); SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) ); while( bInBreak ) GetpApp()->Yield(); SetAppMode( String( SttResId ( IDS_APPMODE_RUN ) ) ); -// aBar.EnableItem( RID_APPEDIT, TRUE ); -// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); +// aBar.EnableItem( RID_APPEDIT, TRUE ); +// InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); return nFlags; } @@ -1903,12 +1903,12 @@ String BasicFrame::GenRealString( const String &aResString ) nEnd = nEnd + aString.Len(); aString.Erase(); } -// if ( Resource::GetResManager()->IsAvailable( ResId( aValue ) ) ) +// if ( Resource::GetResManager()->IsAvailable( ResId( aValue ) ) ) aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) ); -// else +// else { -// DBG_ERROR( "Could not load resource!" ); -// return aResString; +// DBG_ERROR( "Could not load resource!" ); +// return aResString; } nInsertPos = nStart; nStartPos = nStart; diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index e743a978db69..48a348a686ce 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ class BasicPrinter; struct TTLogMsg; class BasicApp : public Application { - short nWait; // Wait-Zaehler + short nWait; // Wait-Zaehler public: -// Help* pHelp; // Hilfesystem - BasicFrame* pFrame; // Frame Window -// MenuBar* pMainMenu; // Hauptmenue - Accelerator* pMainAccel; // Acceleratoren +// Help* pHelp; // Hilfesystem + BasicFrame* pFrame; // Frame Window +// MenuBar* pMainMenu; // Hauptmenue + Accelerator* pMainAccel; // Acceleratoren void Main( ); @@ -74,11 +74,11 @@ public: typedef USHORT FileType; #define FT_NO_FILE (FileType)0x00 // An error has occurred ... -#define FT_BASIC_SOURCE (FileType)0x01 -#define FT_BASIC_INCLUDE (FileType)0x02 -#define FT_RESULT_FILE (FileType)0x04 -#define FT_RESULT_FILE_TXT (FileType)0x08 -#define FT_BASIC_LIBRARY (FileType)0x10 +#define FT_BASIC_SOURCE (FileType)0x01 +#define FT_BASIC_INCLUDE (FileType)0x02 +#define FT_RESULT_FILE (FileType)0x04 +#define FT_RESULT_FILE_TXT (FileType)0x08 +#define FT_BASIC_LIBRARY (FileType)0x10 struct WinInfoRec; class DisplayHidDlg; @@ -102,21 +102,21 @@ virtual void GetFocus(); BOOL bIsAutoRun; DisplayHidDlg* pDisplayHidDlg; -// BreakPoint *pRunToCursorBP; +// BreakPoint *pRunToCursorBP; SbxVariable *pEditVar; - Timer aCheckFiles; // Checks the files for changes + Timer aCheckFiles; // Checks the files for changes BOOL bAutoReload; BOOL bAutoSave; DECL_LINK( CheckAllFiles, Timer* ); - MyBasicRef pBasic; // BASIC-Engine + MyBasicRef pBasic; // BASIC-Engine - String aAppName; // Title bar content - String aAppFile; // AppName AppFile [AppMode] + String aAppName; // Title bar content + String aAppFile; // AppName AppFile [AppMode] String aAppMode; void UpdateTitle(); DECL_LINK( CloseButtonClick, void* ); @@ -128,14 +128,14 @@ virtual void GetFocus(); public: BOOL IsAutoRun(); void SetAutoRun( BOOL bAuto ); - BOOL bInBreak; // TRUE if in Break-Handler - StatusLine* pStatus; // Status line - EditList* pList; // List of edit windows - AppWin* pWork; // Current edit window - BasicPrinter* pPrn; // Printer - BOOL bDisas; // TRUE: disassemble - USHORT nFlags; // Debugging-Flags - USHORT nMaximizedWindows; // Number of maximized windows + BOOL bInBreak; // TRUE if in Break-Handler + StatusLine* pStatus; // Status line + EditList* pList; // List of edit windows + AppWin* pWork; // Current edit window + BasicPrinter* pPrn; // Printer + BOOL bDisas; // TRUE: disassemble + USHORT nFlags; // Debugging-Flags + USHORT nMaximizedWindows; // Number of maximized windows void FocusWindow( AppWin *pWin ); void WinMax_Restore(); void WinShow_Hide(); @@ -145,7 +145,7 @@ public: BasicFrame(); ~BasicFrame(); - MyBasic& Basic() { return *pBasic; } + MyBasic& Basic() { return *pBasic; } void AddToLRU(String const& aFile); void LoadLRU(); DECL_LINK( InitMenu, Menu * ); @@ -160,7 +160,7 @@ public: BOOL LoadFile( String aFilename ); long Command( short,BOOL=FALSE ); // Command handler virtual void Command( const CommandEvent& rCEvt ); // Command handler - BOOL SaveAll(); // Save all windows + BOOL SaveAll(); // Save all windows BOOL QueryFileName( String& rName, FileType nFileType, BOOL bSave ); // Query for filename DECL_LINK( ModuleWinExists, String* ); DECL_LINK( WriteString, String* ); @@ -170,7 +170,7 @@ public: AppWin* FindWin( const String& ); AppWin* FindWin( USHORT nWinId ); AppWin* IsWinValid( AppWin* pMaybeWin ); - USHORT BreakHandler(); // Break-Handler-Callback + USHORT BreakHandler(); // Break-Handler-Callback void SetEditVar( SbxVariable *pVar ){ pEditVar = pVar;} SbxVariable* GetEditVar(){ return pEditVar;} diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx index 527390f9a46c..09ed48958142 100644 --- a/basic/source/app/appbased.cxx +++ b/basic/source/app/appbased.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p ) ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( TRUE ); ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetMaxTextLen( STRING_MAXLEN ); -// ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetWordDelimiters( CUniString(" ,.;:(){}[]\"'+-*/<>^\\") ); +// ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetWordDelimiters( CUniString(" ,.;:(){}[]\"'+-*/<>^\\") ); ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( TRUE ); ((TextEdit*)pDataEdit)->SaveAsUTF8( TRUE ); @@ -77,8 +77,8 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p ) pBreakpoints->SetModule( pMod ); // Define icon: -// pIcon = new Icon( ResId( RID_WORKICON ) ); -// if( pIcon ) SetIcon( *pIcon ); +// pIcon = new Icon( ResId( RID_WORKICON ) ); +// if( pIcon ) SetIcon( *pIcon ); SetText( pMod->GetName() ); pDataEdit->SetText( pMod->GetSource() ); @@ -122,7 +122,7 @@ FileType AppBasEd::GetFileType() IMPL_LINK_INLINE_START( AppBasEd, EditChange, void *, p ) { - (void) p; /* avoid warning about unused parameter */ + (void) p; /* avoid warning about unused parameter */ bCompiled = FALSE; return TRUE; } @@ -133,7 +133,7 @@ long AppBasEd::InitMenu( Menu* pMenu ) { AppEdit::InitMenu (pMenu ); BOOL bRunning = pFrame->Basic().IsRunning(); - pMenu->EnableItem( RID_RUNCOMPILE, !bCompiled && !bRunning ); + pMenu->EnableItem( RID_RUNCOMPILE, !bCompiled && !bRunning ); return TRUE; } @@ -158,7 +158,7 @@ void AppBasEd::Command( const CommandEvent& rCEvt ) void AppBasEd::Resize() { - if( pDataEdit ) + if( pDataEdit ) { AppEdit::Resize(); @@ -207,7 +207,7 @@ void AppBasEd::LoadSource() { BOOL bErr; -// if( pDataEdit->GetText().Len() != 0 ) return; +// if( pDataEdit->GetText().Len() != 0 ) return; String aName = pMod->GetName(); bErr = !pDataEdit->Load( aName ); pBreakpoints->LoadBreakpoints( GetText() ); @@ -285,7 +285,7 @@ void AppBasEd::Run() if (aBasicApp.pFrame) { BasicError* pErr = aBasicApp.pFrame->Basic().aErrors.First(); - if( pErr ) + if( pErr ) pErr->Show(); aBasicApp.pFrame->SetAppMode( String() ); } diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx index a7796fb3854b..2baf8326c97f 100644 --- a/basic/source/app/appbased.hxx +++ b/basic/source/app/appbased.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,27 +36,27 @@ class BasicFrame; class BreakpointWindow; -class AppBasEd : public AppEdit { // Editor-Window: +class AppBasEd : public AppEdit { // Editor-Window: using DockingWindow::Notify; - SbModuleRef pMod; // compile module - BOOL bCompiled; // TRUE if compiled + SbModuleRef pMod; // compile module + BOOL bCompiled; // TRUE if compiled protected: DECL_LINK( EditChange, void * ); #define BREAKPOINTSWIDTH 15 BreakpointWindow *pBreakpoints; - virtual USHORT ImplSave(); // Save file + virtual USHORT ImplSave(); // Save file public: TYPEINFO(); AppBasEd( BasicFrame*, SbModule* ); ~AppBasEd(); - FileType GetFileType(); // Returns Filetype - SbModule* GetModule() { return pMod; } - long InitMenu( Menu* ); // Initialision of the menus - virtual long DeInitMenu( Menu* ); // Reset to enable all shortcuts - virtual void Command( const CommandEvent& rCEvt ); // Command handler - virtual void Resize(); // Includes the breakpoint bar + FileType GetFileType(); // Returns Filetype + SbModule* GetModule() { return pMod; } + long InitMenu( Menu* ); // Initialision of the menus + virtual long DeInitMenu( Menu* ); // Reset to enable all shortcuts + virtual void Command( const CommandEvent& rCEvt ); // Command handler + virtual void Resize(); // Includes the breakpoint bar virtual void PostLoad(); // Set source of module virtual void PostSaveAs(); // Postprocess of module... void Reload(); diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx index e7181ab00286..f6f888b92548 100644 --- a/basic/source/app/appedit.cxx +++ b/basic/source/app/appedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ AppEdit::AppEdit( BasicFrame* pParent ) pDataEdit = new TextEdit( this, WB_LEFT ); LoadIniFile(); // define Icon: -// pIcon = new Icon( ResId( RID_WORKICON ) ); -// if( pIcon ) SetIcon( *pIcon ); +// pIcon = new Icon( ResId( RID_WORKICON ) ); +// if( pIcon ) SetIcon( *pIcon ); pDataEdit->SetText( aEmpty ); @@ -113,7 +113,7 @@ void AppEdit::LoadIniFile() ((TextEdit*)pDataEdit)->GetBreakpointWindow()->Invalidate(); } - pTextView->GetTextEngine()->SetModified( bWasModified ); // Perhaps reset the flag + pTextView->GetTextEngine()->SetModified( bWasModified ); // Perhaps reset the flag } void AppEdit::Command( const CommandEvent& rCEvt ) @@ -132,7 +132,7 @@ void AppEdit::Command( const CommandEvent& rCEvt ) IMPL_LINK( AppEdit, Scroll, ScrollBar*, pScroll ) { - (void) pScroll; /* avoid warning about unused parameter */ + (void) pScroll; /* avoid warning about unused parameter */ if ( !pHScroll || !pVScroll ) return 0; @@ -159,7 +159,7 @@ void AppEdit::InitScrollBars() Size aOutSz( pTextView->GetWindow()->GetOutputSizePixel() ); pVScroll->SetVisibleSize( aOutSz.Height() ); pVScroll->SetPageSize( aOutSz.Height() * 8 / 10 ); - pVScroll->SetLineSize( GetTextHeight() +2 ); // +2 is empirical. don't know why + pVScroll->SetLineSize( GetTextHeight() +2 ); // +2 is empirical. don't know why pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() ); pVScroll->Show(); @@ -184,8 +184,8 @@ void AppEdit::SetScrollBarRanges() USHORT AppEdit::GetLineNr() -{ - return pDataEdit->GetLineNr(); +{ + return pDataEdit->GetLineNr(); } FileType AppEdit::GetFileType() @@ -197,14 +197,14 @@ FileType AppEdit::GetFileType() long AppEdit::InitMenu( Menu* pMenu ) { AppWin::InitMenu (pMenu ); - + if( pDataEdit ) { USHORT UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount(); USHORT RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount(); - - pMenu->EnableItem( RID_EDITUNDO, UndoCount > 0 ); - pMenu->EnableItem( RID_EDITREDO, RedoCount > 0 ); + + pMenu->EnableItem( RID_EDITUNDO, UndoCount > 0 ); + pMenu->EnableItem( RID_EDITREDO, RedoCount > 0 ); } return TRUE; diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx index 2399d42a54ed..5b1a548b40a0 100644 --- a/basic/source/app/appedit.hxx +++ b/basic/source/app/appedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class BasicFrame; -class AppEdit : public AppWin { // Editor window +class AppEdit : public AppWin { // Editor window using Window::Scroll; public: @@ -63,7 +63,7 @@ public: void Mark( short, short, short ); // Select text void Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 ); virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); } - virtual void LoadIniFile(); // (re)load ini file after change + virtual void LoadIniFile(); // (re)load ini file after change }; #endif diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx index cd5bc34b39a8..512a5ac40683 100644 --- a/basic/source/app/apperror.cxx +++ b/basic/source/app/apperror.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,15 +38,15 @@ TYPEINIT1(AppError,AppWin); AppError::AppError( BasicFrame* pParent, String aFileName ) : AppWin( pParent ) { - SetText( aFileName ); // Call before MsgEdit!! + SetText( aFileName ); // Call before MsgEdit!! pDataEdit = new MsgEdit( this, pParent, WB_HSCROLL | WB_VSCROLL | WB_LEFT ); LoadIniFile(); bHasFile = pDataEdit->Load( aFileName ); DirEntry aEntry( aFileName ); UpdateFileInfo( HAS_BEEN_LOADED ); // Define icon -// pIcon = new Icon( ResId( RID_WORKICON ) ); -// if( pIcon ) SetIcon( *pIcon ); +// pIcon = new Icon( ResId( RID_WORKICON ) ); +// if( pIcon ) SetIcon( *pIcon ); pDataEdit->Show(); GrabFocus(); @@ -63,20 +63,20 @@ AppError::~AppError() long AppError::InitMenu( Menu* pMenu ) { AppWin::InitMenu (pMenu ); - - pMenu->EnableItem( RID_EDITUNDO, FALSE ); - pMenu->EnableItem( RID_EDITREDO, FALSE ); - + + pMenu->EnableItem( RID_EDITUNDO, FALSE ); + pMenu->EnableItem( RID_EDITREDO, FALSE ); + return TRUE; } long AppError::DeInitMenu( Menu* pMenu ) { AppWin::DeInitMenu (pMenu ); - + pMenu->EnableItem( RID_EDITUNDO ); pMenu->EnableItem( RID_EDITREDO ); - + return TRUE; } diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx index 9dedf5c428aa..6e0bdbc7fdf8 100644 --- a/basic/source/app/apperror.hxx +++ b/basic/source/app/apperror.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ public: TYPEINFO(); AppError( BasicFrame*, String ); ~AppError(); -// long Command( short nID ); +// long Command( short nID ); virtual long InitMenu( Menu* ); virtual long DeInitMenu( Menu* ); USHORT GetLineNr(); FileType GetFileType(); - MsgEdit* GetMsgTree() { return ((MsgEdit*)pDataEdit); } + MsgEdit* GetMsgTree() { return ((MsgEdit*)pDataEdit); } virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); } - virtual void LoadIniFile(); // (re)load ini file after change + virtual void LoadIniFile(); // (re)load ini file after change DirEntry aBaseDir; }; diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx index 7800b25d1af1..0d393afa88e0 100644 --- a/basic/source/app/appwin.cxx +++ b/basic/source/app/appwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include "dialogs.hxx" #include "basrid.hxx" -String *AppWin::pNoName = NULL; // contains the "Untitled"-String +String *AppWin::pNoName = NULL; // contains the "Untitled"-String short AppWin::nNumber = 0; // consecutive number short AppWin::nCount = 0; // number of edit windows @@ -188,16 +188,16 @@ void AppWin::RequestHelp( const HelpEvent& ) void AppWin::Help() { String s = pDataEdit->GetSelected(); - if( s.Len() > 0 ) + if( s.Len() > 0 ) { // Trim leading whitespaces - while( s.GetChar(0) == ' ' ) + while( s.GetChar(0) == ' ' ) s.Erase( 0, 1 ); -// aBasicApp.pHelp->Start( s ); - } - else +// aBasicApp.pHelp->Start( s ); + } + else { -// aBasicApp.pHelp->Start( OOO_HELP_INDEX ); +// aBasicApp.pHelp->Start( OOO_HELP_INDEX ); } } @@ -216,7 +216,7 @@ void AppWin::GetFocus() if( pDataEdit ) // GetFocus is called by the destructor, so this check { pDataEdit->GrabFocus(); -// InitMenu(GetpApp()->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); +// InitMenu(GetpApp()->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); } } @@ -228,7 +228,7 @@ long AppWin::PreNotify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_GETFOCUS ) if ( pFrame->pList->Last() != this ) Activate(); - return FALSE; // Der event soll weiter verarbeitet werden + return FALSE; // Der event soll weiter verarbeitet werden } void AppWin::Activate() @@ -249,12 +249,12 @@ long AppWin::InitMenu( Menu* pMenu ) } else bMarked = FALSE; - pMenu->EnableItem( RID_EDITREPEAT, (aFind.Len() != 0 ) ); - pMenu->EnableItem( RID_EDITCUT, bMarked ); - pMenu->EnableItem( RID_EDITCOPY, bMarked ); - pMenu->EnableItem( RID_EDITPASTE, ( ::svt::OStringTransfer::PasteString( aTemp, this ) ) ); - pMenu->EnableItem( RID_EDITDEL, bMarked ); -// pMenu->EnableItem( RID_HELPTOPIC, bMarked ); + pMenu->EnableItem( RID_EDITREPEAT, (aFind.Len() != 0 ) ); + pMenu->EnableItem( RID_EDITCUT, bMarked ); + pMenu->EnableItem( RID_EDITCOPY, bMarked ); + pMenu->EnableItem( RID_EDITPASTE, ( ::svt::OStringTransfer::PasteString( aTemp, this ) ) ); + pMenu->EnableItem( RID_EDITDEL, bMarked ); +// pMenu->EnableItem( RID_HELPTOPIC, bMarked ); BOOL bHasText; if( pDataEdit ) @@ -263,9 +263,9 @@ long AppWin::InitMenu( Menu* pMenu ) bHasText = FALSE; BOOL bRunning = pFrame->Basic().IsRunning(); BOOL bCanExecute = BOOL( (!bRunning && bHasText) || pFrame->bInBreak ); - pMenu->EnableItem( RID_RUNSTART, bCanExecute ); - pMenu->EnableItem( RID_RUNBREAK, bRunning && !pFrame->bInBreak); - pMenu->EnableItem( RID_RUNSTOP, bRunning ); + pMenu->EnableItem( RID_RUNSTART, bCanExecute ); + pMenu->EnableItem( RID_RUNBREAK, bRunning && !pFrame->bInBreak); + pMenu->EnableItem( RID_RUNSTOP, bRunning ); pMenu->EnableItem( RID_RUNTOCURSOR, bCanExecute ); pMenu->EnableItem( RID_RUNSTEPINTO, bCanExecute ); pMenu->EnableItem( RID_RUNSTEPOVER, bCanExecute ); @@ -317,7 +317,7 @@ void AppWin::Command( const CommandEvent& rCEvt ) case RID_EDITPASTE: { ::rtl::OUString aTemp; - if( ::svt::OStringTransfer::PasteString( aTemp, this ) ) + if( ::svt::OStringTransfer::PasteString( aTemp, this ) ) pDataEdit->Paste(); } break; @@ -376,7 +376,7 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat ) return DiskFileChanged( SINCE_LAST_ASK_RELOAD ); } // uncomment to avoid compiler warning -// break; +// break; case SINCE_LAST_ASK_RELOAD: { String aFilename( GetText() ); @@ -388,7 +388,7 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat ) || aLastAccess.IsYounger( aStat ) || aStat.IsYounger( aLastAccess ); } // uncomment to avoid compiler warning -// break; +// break; default: DBG_ERROR("Not Implemented in AppWin::DiskFileChanged"); } @@ -432,7 +432,7 @@ void AppWin::CheckReload() if ( !aFile.Exists() ) return; -// FileStat aStat( aFile ); +// FileStat aStat( aFile ); if ( DiskFileChanged( SINCE_LAST_ASK_RELOAD ) && ReloadAllowed() ) { @@ -466,8 +466,8 @@ BOOL AppWin::Load( const String& aName ) SkipReload(); BOOL bErr; -// if( !QuerySave() ) -// return; +// if( !QuerySave() ) +// return; bErr = !pDataEdit->Load( aName ); if( bErr ) { @@ -609,15 +609,15 @@ BOOL AppWin::Close() return TRUE; } // uncomment to avoid compiler warning -// break; +// break; case SAVE_RES_ERROR: return FALSE; // uncomment to avoid compiler warning -// break; +// break; case SAVE_RES_CANCEL: return FALSE; // uncomment to avoid compiler warning -// break; +// break; default: DBG_ERROR("Not Implemented in AppWin::Close"); return FALSE; diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx index 7867b6e051dd..ef3636045c95 100644 --- a/basic/source/app/appwin.hxx +++ b/basic/source/app/appwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,70 +36,70 @@ #include "dataedit.hxx" typedef USHORT QueryBits; -#define QUERY_NONE ( QueryBits ( 0x00 ) ) -#define QUERY_DIRTY ( QueryBits ( 0x01 ) ) -#define QUERY_DISK_CHANGED ( QueryBits ( 0x02 ) ) -#define QUERY_ALL ( QUERY_DIRTY | QUERY_DISK_CHANGED ) -#define SAVE_NOT_DIRTY ( QueryBits ( 0x04 ) ) +#define QUERY_NONE ( QueryBits ( 0x00 ) ) +#define QUERY_DIRTY ( QueryBits ( 0x01 ) ) +#define QUERY_DISK_CHANGED ( QueryBits ( 0x02 ) ) +#define QUERY_ALL ( QUERY_DIRTY | QUERY_DISK_CHANGED ) +#define SAVE_NOT_DIRTY ( QueryBits ( 0x04 ) ) -#define SAVE_RES_SAVED TRUE -#define SAVE_RES_NOT_SAVED FALSE -#define SAVE_RES_ERROR 3 -#define SAVE_RES_CANCEL 4 +#define SAVE_RES_SAVED TRUE +#define SAVE_RES_NOT_SAVED FALSE +#define SAVE_RES_ERROR 3 +#define SAVE_RES_CANCEL 4 -#define SINCE_LAST_LOAD 1 -#define SINCE_LAST_ASK_RELOAD 2 +#define SINCE_LAST_LOAD 1 +#define SINCE_LAST_ASK_RELOAD 2 -#define HAS_BEEN_LOADED 1 // includes ASKED_RELOAD -#define ASKED_RELOAD 2 +#define HAS_BEEN_LOADED 1 // includes ASKED_RELOAD +#define ASKED_RELOAD 2 -#define TT_WIN_STATE_MAX 0x01 -#define TT_WIN_STATE_FLOAT 0x02 -#define TT_WIN_STATE_HIDE 0x04 +#define TT_WIN_STATE_MAX 0x01 +#define TT_WIN_STATE_FLOAT 0x02 +#define TT_WIN_STATE_HIDE 0x04 class BasicFrame; -class AppWin : public DockingWindow, public SfxListener // Document window +class AppWin : public DockingWindow, public SfxListener // Document window { friend class MsgEdit; protected: - static short nNumber; // serial number - static short nCount; // number of edit windows - static String *pNoName; // "Untitled" - FileStat aLastAccess; // Last access time of loaded file - USHORT nSkipReload; // Sometimes there must not be a reload - BOOL bHasFile; // Otherwise reload does not make sense - BOOL bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing - - short nId; // ID-Nummer( "Unnamed n" ) - BasicFrame* pFrame; // Parent-Window -// Icon* pIcon; // Document icon - String aFind; // Search string - String aReplace; // Replace string - BOOL bFind; // TRUE if search not replace + static short nNumber; // serial number + static short nCount; // number of edit windows + static String *pNoName; // "Untitled" + FileStat aLastAccess; // Last access time of loaded file + USHORT nSkipReload; // Sometimes there must not be a reload + BOOL bHasFile; // Otherwise reload does not make sense + BOOL bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing + + short nId; // ID-Nummer( "Unnamed n" ) + BasicFrame* pFrame; // Parent-Window +// Icon* pIcon; // Document icon + String aFind; // Search string + String aReplace; // Replace string + BOOL bFind; // TRUE if search not replace void RequestHelp( const HelpEvent& ); // Help handler - void GetFocus(); // activate - virtual USHORT ImplSave(); // Save file - USHORT nWinState; // Maximized, Iconized or Normal - Point nNormalPos; // Position if normal - Size nNormalSize; // Size if Normal - virtual long PreNotify( NotifyEvent& rNEvt ); + void GetFocus(); // activate + virtual USHORT ImplSave(); // Save file + USHORT nWinState; // Maximized, Iconized or Normal + Point nNormalPos; // Position if normal + Size nNormalSize; // Size if Normal + virtual long PreNotify( NotifyEvent& rNEvt ); USHORT nWinId; public: TYPEINFO(); AppWin( BasicFrame* ); ~AppWin(); - DataEdit* pDataEdit; // Data area - virtual USHORT GetLineNr()=0; // Current line number - virtual long InitMenu( Menu* ); // Init of the menu - virtual long DeInitMenu( Menu* ); // reset to enable all shortcuts - virtual void Command( const CommandEvent& rCEvt ); // Command handler + DataEdit* pDataEdit; // Data area + virtual USHORT GetLineNr()=0; // Current line number + virtual long InitMenu( Menu* ); // Init of the menu + virtual long DeInitMenu( Menu* ); // reset to enable all shortcuts + virtual void Command( const CommandEvent& rCEvt ); // Command handler virtual void Resize(); virtual void Help(); - virtual BOOL Load( const String& ); // Load file + virtual BOOL Load( const String& ); // Load file virtual void PostLoad(){} // Set source at module virtual USHORT SaveAs(); // Save file as virtual void PostSaveAs(){} @@ -108,13 +108,13 @@ public: virtual void Repeat(); // repeat find/replace virtual BOOL Close(); // close window virtual void Activate(); // window was activated - virtual FileType GetFileType()=0; // returns the filetype + virtual FileType GetFileType()=0; // returns the filetype virtual BOOL ReloadAllowed(){ return TRUE; } virtual void Reload(); // Reload after change on disk - virtual void LoadIniFile(){;} // (re)load ini file after change + virtual void LoadIniFile(){;} // (re)load ini file after change void CheckReload(); // Checks and asks if reload should performed - BOOL DiskFileChanged( USHORT nWhat ); // Checks file for changes - void UpdateFileInfo( USHORT nWhat ); // Remembers last file state + BOOL DiskFileChanged( USHORT nWhat ); // Checks file for changes + void UpdateFileInfo( USHORT nWhat ); // Remembers last file state BOOL IsSkipReload(); // Should we test reload? void SkipReload( BOOL bSkip = TRUE ); USHORT GetWinState(){ return nWinState; } @@ -124,10 +124,10 @@ public: void Cascade( USHORT nNr ); USHORT QuerySave( QueryBits nBits = QUERY_ALL ); - BOOL IsModified() { return pDataEdit->IsModified(); } + BOOL IsModified() { return pDataEdit->IsModified(); } BasicFrame* GetBasicFrame() { return pFrame; } - virtual void TitleButtonClick( USHORT nButton ); - virtual void SetText( const XubString& rStr ); + virtual void TitleButtonClick( USHORT nButton ); + virtual void SetText( const XubString& rStr ); USHORT GetWinId() { return nWinId; } void SetWinId( USHORT nWId ) { nWinId = nWId; } diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc index e4a69d9d2942..634d86f30eef 100644 --- a/basic/source/app/basic.hrc +++ b/basic/source/app/basic.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ #define RID_TOGLEBRKPNT 1314 #define RID_TT_EXTRAS_NAME 1400 #define RID_TT_EXTRAS 1401 -#define RID_OPTIONS 1402 +#define RID_OPTIONS 1402 #define RID_DECLARE_HELPER 1403 #define RID_WINDOW 1501 #define RID_WINTILE 1502 @@ -121,12 +121,12 @@ #define IDS_NOPRINTERERROR 2108 #define IDS_PATTERNNOTFOUND 2109 #define IDS_INVALID_VALUE 2110 -#define IDS_ASK_DIRTY_SAVE 2200 -#define IDS_ASK_DISKCHANGE_SAVE 2201 -#define IDS_ASK_DIRTY_AND_DISKCHANGE_SAVE 2202 -#define IDS_ASKSAVEERROR 2203 -#define IDS_ASKRELOAD 2204 -#define IDS_ASKDIRTYRELOAD 2205 +#define IDS_ASK_DIRTY_SAVE 2200 +#define IDS_ASK_DISKCHANGE_SAVE 2201 +#define IDS_ASK_DIRTY_AND_DISKCHANGE_SAVE 2202 +#define IDS_ASKSAVEERROR 2203 +#define IDS_ASKRELOAD 2204 +#define IDS_ASKDIRTYRELOAD 2205 #define IDS_LOADDLG 2300 #define IDS_SAVEDLG 2301 #define IDS_BASFILTER 2304 @@ -172,8 +172,8 @@ //#define RID_APPFONT 5000 //#define RID_APPEDITFONT 5001 -//#define RID_DLGBRUSH 5002 -#define RID_CALLDLG 6001 +//#define RID_DLGBRUSH 5002 +#define RID_CALLDLG 6001 #define MBP_PLUS 8001 #define MBP_MINUS 8002 #define RID_IMGLST_LAYOUT 8005 diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src index a879780e90ff..4283e9981a36 100644 --- a/basic/source/app/basic.src +++ b/basic/source/app/basic.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ ModalDialog RID_CALLDLG { MOVEABLE = TRUE; CLOSEABLE = TRUE; // WinChilds = { -// FixedText { -// Text = "Aktuelle Parameter"; -// PosSize = MAP_SYSFONT (10,10,120,8); -// }; +// FixedText { +// Text = "Aktuelle Parameter"; +// PosSize = MAP_SYSFONT (10,10,120,8); +// }; // }; FixedText RID_RETTYPE { PosSize = MAP_SYSFONT (10,70,120,8); @@ -92,13 +92,13 @@ ModalDialog IDD_ABOUT_DIALOG { }; }; */ -// FixedIcon RID_ICON { -// Pos = MAP_APPFONT( 20, 26 ); -// Size = MAP_APPFONT( 20, 20 ); -// FIXED = Icon { -// FILE = "basic.ico"; -// }; -// }; +// FixedIcon RID_ICON { +// Pos = MAP_APPFONT( 20, 26 ); +// Size = MAP_APPFONT( 20, 20 ); +// FIXED = Icon { +// FILE = "basic.ico"; +// }; +// }; OKButton RID_OK { Pos = MAP_APPFONT( 55, 80 ); Size = MAP_APPFONT( 40, 14 ); @@ -142,7 +142,7 @@ ModalDialog IDD_FIND_DIALOG { Size = MAP_APPFONT( 185, 70 ); SVLook = TRUE; MOVEABLE = TRUE; - // CLOSEABLE = TRUE; // It has a cancelbutton + // CLOSEABLE = TRUE; // It has a cancelbutton FixedText RID_FIXEDTEXT1 { Pos = MAP_APPFONT( 5, 10 ); @@ -176,7 +176,7 @@ ModalDialog IDD_REPLACE_DIALOG { Size = MAP_APPFONT( 185, 88 ); SVLook = TRUE; MOVEABLE = TRUE; - // CLOSEABLE = TRUE; // It has a cancelbutton + // CLOSEABLE = TRUE; // It has a cancelbutton FixedText RID_FIXEDTEXT1 { Pos = MAP_APPFONT( 5, 10 ); Size = MAP_APPFONT( 55, 10 ); @@ -416,13 +416,13 @@ String IDS_DISASWIN { TEXT[ en-US ] = "Disassembly"; }; //Icon RID_APPICON { -// FILE = "basic.ico"; +// FILE = "basic.ico"; //}; //Icon RID_APPICON2 { -// FILE = "testtool.ico"; +// FILE = "testtool.ico"; //}; //Icon RID_WORKICON { -// FILE = "work.ico"; +// FILE = "work.ico"; //}; Bitmap MBP_PLUS { @@ -532,12 +532,12 @@ Menu RID_EDIT { MenuItem { Identifier = RID_EDITUNDO; TEXT[ en-US ] = "~Undo"; -// AccelKey = KeyCode { Function = KEYFUNC_CUT; }; +// AccelKey = KeyCode { Function = KEYFUNC_CUT; }; }; MenuItem { Identifier = RID_EDITREDO; TEXT[ en-US ] = "~Redo"; -// AccelKey = KeyCode { Function = KEYFUNC_CUT; }; +// AccelKey = KeyCode { Function = KEYFUNC_CUT; }; }; MenuItem { SEPARATOR = TRUE; @@ -578,7 +578,7 @@ Menu RID_EDIT { Identifier = RID_EDITREPEAT; TEXT[ en-US ] = "Repeat S~earch"; AccelKey = KeyCode { Code = KEY_F3; }; -// AccelKey = KeyCode { Function = KEYFUNC_REPEAT; }; +// AccelKey = KeyCode { Function = KEYFUNC_REPEAT; }; }; }; }; @@ -607,11 +607,11 @@ Menu RID_RUN { TEXT[ en-US ] = "Si~ngle Step over Procedure"; AccelKey = KeyCode { Code = KEY_F10; }; }; -// MenuItem { -// Identifier = RID_RUNTOCURSOR; -// TEXT = "Run to cursor"; -// AccelKey = KeyCode { Code = KEY_F7; }; -// }; +// MenuItem { +// Identifier = RID_RUNTOCURSOR; +// TEXT = "Run to cursor"; +// AccelKey = KeyCode { Code = KEY_F7; }; +// }; MenuItem { Identifier = RID_TOGLEBRKPNT; TEXT[ en-US ] = "Set / Delete Break Point"; @@ -656,7 +656,7 @@ Menu RID_TT_EXTRAS { Identifier = RID_OPTIONS; TEXT[ en-US ] = "~Settings"; }; -/* comment out till it gets functionality #i26908 +/* comment out till it gets functionality #i26908 MenuItem { Identifier = RID_DECLARE_HELPER; Text [ en-US ] = "~Record Dialogs"; @@ -665,7 +665,7 @@ Menu RID_TT_EXTRAS { }; Menu RID_WINDOW { ITEMLIST = { -/* MenuItem { +/* MenuItem { Identifier = RID_WINCASCADE; TEXT[ en-US ] = "~Cascade"; }; @@ -685,7 +685,7 @@ Menu RID_WINDOW { }; Menu RID_HELP { ITEMLIST = { -/* MenuItem { +/* MenuItem { Identifier = RID_HELPINDEX; TEXT = "~Index"; }; @@ -710,7 +710,7 @@ Menu RID_HELP { MenuItem { SEPARATOR = TRUE; }; -*/ MenuItem { +*/ MenuItem { ABOUT = TRUE; Identifier = RID_HELPABOUT; TEXT[ en-US ] = "~About..."; @@ -1191,12 +1191,12 @@ FloatingWindow IDD_DISPLAY_HID { Border = TRUE; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 260, 14 ); -/* ItemList = { +/* ItemList = { ToolBoxItem { Text = "erster der Toolbox"; }; };*/ -// Hide = TRUE; +// Hide = TRUE; }; FixedText RID_FT_CONTROLS { Pos = MAP_APPFONT( 4, 16 ); @@ -1278,22 +1278,22 @@ Accelerator MAIN_ACCEL { Identifier = RID_QUIT; Key = KeyCode { Function = KEYFUNC_QUIT; }; }; -// AcceleratorItem { -// Identifier = RID_EDITCUT; -// Key = KeyCode { Function = KEYFUNC_CUT; }; -// }; -// AcceleratorItem { -// Identifier = RID_EDITCOPY; -// Key = KeyCode { Function = KEYFUNC_COPY; }; -// }; -// AcceleratorItem { -// Identifier = RID_EDITPASTE; -// Key = KeyCode { Function = KEYFUNC_PASTE; }; -// }; -// AcceleratorItem { -// Identifier = RID_EDITDEL; -// Key = KeyCode { Function = KEYFUNC_DELETE; }; -// }; +// AcceleratorItem { +// Identifier = RID_EDITCUT; +// Key = KeyCode { Function = KEYFUNC_CUT; }; +// }; +// AcceleratorItem { +// Identifier = RID_EDITCOPY; +// Key = KeyCode { Function = KEYFUNC_COPY; }; +// }; +// AcceleratorItem { +// Identifier = RID_EDITPASTE; +// Key = KeyCode { Function = KEYFUNC_PASTE; }; +// }; +// AcceleratorItem { +// Identifier = RID_EDITDEL; +// Key = KeyCode { Function = KEYFUNC_DELETE; }; +// }; AcceleratorItem { Identifier = RID_EDITSEARCH; Key = KeyCode { Function = KEYFUNC_FIND; }; @@ -1301,7 +1301,7 @@ Accelerator MAIN_ACCEL { AcceleratorItem { Identifier = RID_EDITREPEAT; Key = KeyCode { Code = KEY_F3; }; -// Key = KeyCode { Function = KEYFUNC_REPEAT; }; +// Key = KeyCode { Function = KEYFUNC_REPEAT; }; }; AcceleratorItem { Identifier = RID_RUNSTART; diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx index 1c540e48f825..94c445dd446d 100644 --- a/basic/source/app/basicrt.cxx +++ b/basic/source/app/basicrt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc index bfabe2c9759e..feea22a61d06 100644 --- a/basic/source/app/basmsg.hrc +++ b/basic/source/app/basmsg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,13 @@ /////////////////////////////// // Error messages which go to the result file. // ********************* -// *** !!ATTENTION!! *** +// *** !!ATTENTION!! *** // ********************* // The numbers must NEVER(!) change, // because they are saved in the result files and a renewed display // would display new strings or no strings. /////////////////////////////// -#define S_PROG_START ( BAS_START + 0 ) -#define S_ERROR_OUTSIDE_TESTCASE ( BAS_START + 1 ) -#define S_WARNING_PREFIX ( BAS_START + 2 ) +#define S_PROG_START ( BAS_START + 0 ) +#define S_ERROR_OUTSIDE_TESTCASE ( BAS_START + 1 ) +#define S_WARNING_PREFIX ( BAS_START + 2 ) diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src index e2179afd4c34..ba96cf55f561 100644 --- a/basic/source/app/basmsg.src +++ b/basic/source/app/basmsg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ /////////////////////////////// // Error messages which go to the result file. // ********************* -// *** !!ATTENTION!! *** +// *** !!ATTENTION!! *** // ********************* // The numbers must NEVER(!) change, // because they are saved in the result files and a renewed display diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx index 6401b3829bd9..60195971b998 100644 --- a/basic/source/app/brkpnts.cxx +++ b/basic/source/app/brkpnts.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ struct Breakpoint { USHORT nLine; - Breakpoint( USHORT nL ) { nLine = nL; } + Breakpoint( USHORT nL ) { nLine = nL; } }; @@ -165,7 +165,7 @@ void BreakpointWindow::InsertBreakpoint( USHORT nLine ) } -Breakpoint* BreakpointWindow::FindBreakpoint( ULONG nLine ) +Breakpoint* BreakpointWindow::FindBreakpoint( ULONG nLine ) { Breakpoint* pBrk = First(); while ( pBrk ) @@ -288,7 +288,7 @@ void BreakpointWindow::Paint( const Rectangle& ) } -Breakpoint* BreakpointWindow::FindBreakpoint( const Point& rMousePos ) +Breakpoint* BreakpointWindow::FindBreakpoint( const Point& rMousePos ) { long nLineHeight = GetTextHeight(); long nYPos = rMousePos.Y() + nCurYOffset; diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx index 1d44ef2c2d1a..a9c08105e179 100644 --- a/basic/source/app/brkpnts.hxx +++ b/basic/source/app/brkpnts.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #include <vcl/window.hxx> -#define MARKER_NOMARKER 0xFFFF +#define MARKER_NOMARKER 0xFFFF class SbModule; @@ -44,46 +44,46 @@ using Window::Scroll; public: BreakpointWindow( Window *pParent ); -// ~BreakpointWindow(); +// ~BreakpointWindow(); - void Reset(); + void Reset(); - void SetModule( SbModule *pMod ); - void SetBPsInModule(); + void SetModule( SbModule *pMod ); + void SetBPsInModule(); - void InsertBreakpoint( USHORT nLine ); - void ToggleBreakpoint( USHORT nLine ); - void AdjustBreakpoints( ULONG nLine, BOOL bInserted ); + void InsertBreakpoint( USHORT nLine ); + void ToggleBreakpoint( USHORT nLine ); + void AdjustBreakpoints( ULONG nLine, BOOL bInserted ); - void LoadBreakpoints( String aFilename ); - void SaveBreakpoints( String aFilename ); + void LoadBreakpoints( String aFilename ); + void SaveBreakpoints( String aFilename ); protected: - Breakpoint* FindBreakpoint( ULONG nLine ); + Breakpoint* FindBreakpoint( ULONG nLine ); private: - long nCurYOffset; - USHORT nMarkerPos; - SbModule* pModule; - BOOL bErrorMarker; + long nCurYOffset; + USHORT nMarkerPos; + SbModule* pModule; + BOOL bErrorMarker; static ImageList *pImages; protected: - virtual void Paint( const Rectangle& ); - Breakpoint* FindBreakpoint( const Point& rMousePos ); - void ShowMarker( BOOL bShow ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& ); + Breakpoint* FindBreakpoint( const Point& rMousePos ); + void ShowMarker( BOOL bShow ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); public: -// void SetModulWindow( ModulWindow* pWin ) -// { pModulWindow = pWin; } +// void SetModulWindow( ModulWindow* pWin ) +// { pModulWindow = pWin; } - void SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE ); + void SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE ); virtual void Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags = 0 ); - long& GetCurYOffset() { return nCurYOffset; } + long& GetCurYOffset() { return nCurYOffset; } }; diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx index 7f588b8a2619..bf0761665ff8 100644 --- a/basic/source/app/dataedit.hxx +++ b/basic/source/app/dataedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,37 +39,37 @@ class Font; // Find, Load and Save must be implemented, // the others must exist in MemberType -#define DATA_FUNC_DEF( MemberName, MemberType ) \ -public: \ - MemberType MemberName; \ - BOOL Find( const String& rStr ); \ - BOOL Load( const String& rStr ); \ - BOOL Save( const String& rStr ); \ +#define DATA_FUNC_DEF( MemberName, MemberType ) \ +public: \ + MemberType MemberName; \ + BOOL Find( const String& rStr ); \ + BOOL Load( const String& rStr ); \ + BOOL Save( const String& rStr ); \ \ - void GrabFocus(){ MemberName.GrabFocus(); } \ - void Show(){ MemberName.Show(); } \ + void GrabFocus(){ MemberName.GrabFocus(); } \ + void Show(){ MemberName.Show(); } \ void SetPosPixel( const Point& rNewPos ){ MemberName.SetPosPixel(rNewPos); }\ - void SetSizePixel( const Size& rNewSize ){ MemberName.SetSizePixel(rNewSize); } \ - Size GetSizePixel(){ return MemberName.GetSizePixel(); } \ - Point GetPosPixel(){ return MemberName.GetPosPixel(); } \ - void Update(){ MemberName.Update(); } \ - void SetFont( const Font& rNewFont ){ MemberName.SetFont(rNewFont); } \ + void SetSizePixel( const Size& rNewSize ){ MemberName.SetSizePixel(rNewSize); } \ + Size GetSizePixel(){ return MemberName.GetSizePixel(); } \ + Point GetPosPixel(){ return MemberName.GetPosPixel(); } \ + void Update(){ MemberName.Update(); } \ + void SetFont( const Font& rNewFont ){ MemberName.SetFont(rNewFont); } \ \ - void Delete(); \ - void Cut(); \ - void Copy(); \ - void Paste(); \ - void Undo(); \ - void Redo(); \ - String GetText() const; \ - void SetText( const String& rStr ); \ - BOOL HasText() const; \ - String GetSelected(); \ - TextSelection GetSelection() const; \ - void SetSelection( const TextSelection& rSelection ); \ - USHORT GetLineNr() const; \ - void ReplaceSelected( const String& rStr ); \ - BOOL IsModified(); \ + void Delete(); \ + void Cut(); \ + void Copy(); \ + void Paste(); \ + void Undo(); \ + void Redo(); \ + String GetText() const; \ + void SetText( const String& rStr ); \ + BOOL HasText() const; \ + String GetSelected(); \ + TextSelection GetSelection() const; \ + void SetSelection( const TextSelection& rSelection ); \ + USHORT GetLineNr() const; \ + void ReplaceSelected( const String& rStr ); \ + BOOL IsModified(); \ void SetModifyHdl( Link l ); @@ -109,8 +109,8 @@ public: virtual void SetFont( const Font& rNewFont )=0; virtual void BuildKontextMenu( PopupMenu *&pMenu ) - { - (void) pMenu; /* avoid warning about unused parameter */ + { + (void) pMenu; /* avoid warning about unused parameter */ } }; diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 6bc0513ccafa..c55b4dd922b5 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -301,7 +301,7 @@ IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl ) case RID_TP_FON: pNewTabPage = new FontOptions( pTabCtrl, aConfig ); break; - default: DBG_ERROR( "PageHdl: Unbekannte ID!" ); + default: DBG_ERROR( "PageHdl: Unbekannte ID!" ); } DBG_ASSERT( pNewTabPage, "Keine Page!" ); pTabCtrl->SetTabPage( nId, pNewTabPage ); @@ -314,7 +314,7 @@ IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl ) IMPL_LINK( OptionsDialog, OKClick, Button *, pButton ) { - (void) pButton; /* avoid warning about unused parameter */ + (void) pButton; /* avoid warning about unused parameter */ aConfig.EnablePersistence(); GenericOptions *pGeneric; pGeneric = (GenericOptions*)aTabCtrl.GetTabPage( RID_TP_GEN ); @@ -468,7 +468,7 @@ IMPL_LINK( ProfileOptions, NewProfile, Button*, EMPTYARG ) IMPL_LINK( ProfileOptions, CheckButtonsHdl, ComboBox*, pCB ) { - (void) pCB; /* avoid warning about unused parameter */ + (void) pCB; /* avoid warning about unused parameter */ CheckButtons( aCbProfile, aPbNewProfile, aPbDelProfile ); return 0; } @@ -613,7 +613,7 @@ MiscOptions::MiscOptions( Window* pParent, Config &aConfig ) aNFUNOPort.SetValue( aTemp.ToInt32() ); aConfig.SetGroup("Misc"); - aTemp = aConfig.ReadKey( "ServerTimeout", "10000" ); // Default 1 Minute + aTemp = aConfig.ReadKey( "ServerTimeout", "10000" ); // Default 1 Minute aServerTimeout.SetTime( Time(aTemp.ToInt32()) ); aConfig.SetGroup("LRU"); @@ -881,10 +881,10 @@ IMPL_LINK( GenericOptions, LoadGroup, ComboBox*, EMPTYARG ) String aType; if ( aLastGroupName.Len() ) - { // Cache values? + { // Cache values? aCurrentValue = aCbValue.GetText(); if ( aCbValue.GetEntryPos( aCurrentValue ) == COMBOBOX_ENTRY_NOTFOUND ) - { // Create a new value + { // Create a new value LINK( this, GenericOptions, NewValue ).Call( NULL ); } @@ -993,7 +993,7 @@ IMPL_LINK( GenericOptions, CheckButtonsHdl, ComboBox*, pCB ) void GenericOptions::Save( Config &aConfig ) { - (void) aConfig; /* avoid warning about unused parameter */ + (void) aConfig; /* avoid warning about unused parameter */ DBG_ASSERT( &aConfig == &aConf, "Saving to different Configuration" ); // Save changes @@ -1007,7 +1007,7 @@ class TextAndWin : public DockingWindow Window *pWin; Window* pFtOriginalParent; Window* pWinOriginalParent; - long nSpace; // default space + long nSpace; // default space BOOL bAlignTop; public: @@ -1083,7 +1083,7 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent ) { FreeResource(); -/* ResMgr* pRM = CREATERESMGR( svt ); +/* ResMgr* pRM = CREATERESMGR( svt ); ToolBox aOrig( this, ResId( 12345, pRM ) ); delete pRM; @@ -1184,7 +1184,7 @@ void DisplayHidDlg::AddData( WinInfoRec* pWinInfo ) aMlbControls.Clear(); aMlbSlots.Clear(); - if ( pWinInfo->nRType & DH_MODE_DATA_VALID ) // no old office + if ( pWinInfo->nRType & DH_MODE_DATA_VALID ) // no old office nDisplayMode = pWinInfo->nRType; // Is used for mode transmission while reset return; @@ -1251,7 +1251,7 @@ void DisplayHidDlg::Resize() } else { -// SetUpdateMode( FALSE ); +// SetUpdateMode( FALSE ); // Minimum size Size aSize( GetOutputSizePixel() ); @@ -1278,7 +1278,7 @@ void DisplayHidDlg::Resize() // Calculate hight of SplitWindows long nSplitHeight = GetOutputSizePixel().Height(); nSplitHeight -= pSplit->GetPosPixel().Y(); - nSplitHeight -= nSpace; // bottom margin + nSplitHeight -= nSpace; // bottom margin // Set size of SplitWindows pSplit->SetSizePixel( Size( nSplitWidth, nSplitHeight ) ); @@ -1307,8 +1307,8 @@ void DisplayHidDlg::Resize() aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() ); aOKClose.SetPosPixel( aPos ); -// SetUpdateMode( TRUE ); -// Invalidate(); +// SetUpdateMode( TRUE ); +// Invalidate(); } FloatingWindow::Resize(); } @@ -1348,9 +1348,9 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar ) else aRadioButtonRID_RB_NEW_BOOL_F.Check(); break; -// case SbxCURRENCY: -// case SbxDATE: -// break; +// case SbxCURRENCY: +// case SbxDATE: +// break; case SbxINTEGER: aNumericFieldRID_NF_NEW_INTEGER.Show(); aNumericFieldRID_NF_NEW_INTEGER.SetText( pVar->GetString() ); @@ -1364,8 +1364,8 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar ) aNumericFieldRID_NF_NEW_LONG.SetMin( -aNumericFieldRID_NF_NEW_LONG.GetMax()-1 ); aNumericFieldRID_NF_NEW_LONG.SetFirst( -aNumericFieldRID_NF_NEW_LONG.GetLast()-1 ); break; -// case SbxOBJECT: // cannot be edited -// break; +// case SbxOBJECT: // cannot be edited +// break; case SbxSINGLE: case SbxDOUBLE: case SbxSTRING: @@ -1386,8 +1386,8 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar ) IMPL_LINK( VarEditDialog, OKClick, Button *, pButton ) { - (void) pButton; /* avoid warning about unused parameter */ - BOOL bWasError = SbxBase::IsError(); // Probably an error is thrown + (void) pButton; /* avoid warning about unused parameter */ + BOOL bWasError = SbxBase::IsError(); // Probably an error is thrown SbxDataType eType = pVar->GetType(); @@ -1416,7 +1416,7 @@ SvNumberformat:: int& nErrno, const xub_Unicode** ppEnd = NULL ); // Converts just as strtod a decimal string to a double. - // Decimal and thousand separators come from International, + // Decimal and thousand separators come from International, // leading spaces are omitted. // If ppEnd!=NULL then *ppEnd is set after the parsed data. // If pStr contains only the String to be parsed, then if success: @@ -1436,12 +1436,12 @@ SvNumberformat:: case SbxBOOL: pVar->PutBool( aRadioButtonRID_RB_NEW_BOOL_T.IsChecked() ); break; -// case SbxCURRENCY: -// pVar->PutCurrency( aContent ); -// break; -// case SbxDATE: -// pVar->PutDate( aContent ); -// break; +// case SbxCURRENCY: +// pVar->PutCurrency( aContent ); +// break; +// case SbxDATE: +// pVar->PutDate( aContent ); +// break; case SbxINTEGER: pVar->PutInteger( (INT16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() ); break; @@ -1464,7 +1464,7 @@ SvNumberformat:: } -// pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() ); +// pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() ); if ( !bWasError && SbxBase::IsError() ) { bError = TRUE; @@ -1477,12 +1477,12 @@ SvNumberformat:: return 1; } -// if ( aEditRID_ED_NEW_STRING.GetText().Compare( pVar->GetString() ) != COMPARE_EQUAL ) -// { -// aFixedTextRID_FT_CONTENT_VALUE.SetText( pVar->GetString() ); -// aEditRID_ED_NEW_STRING.SetText( pVar->GetString() ); -// return 1; -// } +// if ( aEditRID_ED_NEW_STRING.GetText().Compare( pVar->GetString() ) != COMPARE_EQUAL ) +// { +// aFixedTextRID_FT_CONTENT_VALUE.SetText( pVar->GetString() ); +// aEditRID_ED_NEW_STRING.SetText( pVar->GetString() ); +// return 1; +// } Close(); return 0; diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx index 278635e2825f..7e9c78bae368 100644 --- a/basic/source/app/dialogs.hxx +++ b/basic/source/app/dialogs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,25 +57,25 @@ public: }; class FindDialog : public ModalDialog { - FixedText aFT1; + FixedText aFT1; Edit aFind; - OKButton aOk; + OKButton aOk; CancelButton aCancel; - String* pFind; + String* pFind; DECL_LINK( ButtonClick, Button * ); public: FindDialog (Window*, const ResId&, String&); }; class ReplaceDialog : public ModalDialog { - FixedText aFT1; - FixedText aFT2; + FixedText aFT1; + FixedText aFT2; Edit aFind; Edit aReplace; - OKButton aOk; + OKButton aOk; CancelButton aCancel; - String* pFind; - String* pReplace; + String* pFind; + String* pReplace; DECL_LINK( ButtonClick, Button * ); public: ReplaceDialog (Window*, const ResId&, String&, String&); @@ -119,7 +119,7 @@ public: class OptionsDialog : public TabDialog { private: - TabControl aTabCtrl; + TabControl aTabCtrl; OKButton aOK; CancelButton aCancel; @@ -130,7 +130,7 @@ private: public: OptionsDialog( Window* pParent, const ResId& ); ~OptionsDialog(); - virtual BOOL Close(); + virtual BOOL Close(); DECL_LINK( ActivatePageHdl, TabControl * ); @@ -241,10 +241,10 @@ public: DECLARE_LIST( StringList, String * ) -#define C_KEY_ALLE CByteString("All") -#define C_KEY_AKTUELL CByteString("Current") -#define C_KEY_TYPE CByteString("Type") -#define C_KEY_DELETE CByteString("Deleted Groups") +#define C_KEY_ALLE CByteString("All") +#define C_KEY_AKTUELL CByteString("Current") +#define C_KEY_TYPE CByteString("Type") +#define C_KEY_DELETE CByteString("Deleted Groups") class GenericOptions : public TabPage { @@ -349,8 +349,8 @@ protected: DECL_LINK( OKClick, Button * ); -// BOOL bCompare = FALSE; -// String aCompareString; +// BOOL bCompare = FALSE; +// String aCompareString; public: VarEditDialog( Window * pParent, SbxVariable *pPVar ); diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 16e8639c7430..2832e45a887a 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,9 @@ #include "precompiled_basic.hxx" /************************************************************************* File Versions so far: -No Version Initial Implementation without Version Information -Version 2 changed order of entries(New Entries at the end) -Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 +No Version Initial Implementation without Version Information +Version 2 changed order of entries(New Entries at the end) +Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 *************************************************************************/ #include <cstdio> @@ -75,7 +75,7 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits ) , pAppError( pParent ) , aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT ) { -// SetFont( aEditTree.GetDefaultFont( DEFAULTFONT_FIXED, aEditTree.GetSettings().GetLanguage(), 0, &aEditTree ) ); +// SetFont( aEditTree.GetDefaultFont( DEFAULTFONT_FIXED, aEditTree.GetSettings().GetLanguage(), 0, &aEditTree ) ); aEditTree.SetNodeBitmaps( Bitmap( SttResId (MBP_PLUS) ), Bitmap( SttResId (MBP_MINUS) ) ); aEditTree.SetSelectionMode( MULTIPLE_SELECTION ); if ( aEditTree.GetModel()->GetSortMode() != SortNone ) @@ -100,10 +100,10 @@ MsgEdit::~MsgEdit() {} // set the LogType since calling the add method can be from other add methods -#define COPY_TTDEBUGDATA( LOGTYPE ) \ - TTDebugData *pTTDebugData = new TTDebugData; \ - *pTTDebugData = aDebugData; \ - pTTDebugData->aLogType = LOGTYPE; \ +#define COPY_TTDEBUGDATA( LOGTYPE ) \ + TTDebugData *pTTDebugData = new TTDebugData; \ + *pTTDebugData = aDebugData; \ + pTTDebugData->aLogType = LOGTYPE; \ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg ) @@ -159,19 +159,19 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg ) } AddRun( aUILogMsg, LogMsg->aDebugData ); break; } - case LOG_TEST_CASE: AddTestCase( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_ERROR: AddError( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_TEST_CASE: AddTestCase( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_ERROR: AddError( aUILogMsg, LogMsg->aDebugData ); break; case LOG_CALL_STACK:AddCallStack( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_MESSAGE: AddMessage( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_WARNING: AddWarning( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_ASSERTION: AddAssertion( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_ASSERTION_STACK: AddAssertionStack( aUILogMsg, LogMsg->aDebugData ); break; - case LOG_QA_ERROR: AddQAError( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_MESSAGE: AddMessage( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_WARNING: AddWarning( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_ASSERTION: AddAssertion( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_ASSERTION_STACK: AddAssertionStack( aUILogMsg, LogMsg->aDebugData ); break; + case LOG_QA_ERROR: AddQAError( aUILogMsg, LogMsg->aDebugData ); break; default:DBG_ERROR("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust"); } if ( !bFileLoading ) - { // Comes from Testtool and must be written immediately + { // Comes from Testtool and must be written immediately BOOL bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD ); DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" ); @@ -180,7 +180,7 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg ) SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE ); if ( bNewFile ) { - String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3 + String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3 aSave.ConvertLineEnd(LINEEND_CRLF); aStrm << ByteString( aSave, RTL_TEXTENCODING_IBM_850 ).GetBuffer(); } @@ -233,7 +233,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData ) { while ( pRun && aEditTree.NextSibling( pRun ) ) aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) ); - + aEditTree.GetModel()->Remove( pRun ); bModified = TRUE; lModify.Call( NULL ); @@ -245,8 +245,8 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData ) COPY_TTDEBUGDATA( LOG_RUN ); if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) ) pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, 0, pTTDebugData ); - else // First file format - pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData ); // and therefor at the end + else // First file format + pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData ); // and therefor at the end aEditTree.ShowEntry( pCurrentRun ); pCurrentTestCase = NULL; @@ -258,7 +258,7 @@ void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData ) { if ( pCurrentRun ) { - if ( aMsg.Len() == 0 ) // End of Testcase + if ( aMsg.Len() == 0 ) // End of Testcase { pCurrentTestCase = NULL; } @@ -423,32 +423,32 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData ) } /* - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); } - SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);} + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); } + SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);} - SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); } - SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); } - SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); } + SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); } + SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); } + SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); } - SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); } - SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); } - SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); } - SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); } + SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); } + SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); } + SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); } + SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); } - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } - SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } + SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } - SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); } - SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));} + SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); } + SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));} - BOOL IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; - SvListEntry* GetEntry( SvListEntry* pParent, ULONG nPos ) const; - SvListEntry* GetEntry( ULONG nRootPos ) const; - SvListEntry* GetEntryAtAbsPos( ULONG nAbsPos ) const; - SvListEntry* GetParent( SvListEntry* pEntry ) const; - SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const; + BOOL IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; + SvListEntry* GetEntry( SvListEntry* pParent, ULONG nPos ) const; + SvListEntry* GetEntry( ULONG nRootPos ) const; + SvListEntry* GetEntryAtAbsPos( ULONG nAbsPos ) const; + SvListEntry* GetParent( SvListEntry* pEntry ) const; + SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const; */ //#define CHECK( pMemo ) if ( pMemo && !aEditTree.GetViewData( pMemo ) ) pMemo = NULL @@ -477,15 +477,15 @@ String MsgEdit::Impl_MakeText( SvLBoxEntry *pEntry ) const TTDebugData *aData = (TTDebugData*)pEntry->GetUserData(); switch ( aData->aLogType ) { - case LOG_RUN: aRet.AppendAscii("\n"); break; - case LOG_TEST_CASE: break; - case LOG_ERROR: break; + case LOG_RUN: aRet.AppendAscii("\n"); break; + case LOG_TEST_CASE: break; + case LOG_ERROR: break; case LOG_CALL_STACK:aRet.AppendAscii("--> "); break; - case LOG_MESSAGE: break; - case LOG_WARNING: break; - case LOG_ASSERTION: break; - case LOG_ASSERTION_STACK:aRet.AppendAscii("--> "); break; - case LOG_QA_ERROR: break; + case LOG_MESSAGE: break; + case LOG_WARNING: break; + case LOG_ASSERTION: break; + case LOG_ASSERTION_STACK:aRet.AppendAscii("--> "); break; + case LOG_QA_ERROR: break; default:DBG_ERROR("Unknown type in ResultWindow!"); } aRet += aEditTree.GetEntryText( pEntry ); @@ -494,7 +494,7 @@ String MsgEdit::Impl_MakeText( SvLBoxEntry *pEntry ) const String MsgEdit::Impl_MakeSaveText( TTDebugData aData ) const { -// LogType;Filename;Line;Col1;Col2;Message +// LogType;Filename;Line;Col1;Col2;Message String aRet; aRet += String::CreateFromInt32( (int)aData.aLogType ); aRet += ';'; @@ -514,12 +514,12 @@ String MsgEdit::Impl_MakeSaveText( TTDebugData aData ) const String MsgEdit::Impl_MakeSaveText( SvLBoxEntry *pEntry ) const { -// LogType;Filename;Line;Col1;Col2;Message +// LogType;Filename;Line;Col1;Col2;Message String aRet; TTDebugData *aData = (TTDebugData*)pEntry->GetUserData(); if ( aEditTree.PrevSibling( pEntry ) && LOGTYPE( aEditTree.PrevSibling( pEntry ) ) == LOG_TEST_CASE ) - { // To properly finish cases and warnings/msgs are in correct hierarchie + { // To properly finish cases and warnings/msgs are in correct hierarchie aRet += String::CreateFromInt32( (int)LOG_TEST_CASE ); aRet.AppendAscii(";;0;0;0;\"\"\n"); } @@ -583,7 +583,7 @@ USHORT MsgEdit::GetLineNr() const void MsgEdit::ReplaceSelected( const String& rStr ) { - (void) rStr; /* avoid warning about unused parameter */ + (void) rStr; /* avoid warning about unused parameter */ Sound::Beep(); DBG_ERROR("Not Implemented"); } @@ -607,14 +607,14 @@ String MsgEdit::GetText() const void MsgEdit::SetText( const String& rStr ) { - (void) rStr; /* avoid warning about unused parameter */ + (void) rStr; /* avoid warning about unused parameter */ Sound::Beep(); DBG_ERROR("Not Implemented"); } -BOOL MsgEdit::HasText() const -{ - return aEditTree.First() != NULL; +BOOL MsgEdit::HasText() const +{ + return aEditTree.First() != NULL; } // Search from the beginning or mark start + 1 @@ -622,8 +622,8 @@ BOOL MsgEdit::Find( const String& s ) { TextSelection r = GetSelection(); USHORT bgn = (USHORT) r.GetStart().GetPara() + 1; - if ( r.GetStart().GetPara() == 0 ) - bgn = 0; // Search from the beginning + if ( r.GetStart().GetPara() == 0 ) + bgn = 0; // Search from the beginning SvLBoxEntry *pEntry = aEditTree.GetModel()->GetEntryAtAbsPos( bgn ); while ( pEntry ) @@ -662,7 +662,7 @@ BOOL MsgEdit::Load( const String& aName ) TTLogMsg *pLogMsg = new TTLogMsg; while( !aStrm.IsEof() && bOk ) { - if ( nVersion >= 3 ) // utf8 + if ( nVersion >= 3 ) // utf8 aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_UTF8 ); else aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 ); @@ -674,7 +674,7 @@ BOOL MsgEdit::Load( const String& aName ) if ( aLine.GetTokenCount() >= 6 ) { -// LogType;Filename;Line;Col1;Col2;Message +// LogType;Filename;Line;Col1;Col2;Message TTDebugData aDebugData; aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() ); aDebugData.aFilename = TOKEN(1); @@ -682,7 +682,7 @@ BOOL MsgEdit::Load( const String& aName ) aDebugData.nCol1 = USHORT( TOKEN(3).ToInt32() ); aDebugData.nCol2 = USHORT( TOKEN(4).ToInt32() ); aDebugData.aMsg = aLine.GetQuotedToken( 5, CUniString("\"\"") ); - + // Remove leading and trailing quotes aDebugData.aMsg.Erase(0,1); aDebugData.aMsg.Erase(aDebugData.aMsg.Len()-1,1); @@ -703,7 +703,7 @@ BOOL MsgEdit::Load( const String& aName ) delete pLogMsg; aStrm.Close(); if ( nVersion < 2 && !bLoadError ) - Save( aName ); // Necessary to avoid mess + Save( aName ); // Necessary to avoid mess } else @@ -728,8 +728,8 @@ BOOL MsgEdit::Save( const String& aName ) } else { -// LogType;Filename;Line;Col1;Col2;Message - String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3 +// LogType;Filename;Line;Col1;Col2;Message + String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3 SvLBoxEntry *pRun = aEditTree.First(); while ( pRun && aEditTree.NextSibling( pRun ) ) pRun = aEditTree.NextSibling( pRun ); @@ -841,7 +841,7 @@ void TTTreeListBox::SelectHdl() SelectChildren( pHdlEntry, TRUE ); Select( pHdlEntry, TRUE ); -// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct +// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct } void TTTreeListBox::DeselectHdl() @@ -946,13 +946,13 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, { Color aCol; if ( ( aFeatures & HasError ) == HasError ) - aCol = Color( 255, 130, 130 ); // Red + aCol = Color( 255, 130, 130 ); // Red else if ( ( aFeatures & HasWarning ) == HasWarning ) - aCol = Color( 255, 200, 120 ); // Ochre or so + aCol = Color( 255, 200, 120 ); // Ochre or so else if ( ( aFeatures & HasAssertion ) == HasAssertion ) - aCol = Color( 0xd0, 0xd0, 0xff ); // blueish + aCol = Color( 0xd0, 0xd0, 0xff ); // blueish else - aCol = Color( 0xd0, 0xff, 0xd0 ); // greenish + aCol = Color( 0xd0, 0xff, 0xd0 ); // greenish if( rDev.IsSelected(pEntry) ) aFont.SetColor( aCol ); diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx index 02355eb21a15..7dc7117a8bb0 100644 --- a/basic/source/app/msgedit.hxx +++ b/basic/source/app/msgedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,23 +38,23 @@ class AppError; #define SelectChildren SelectChilds -typedef USHORT TTFeatures; // Bitfield for features of the entries -#define HasNothing TTFeatures(0x00) -#define HasError TTFeatures(0x01) -#define HasWarning TTFeatures(0x02) +typedef USHORT TTFeatures; // Bitfield for features of the entries +#define HasNothing TTFeatures(0x00) +#define HasError TTFeatures(0x01) +#define HasWarning TTFeatures(0x02) #define HasAssertion TTFeatures(0x04) -#define HasQAError TTFeatures(0x08) +#define HasQAError TTFeatures(0x08) class TTTreeListBox : public SvTreeListBox { protected: -// virtual void Command( const CommandEvent& rCEvt ); -// USHORT nDeselectParent; - BasicFrame *pBasicFrame; - void InitEntry( SvLBoxEntry*, const String&, const Image&, +// virtual void Command( const CommandEvent& rCEvt ); +// USHORT nDeselectParent; + BasicFrame *pBasicFrame; + void InitEntry( SvLBoxEntry*, const String&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); - AppError *pAppError; + AppError *pAppError; BOOL JumpToSourcecode( SvLBoxEntry *pThisEntry ); @@ -62,14 +62,14 @@ public: TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 ); ~TTTreeListBox(){} -// virtual void SelectHdl(); -// virtual void DeselectHdl(); - virtual BOOL DoubleClickHdl(); +// virtual void SelectHdl(); +// virtual void DeselectHdl(); + virtual BOOL DoubleClickHdl(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); -// ULONG SelectChildren( SvLBoxEntry* pParent, BOOL bSelect ); - TTFeatures GetFeatures( SvLBoxEntry* ); +// ULONG SelectChildren( SvLBoxEntry* pParent, BOOL bSelect ); + TTFeatures GetFeatures( SvLBoxEntry* ); }; class MsgEdit : public DataEdit @@ -82,11 +82,11 @@ class MsgEdit : public DataEdit SvLBoxEntry *pCurrentError; BOOL bModified; Link lModify; - BOOL bFileLoading; // TRUE while loading a file + BOOL bFileLoading; // TRUE while loading a file String Impl_MakeText( SvLBoxEntry *pEntry ) const; String Impl_MakeSaveText( SvLBoxEntry *pEntry ) const; String Impl_MakeSaveText( TTDebugData aData ) const; - USHORT nVersion; // Stores file version + USHORT nVersion; // Stores file version AppError* pAppError; String aLogFileName; diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx index c5ae5e4c4a49..22bf7f688c7e 100644 --- a/basic/source/app/mybasic.cxx +++ b/basic/source/app/mybasic.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ MyBasic::MyBasic() : StarBASIC() // AB-Uno-Test #ifdef unotest // Get Uno-Service-Manager and Reflection Service - createAndSetDefaultServiceManager(); // done later + createAndSetDefaultServiceManager(); // done later // Get Uno-Test-Object UsrAny aObjAny = getIntrospectionTestObject(); @@ -153,8 +153,8 @@ void MyBasic::LoadIniFile() SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl ) { - (void) rSymbol; /* avoid warning about unused parameter */ - (void) bWasTTControl; /* avoid warning about unused parameter */ + (void) rSymbol; /* avoid warning about unused parameter */ + (void) bWasTTControl; /* avoid warning about unused parameter */ return SB_SYMBOL; // Everything here is of type SB_SYMBOL and continues to be so } @@ -186,7 +186,7 @@ BOOL MyBasic::ErrorHdl() { AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() ); if( !pWin ) - { // open a window + { // open a window pWin = aBasicApp.pFrame->CreateModuleWin( GetActiveModule() ); } else @@ -199,7 +199,7 @@ BOOL MyBasic::ErrorHdl() 0, StarBASIC::GetErrorText(), GetLine(), GetCol1(), GetCol2() ), LIST_APPEND ); nError++; - return BOOL( nError < 20 ); // Cancel after 20 errors + return BOOL( nError < 20 ); // Cancel after 20 errors } else { @@ -213,7 +213,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin ) String nErrorText; nErrorText = GetSpechialErrorText(); - if ( pEditWin ) // just in case the focus is not right + if ( pEditWin ) // just in case the focus is not right pEditWin->ToTop(); BasicError( pEditWin, @@ -223,7 +223,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin ) void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors ) { - (void) bDebugFindNoErrors; /* avoid warning about unused parameter */ + (void) bDebugFindNoErrors; /* avoid warning about unused parameter */ } const String MyBasic::GetSpechialErrorText() @@ -238,7 +238,7 @@ USHORT MyBasic::BreakHdl() { AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( pMod->GetName() ); if( !pWin ) - { // open a window + { // open a window pWin = aBasicApp.pFrame->CreateModuleWin( pMod ); } else @@ -246,10 +246,10 @@ USHORT MyBasic::BreakHdl() pWin->Highlight( GetLine(), GetCol1(), GetCol2() ); } - if( IsBreak() ) // If Breakpoint (or "Run to Cursor") + if( IsBreak() ) // If Breakpoint (or "Run to Cursor") { -// if ( GetActiveModule()->IsBP(GetLine()) ) -// GetActiveModule()->ClearBP(GetLine()); +// if ( GetActiveModule()->IsBP(GetLine()) ) +// GetActiveModule()->ClearBP(GetLine()); return aBasicApp.pFrame->BreakHandler(); } else @@ -286,12 +286,12 @@ BasicError::BasicError // to highlight a statement void BasicError::Show() { - if( pWin && aBasicApp.pFrame->IsWinValid( pWin ) ) + if( pWin && aBasicApp.pFrame->IsWinValid( pWin ) ) { pWin->Highlight( nLine, nCol1, nCol2 ); aBasicApp.pFrame->pStatus->Message( aText ); - } - else + } + else MessBox( aBasicApp.pFrame, WB_OK, aBasicApp.pFrame->GetText(), aText ).Execute(); } diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx index 84cddf422759..a1e8347b7088 100644 --- a/basic/source/app/printer.cxx +++ b/basic/source/app/printer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <basic/ttstrhlp.hxx> #include <algorithm> - + #include "app.hxx" #include "printer.hxx" #include "basic.hrc" @@ -104,7 +104,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame * nLine++; } mpListener->EndPage(); - + Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() ); nPage = 1; pFileMenu->EnableItem( RID_FILEPRINT, TRUE ); diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx index b884a642e76f..c6b8c8e3901d 100644 --- a/basic/source/app/printer.hxx +++ b/basic/source/app/printer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ class BasicPrinter { boost::shared_ptr<Printer> mpPrinter; boost::shared_ptr<vcl::OldStylePrintAdaptor> mpListener; + + short nLine; // current row + short nPage; // current page + short nLines; // lines per page + short nYoff; // line spacing in points + String aFile; // file name - short nLine; // current row - short nPage; // current page - short nLines; // lines per page - short nYoff; // line spacing in points - String aFile; // file name - - void Header(); // print page header + void Header(); // print page header void StartPage(); public: BasicPrinter(); diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index 7d6d9a0d8eca..aedfa4e5cac3 100644 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,7 +183,7 @@ BOOL Process::Start() { bWasGPF = FALSE; #ifdef WNT -// sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); +// sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_NOGPFAULTERRORBOX); try { diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx index accd727df62f..6d2ffee3ab62 100644 --- a/basic/source/app/processw.cxx +++ b/basic/source/app/processw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,9 +61,9 @@ #define _READ 0x0100 // can be read #define _BWRITE 0x0200 // can be used as Lvaluen -#define _LVALUE _BWRITE +#define _LVALUE _BWRITE #define _READWRITE 0x0300 // can read and written -#define _OPT 0x0400 // TRUE: optional parameter +#define _OPT 0x0400 // TRUE: optional parameter #define _METHOD 0x1000 // Mask-Bit for a method #define _PROPERTY 0x2000 // Mask-Bit for a property #define _COLL 0x4000 // Mask-Bit for a collection @@ -112,7 +112,7 @@ ProcessWrapper::~ProcessWrapper() // Search for an element: // Linear search through the method table until an appropriate one // can be found. -// If the the method/property cannot be found, NULL is return +// If the the method/property cannot be found, NULL is return // without an error code, so that we can ask the whole // chain of objects for the method/property. SbxVariable* ProcessWrapper::Find( const String& rName, SbxClassType t ) @@ -226,8 +226,8 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx ) void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt ) { // Imagefile of the executable - (void) pVar; /* avoid warning about unused parameter */ - (void) bWriteIt; /* avoid warning about unused parameter */ + (void) pVar; /* avoid warning about unused parameter */ + (void) bWriteIt; /* avoid warning about unused parameter */ if ( pMethodePar->Count() >= 2 ) pProcess->SetImage(pMethodePar->Get( 1 )->GetString(), pMethodePar->Get( 2 )->GetString() ); else @@ -236,29 +236,29 @@ void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL b void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt ) { // Program is started - (void) pMethodePar; /* avoid warning about unused parameter */ - (void) bWriteIt; /* avoid warning about unused parameter */ + (void) pMethodePar; /* avoid warning about unused parameter */ + (void) bWriteIt; /* avoid warning about unused parameter */ pVar->PutBool( pProcess->Start() ); } void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt ) { // ExitCode of the program after it was finished - (void) pMethodePar; /* avoid warning about unused parameter */ - (void) bWriteIt; /* avoid warning about unused parameter */ + (void) pMethodePar; /* avoid warning about unused parameter */ + (void) bWriteIt; /* avoid warning about unused parameter */ pVar->PutULong( pProcess->GetExitCode() ); } void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt ) { // Program is still running - (void) pMethodePar; /* avoid warning about unused parameter */ - (void) bWriteIt; /* avoid warning about unused parameter */ + (void) pMethodePar; /* avoid warning about unused parameter */ + (void) bWriteIt; /* avoid warning about unused parameter */ pVar->PutBool( pProcess->IsRunning() ); } void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt ) { // Program faulted with GPF etc. - (void) pMethodePar; /* avoid warning about unused parameter */ - (void) bWriteIt; /* avoid warning about unused parameter */ + (void) pMethodePar; /* avoid warning about unused parameter */ + (void) bWriteIt; /* avoid warning about unused parameter */ pVar->PutBool( pProcess->WasGPF() ); } diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx index 0972ed3f5269..983f2662ac0b 100644 --- a/basic/source/app/processw.hxx +++ b/basic/source/app/processw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class ProcessWrapper : public SbxObject { using SbxVariable::GetInfo; -// Definition of a table entry. This is done here because +// Definition of a table entry. This is done here because // through this methods and property can declared as private. #if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 ) public: @@ -49,13 +49,13 @@ private: #endif struct Methods { - const char* pName; // Name of the entry - SbxDataType eType; // Data type - pMeth pFunc; // Function Pointer - short nArgs; // Arguments and flags + const char* pName; // Name of the entry + SbxDataType eType; // Data type + pMeth pFunc; // Function Pointer + short nArgs; // Arguments and flags }; - static Methods aProcessMethods[]; // Method table - Methods *pMethods; // Current method table + static Methods aProcessMethods[]; // Method table + Methods *pMethods; // Current method table void PSetImage( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void PStart( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc index 5d3fbb098dde..115c88e76966 100644 --- a/basic/source/app/resids.hrc +++ b/basic/source/app/resids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,57 +28,57 @@ #ifndef _RESIDS_HRC #define _RESIDS_HRC -#define RID_OK 1 -#define RID_CANCEL 2 -#define RID_FILENAME 3 -#define RID_PATHNAME 4 -#define RID_FILELIST 5 -#define RID_DIRSLIST 6 -#define RID_FIND 7 -#define RID_REPLACE 8 -//#define RID_ICON 9 -//#define RID_EDITFIELD 10 -#define RID_TEXT 11 -//#define RID_FRAME1 12 -//#define RID_FRAME2 13 -#define RID_VERSIONSTRING 14 -#define RID_FIXEDTEXT1 15 -#define RID_FIXEDTEXT2 16 +#define RID_OK 1 +#define RID_CANCEL 2 +#define RID_FILENAME 3 +#define RID_PATHNAME 4 +#define RID_FILELIST 5 +#define RID_DIRSLIST 6 +#define RID_FIND 7 +#define RID_REPLACE 8 +//#define RID_ICON 9 +//#define RID_EDITFIELD 10 +#define RID_TEXT 11 +//#define RID_FRAME1 12 +//#define RID_FRAME2 13 +#define RID_VERSIONSTRING 14 +#define RID_FIXEDTEXT1 15 +#define RID_FIXEDTEXT2 16 // OptionsDialog -#define RES_TC_OPTIONS 20 +#define RES_TC_OPTIONS 20 // GenericOptions -#define RID_TP_GEN 30 -#define RID_FL_AREA 31 -#define RID_CB_AREA 32 -#define RID_PB_NEW_AREA 33 -#define RID_PD_DEL_AREA 34 -#define RID_FL_VALUE 35 -#define RID_CB_VALUE 36 +#define RID_TP_GEN 30 +#define RID_FL_AREA 31 +#define RID_CB_AREA 32 +#define RID_PB_NEW_AREA 33 +#define RID_PD_DEL_AREA 34 +#define RID_FL_VALUE 35 +#define RID_CB_VALUE 36 #define RID_PB_SELECT_FILE 37 #define RID_PB_NEW_VALUE 38 #define RID_PB_DEL_VALUE 39 // ProfileOptions -#define RID_TP_PRO 40 -#define RID_FL_PROFILE 41 -#define RID_CB_PROFILE 42 +#define RID_TP_PRO 40 +#define RID_FL_PROFILE 41 +#define RID_CB_PROFILE 42 #define RID_PB_NEW_PROFILE 43 #define RID_PD_DEL_PROFILE 44 -#define FL_DIRECTORIES 45 -#define LOG_TEXT 46 -#define BASIS_TEXT 47 -#define HID_CHECK 48 -#define LOG_NAME 49 -#define BASIS_NAME 50 -#define HID_NAME 51 -#define LOG_SET 52 -#define BASIS_SET 53 -#define HID_SET 54 -#define CB_AUTORELOAD 55 -#define CB_AUTOSAVE 56 +#define FL_DIRECTORIES 45 +#define LOG_TEXT 46 +#define BASIS_TEXT 47 +#define HID_CHECK 48 +#define LOG_NAME 49 +#define BASIS_NAME 50 +#define HID_NAME 51 +#define LOG_SET 52 +#define BASIS_SET 53 +#define HID_SET 54 +#define CB_AUTORELOAD 55 +#define CB_AUTOSAVE 56 #define CB_STOPONSYNTAXERRORS 57 // Crashreporter Options @@ -94,7 +94,7 @@ #define ED_EMAIL 59 // MiscOptions -#define RID_TP_MIS 60 +#define RID_TP_MIS 60 #define FL_COMMUNICATION 61 #define FT_HOST 62 #define ED_HOST 63 @@ -102,9 +102,9 @@ #define NF_TTPORT 65 #define FT_UNOPORT 66 #define NF_UNOPORT 67 -#define FL_OTHER 68 -#define TIMEOUT_TEXT 69 -#define SERVER_TIMEOUT 70 +#define FL_OTHER 68 +#define TIMEOUT_TEXT 69 +#define SERVER_TIMEOUT 70 #define FT_LRU 71 #define TF_MAX_LRU 72 #define FT_PROGDIR 73 @@ -123,36 +123,36 @@ #define FT_PREVIEW 77 // DisplayHId -#define RID_TB_CONF 80 -#define RID_FT_CONTROLS 81 +#define RID_TB_CONF 80 +#define RID_FT_CONTROLS 81 #define RID_MLB_CONTROLS 82 -#define RID_FT_SLOTS 83 -#define RID_MLB_SLOTS 84 -#define RID_PB_KOPIEREN 85 -#define RID_PB_BENENNEN 86 +#define RID_FT_SLOTS 83 +#define RID_MLB_SLOTS 84 +#define RID_PB_KOPIEREN 85 +#define RID_PB_BENENNEN 86 #define RID_PB_SELECTALL 87 -#define RID_OK_CLOSE 88 +#define RID_OK_CLOSE 88 // BreakpointWindow -#define IMGID_BRKENABLED 30838 -#define IMGID_BRKDISABLED 30839 -#define IMGID_STEPMARKER 30840 -#define IMGID_ERRORMARKER 30841 +#define IMGID_BRKENABLED 30838 +#define IMGID_BRKDISABLED 30839 +#define IMGID_STEPMARKER 30840 +#define IMGID_ERRORMARKER 30841 // Edit Variables -#define RID_FT_NAME 100 -#define RID_FT_CONTENT 101 -#define RID_FT_NEW_CONTENT 102 -#define RID_FT_NAME_VALUE 103 -#define RID_FT_CONTENT_VALUE 104 - -#define RID_RB_NEW_BOOL_T 105 -#define RID_RB_NEW_BOOL_F 106 -#define RID_NF_NEW_INTEGER 107 -#define RID_NF_NEW_LONG 108 -#define RID_ED_NEW_STRING 109 +#define RID_FT_NAME 100 +#define RID_FT_CONTENT 101 +#define RID_FT_NEW_CONTENT 102 +#define RID_FT_NAME_VALUE 103 +#define RID_FT_CONTENT_VALUE 104 + +#define RID_RB_NEW_BOOL_T 105 +#define RID_RB_NEW_BOOL_F 106 +#define RID_NF_NEW_INTEGER 107 +#define RID_NF_NEW_LONG 108 +#define RID_ED_NEW_STRING 109 #endif diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx index d1e1a2be8d70..2b1ee2a5b9b6 100644 --- a/basic/source/app/status.cxx +++ b/basic/source/app/status.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ StatusLine::StatusLine( BasicFrame* p ) , pFrame( p ) { // initialize TaskToolBox - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); pTempTaskToolBox->SetActivateTaskHdl( LINK( this, StatusLine, ActivateTask ) ); // initialize TaskStatusBar - TaskStatusBar* pTempStatusBar = GetStatusBar(); - long nCharWidth = GetTextWidth( '0' ); // We state: All numbers has the same width + TaskStatusBar* pTempStatusBar = GetStatusBar(); + long nCharWidth = GetTextWidth( '0' ); // We state: All numbers has the same width pTempStatusBar->InsertItem( ST_MESSAGE, GetTextWidth( 'X' ) * 20, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); pTempStatusBar->InsertItem( ST_LINE, 5*nCharWidth ); pTempStatusBar->InsertItem( ST_PROF, GetTextWidth( 'X' ) * 10 ); @@ -109,7 +109,7 @@ void StatusLine::LoadTaskToolBox() pTaskToolBox->StartUpdateTask(); while ( nFirstWinPos < pWinMenu->GetItemCount() ) - { // There are windows + { // There are windows Window* pWin = pFrame->FindWin( pWinMenu->GetItemId( nFirstWinPos ) ); if ( pWin ) diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx index 7c3b04bed8cc..e594e80d9415 100644 --- a/basic/source/app/status.hxx +++ b/basic/source/app/status.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,9 +32,9 @@ #include <svtools/taskbar.hxx> #include <vcl/status.hxx> -#define ST_MESSAGE 1 -#define ST_LINE 2 -#define ST_PROF 3 +#define ST_MESSAGE 1 +#define ST_LINE 2 +#define ST_PROF 3 class BasicFrame; diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src index b7ce968b4438..f280bc8cca65 100644 --- a/basic/source/app/svtmsg.src +++ b/basic/source/app/svtmsg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx index 05818806c8a8..e11efa1d747b 100644 --- a/basic/source/app/testbasi.cxx +++ b/basic/source/app/testbasi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/testtool.idl b/basic/source/app/testtool.idl index acda657881c7..980b165b39eb 100644 --- a/basic/source/app/testtool.idl +++ b/basic/source/app/testtool.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src index 245cff6c7917..5157e3ecb274 100644 --- a/basic/source/app/testtool.src +++ b/basic/source/app/testtool.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx index c70a90779754..1936e9fd3f35 100644 --- a/basic/source/app/textedit.cxx +++ b/basic/source/app/textedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits ) StartListening( *pTextEngine ); - HideTipTimer.SetTimeout( 5000 ); // 5 seconds - ShowTipTimer.SetTimeout( 500 ); // 1/2 seconds + HideTipTimer.SetTimeout( 5000 ); // 5 seconds + ShowTipTimer.SetTimeout( 500 ); // 1/2 seconds HideTipTimer.SetTimeoutHdl( LINK( this, TextEditImp, HideVarContents ) ); ShowTipTimer.SetTimeoutHdl( LINK( this, TextEditImp, ShowVarContents ) ); } @@ -88,7 +88,7 @@ BOOL TextEditImp::ViewMoved() void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - (void) rBC; /* avoid warning about unused parameter */ + (void) rBC; /* avoid warning about unused parameter */ if ( rHint.ISA( TextHint ) ) { const TextHint& rTextHint = (const TextHint&)rHint; @@ -119,7 +119,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { pAppEdit->nCurTextWidth = nWidth; if ( pAppEdit->pHScroll ) - { // Initialization finished? + { // Initialization finished? pAppEdit->pHScroll->SetRange( Range( 0, (long)nWidth) ); pAppEdit->pHScroll->SetThumbPos( pTextView->GetStartDocPos().X() ); } @@ -148,20 +148,20 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } -#define TEXTATTR_SPECHIAL 55 +#define TEXTATTR_SPECHIAL 55 class TextAttribSpechial : public TextAttrib { private: - FontWeight maFontWeight; + FontWeight maFontWeight; public: TextAttribSpechial( const FontWeight& rFontWeight ); TextAttribSpechial( const TextAttribSpechial& rAttr ); ~TextAttribSpechial() {;} - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; }; TextAttribSpechial::TextAttribSpechial( const FontWeight& rFontWeight ) @@ -198,7 +198,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff ) return; SbTextPortion& rLast = aPortionList[nCount-1]; - if ( rLast.nStart > rLast.nEnd ) // Only up to the bug of MD repaired + if ( rLast.nStart > rLast.nEnd ) // Only up to the bug of MD repaired { #if OSL_DEBUG_LEVEL > 1 DBG_ERROR( "MD-Bug is not repaired!" ); @@ -215,8 +215,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff ) for ( i = 0; i < aPortionList.Count(); i++ ) { SbTextPortion& r = aPortionList[i]; -// DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" ); - if ( r.nStart > r.nEnd ) // Only up to the bug of MD repaired +// DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" ); + if ( r.nStart > r.nEnd ) // Only up to the bug of MD repaired continue; SbTextType eType = r.eType; @@ -258,7 +258,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff ) SbTextPortion& r = aPortionList[i]; DBG_ASSERT( r.nLine == nLine1, "doch mehrere Zeilen ?" ); DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" ); - if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoben + if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoben continue; if ( r.nStart > nLastEnd ) @@ -276,8 +276,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff ) for ( i = 0; i < aPortionList.Count(); i++ ) { SbTextPortion& r = aPortionList[i]; -// DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" ); - if ( r.nStart > r.nEnd ) // Only up to the bug of MD repaired +// DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" ); + if ( r.nStart > r.nEnd ) // Only up to the bug of MD repaired continue; SbTextType eCol = r.eType; @@ -342,8 +342,8 @@ void TextEditImp::DoSyntaxHighlight( ULONG nPara ) if ( nPara < pTextEngine->GetParagraphCount() ) { // unfortunatly I don't know if exact this line Modified() ... -// if ( pProgress ) -// pProgress->StepProgress(); +// if ( pProgress ) +// pProgress->StepProgress(); pTextEngine->RemoveAttribs( nPara ); String aSource( pTextEngine->GetText( nPara ) ); ImpDoHighlight( aSource, nPara ); @@ -354,8 +354,8 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara ) { // Paragraph is added to 'List', processed in TimerHdl. // => Do not manipulate paragraphs while EditEngine is formatting -// if ( pProgress ) -// pProgress->StepProgress(); +// if ( pProgress ) +// pProgress->StepProgress(); if ( !bHighlightning && bDoSyntaxHighlight ) { @@ -381,9 +381,9 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG ) nLine = (USHORT)aSyntaxLineTable.GetCurKey(); DoSyntaxHighlight( nLine ); aSyntaxLineTable.Remove( nLine ); -/* if ( Application::AnyInput() ) +/* if ( Application::AnyInput() ) { - aSyntaxIdleTimer.Start(); // Launch if we are landing in a dialog + aSyntaxIdleTimer.Start(); // Launch if we are landing in a dialog pTextView->ShowCursor( TRUE, TRUE ); pTextEngine->SetUpdateMode( TRUE ); bHighlightning = FALSE; @@ -394,31 +394,31 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG ) } BOOL bWasModified = pTextEngine->IsModified(); - if ( aSyntaxLineTable.Count() > 3 ) // Without VDev + if ( aSyntaxLineTable.Count() > 3 ) // Without VDev { pTextEngine->SetUpdateMode( TRUE ); pTextView->ShowCursor( TRUE, TRUE ); } else - pTextEngine->SetUpdateMode( TRUE ); // ! With VDev -// pTextView->ForceUpdate(); + pTextEngine->SetUpdateMode( TRUE ); // ! With VDev +// pTextView->ForceUpdate(); // SetUpdateMode( TRUE ) soll kein Modify setzen pTextEngine->SetModified( bWasModified ); // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung // => gute Gelegenheit, Textbreite zu ermitteln! -// long nPrevTextWidth = nCurTextWidth; -// nCurTextWidth = pTextEngine->CalcTextWidth(); -// if ( nCurTextWidth != nPrevTextWidth ) -// SetScrollBarRanges(); +// long nPrevTextWidth = nCurTextWidth; +// nCurTextWidth = pTextEngine->CalcTextWidth(); +// if ( nCurTextWidth != nPrevTextWidth ) +// SetScrollBarRanges(); bHighlightning = FALSE; if ( aSyntaxLineTable.First() ) aImplSyntaxIdleTimer.Start(); -// while ( Application::AnyInput() ) -// Application::Reschedule(); // Reschedule, because the UserEvent let pass no paints etc. +// while ( Application::AnyInput() ) +// Application::Reschedule(); // Reschedule, because the UserEvent let pass no paints etc. return 0; } @@ -450,7 +450,7 @@ void TextEditImp::SyntaxHighlight( BOOL bNew ) for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ ) pTextEngine->RemoveAttribs( i ); -// pTextEngine->QuickFormatDoc(); +// pTextEngine->QuickFormatDoc(); pTextEngine->SetUpdateMode( TRUE ); pTextView->ShowCursor(TRUE, TRUE ); } @@ -643,16 +643,16 @@ Variant(Empty) switch ( eType ) { case SbxBOOL: -// case SbxCURRENCY: -// case SbxDATE: +// case SbxCURRENCY: +// case SbxDATE: case SbxDOUBLE: case SbxINTEGER: case SbxLONG: -// case SbxOBJECT: // cannot be edited +// case SbxOBJECT: // cannot be edited case SbxSINGLE: case SbxSTRING: - case SbxVARIANT: // does not occure, instead SbxEMPTY + case SbxVARIANT: // does not occure, instead SbxEMPTY case SbxEMPTY: { pAppEdit->GetBasicFrame()->SetEditVar( pVar ); diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx index 094896fa87f4..de176f4a1190 100644 --- a/basic/source/app/textedit.hxx +++ b/basic/source/app/textedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,24 +49,24 @@ class TextEditImp : public Window, public SfxListener using Window::Notify; protected: - void DoSyntaxHighlight( ULONG nPara ); + void DoSyntaxHighlight( ULONG nPara ); private: AppEdit *pAppEdit; Link ModifyHdl; - Timer aSyntaxIdleTimer; - Timer aImplSyntaxIdleTimer; + Timer aSyntaxIdleTimer; + Timer aImplSyntaxIdleTimer; DECL_LINK( SyntaxTimerHdl, Timer * ); - Table aSyntaxLineTable; + Table aSyntaxLineTable; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void ImpDoHighlight( const String& rSource, ULONG nLineOff ); - BOOL bHighlightning; - BOOL bDoSyntaxHighlight; - BOOL bDelayHighlight; + void ImpDoHighlight( const String& rSource, ULONG nLineOff ); + BOOL bHighlightning; + BOOL bDoSyntaxHighlight; + BOOL bDelayHighlight; SbxBase* GetSbxAtMousePos( String &aWord ); @@ -93,16 +93,16 @@ public: BOOL IsModified(); void SetModifyHdl( Link l ){ ModifyHdl = l; } - void KeyInput( const KeyEvent& rKeyEvent ); - void Paint( const Rectangle& rRect ); - void MouseButtonUp( const MouseEvent& rMouseEvent ); - void MouseButtonDown( const MouseEvent& rMouseEvent ); -// void MouseMove( const MouseEvent& rMouseEvent ); - void Command( const CommandEvent& rCEvt ); - //BOOL Drop( const DropEvent& rEvt ); - //BOOL QueryDrop( DropEvent& rEvt ); + void KeyInput( const KeyEvent& rKeyEvent ); + void Paint( const Rectangle& rRect ); + void MouseButtonUp( const MouseEvent& rMouseEvent ); + void MouseButtonDown( const MouseEvent& rMouseEvent ); +// void MouseMove( const MouseEvent& rMouseEvent ); + void Command( const CommandEvent& rCEvt ); + //BOOL Drop( const DropEvent& rEvt ); + //BOOL QueryDrop( DropEvent& rEvt ); - BOOL ViewMoved(); + BOOL ViewMoved(); void DoDelayedSyntaxHighlight( xub_StrLen nPara ); void InvalidateSyntaxHighlight(); @@ -115,7 +115,7 @@ public: DBG_NAMEEX(TextEdit) class TextEdit : public DataEdit { - BreakpointWindow *pBreakpointWindow; + BreakpointWindow *pBreakpointWindow; BOOL bFileWasUTF8; BOOL bSaveAsUTF8; @@ -125,8 +125,8 @@ public: void Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 ); TextEditImp& GetTextEditImp() { return aEdit; } - void SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; } - BreakpointWindow *GetBreakpointWindow(){ return pBreakpointWindow; } + void SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; } + BreakpointWindow *GetBreakpointWindow(){ return pBreakpointWindow; } DATA_FUNC_DEF( aEdit, TextEditImp ) diff --git a/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx index cfc12a85dcc4..cbe6e37b22a7 100644 --- a/basic/source/app/ttbasic.cxx +++ b/basic/source/app/ttbasic.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx index 8810da66b5e9..aa0058829790 100644 --- a/basic/source/app/ttbasic.hxx +++ b/basic/source/app/ttbasic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src index e0f43e89b851..dd75f7b1e078 100644 --- a/basic/source/app/ttmsg.src +++ b/basic/source/app/ttmsg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -141,19 +141,19 @@ String S_UNKNOWN_METHOD Text[ en-US ] = "Unknown method on object :($Arg1).($Arg2)"; }; /* -String +String { Text[ en-US ] = ; }; -String +String { Text[ en-US ] = ; }; -String +String { Text[ en-US ] = ; }; -String +String { Text[ en-US ] = ; }; diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index c49ebeeeaa37..ff2d64fcfdfd 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 1c60b9024dee..882fa8b2d05f 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -52,10 +52,10 @@ #include <sb.hrc> -#define LIB_SEP 0x01 -#define LIBINFO_SEP 0x02 -#define LIBINFO_ID 0x1491 -#define PASSWORD_MARKER 0x31452134 +#define LIB_SEP 0x01 +#define LIBINFO_SEP 0x02 +#define LIBINFO_ID 0x1491 +#define PASSWORD_MARKER 0x31452134 // Library API, implemented for XML import/export @@ -88,18 +88,18 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper; -#define CURR_VER 2 +#define CURR_VER 2 // Version 1 -// ULONG nEndPos -// USHORT nId -// USHORT nVer -// BOOL bDoLoad -// String LibName -// String AbsStorageName -// String RelStorageName +// ULONG nEndPos +// USHORT nId +// USHORT nVer +// BOOL bDoLoad +// String LibName +// String AbsStorageName +// String RelStorageName // Version 2 -// + BOOL bReference +// + BOOL bReference static const char* szStdLibName = "Standard"; static const char szBasicStorage[] = "StarBASIC"; @@ -160,7 +160,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener class BasMgrContainerListenerImpl: public ContainerListenerHelper { BasicManager* mpMgr; - ::rtl::OUString maLibName; // empty -> no lib, but lib container + ::rtl::OUString maLibName; // empty -> no lib, but lib container public: BasMgrContainerListenerImpl( BasicManager* pMgr, ::rtl::OUString aLibName ) @@ -387,17 +387,17 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent& class BasicErrorManager { private: - BasErrorLst aErrorList; + BasErrorLst aErrorList; public: ~BasicErrorManager(); - void Reset(); - void InsertError( const BasicError& rError ); + void Reset(); + void InsertError( const BasicError& rError ); - BOOL HasErrors() { return (BOOL)aErrorList.Count(); } - BasicError* GetFirstError() { return aErrorList.First(); } - BasicError* GetNextError() { return aErrorList.Next(); } + BOOL HasErrors() { return (BOOL)aErrorList.Count(); } + BasicError* GetFirstError() { return aErrorList.First(); } + BasicError* GetNextError() { return aErrorList.Next(); } }; @@ -425,38 +425,38 @@ void BasicErrorManager::InsertError( const BasicError& rError ) BasicError::BasicError() { - nErrorId = 0; - nReason = 0; + nErrorId = 0; + nReason = 0; } BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) : aErrStr( rErrStr ) { - nErrorId = nId; - nReason = nR; + nErrorId = nId; + nReason = nR; } BasicError::BasicError( const BasicError& rErr ) : aErrStr( rErr.aErrStr ) { - nErrorId = rErr.nErrorId; - nReason = rErr.nReason; + nErrorId = rErr.nErrorId; + nReason = rErr.nReason; } class BasicLibInfo { private: - StarBASICRef xLib; - String aLibName; - String aStorageName; // String is sufficient, unique at runtime - String aRelStorageName; - String aPassword; + StarBASICRef xLib; + String aLibName; + String aStorageName; // String is sufficient, unique at runtime + String aRelStorageName; + String aPassword; - BOOL bDoLoad; - BOOL bReference; - BOOL bPasswordVerified; - BOOL bFoundInPath; // Must not relativated again! + BOOL bDoLoad; + BOOL bReference; + BOOL bPasswordVerified; + BOOL bFoundInPath; // Must not relativated again! // Lib represents library in new UNO library container Reference< XLibraryContainer > mxScriptCont; @@ -465,46 +465,46 @@ public: BasicLibInfo(); BasicLibInfo( const String& rStorageName ); - BOOL IsReference() const { return bReference; } - BOOL& IsReference() { return bReference; } + BOOL IsReference() const { return bReference; } + BOOL& IsReference() { return bReference; } - BOOL IsExtern() const { return ! aStorageName.EqualsAscii(szImbedded); } + BOOL IsExtern() const { return ! aStorageName.EqualsAscii(szImbedded); } - void SetStorageName( const String& rName ) { aStorageName = rName; } - const String& GetStorageName() const { return aStorageName; } + void SetStorageName( const String& rName ) { aStorageName = rName; } + const String& GetStorageName() const { return aStorageName; } - void SetRelStorageName( const String& rN ) { aRelStorageName = rN; } - const String& GetRelStorageName() const { return aRelStorageName; } - void CalcRelStorageName( const String& rMgrStorageName ); + void SetRelStorageName( const String& rN ) { aRelStorageName = rN; } + const String& GetRelStorageName() const { return aRelStorageName; } + void CalcRelStorageName( const String& rMgrStorageName ); - StarBASICRef GetLib() const + StarBASICRef GetLib() const { if( mxScriptCont.is() && mxScriptCont->hasByName( aLibName ) && !mxScriptCont->isLibraryLoaded( aLibName ) ) return StarBASICRef(); return xLib; } - StarBASICRef& GetLibRef() { return xLib; } - void SetLib( StarBASIC* pBasic ) { xLib = pBasic; } + StarBASICRef& GetLibRef() { return xLib; } + void SetLib( StarBASIC* pBasic ) { xLib = pBasic; } - const String& GetLibName() const { return aLibName; } - void SetLibName( const String& rName ) { aLibName = rName; } + const String& GetLibName() const { return aLibName; } + void SetLibName( const String& rName ) { aLibName = rName; } // Only temporary for Load/Save - BOOL DoLoad() { return bDoLoad; } + BOOL DoLoad() { return bDoLoad; } - BOOL HasPassword() const { return aPassword.Len() != 0; } - const String& GetPassword() const { return aPassword; } - void SetPassword( const String& rNewPassword ) - { aPassword = rNewPassword; } - BOOL IsPasswordVerified() const { return bPasswordVerified; } - void SetPasswordVerified() { bPasswordVerified = TRUE; } + BOOL HasPassword() const { return aPassword.Len() != 0; } + const String& GetPassword() const { return aPassword; } + void SetPassword( const String& rNewPassword ) + { aPassword = rNewPassword; } + BOOL IsPasswordVerified() const { return bPasswordVerified; } + void SetPasswordVerified() { bPasswordVerified = TRUE; } - BOOL IsFoundInPath() const { return bFoundInPath; } - void SetFoundInPath( BOOL bInPath ) { bFoundInPath = bInPath; } + BOOL IsFoundInPath() const { return bFoundInPath; } + void SetFoundInPath( BOOL bInPath ) { bFoundInPath = bInPath; } - void Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo ); - static BasicLibInfo* Create( SotStorageStream& rSStream ); + void Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo ); + static BasicLibInfo* Create( SotStorageStream& rSStream ); Reference< XLibraryContainer > GetLibraryContainer( void ) { return mxScriptCont; } @@ -517,27 +517,27 @@ DECLARE_LIST( BasicLibsBase, BasicLibInfo* ) class BasicLibs : public BasicLibsBase { public: - String aBasicLibPath; // TODO: Should be member of manager, but currently not incompatible + String aBasicLibPath; // TODO: Should be member of manager, but currently not incompatible }; BasicLibInfo::BasicLibInfo() { - bReference = FALSE; - bPasswordVerified = FALSE; - bDoLoad = FALSE; - bFoundInPath = FALSE; - mxScriptCont = NULL; - aStorageName = String::CreateFromAscii(szImbedded); - aRelStorageName = String::CreateFromAscii(szImbedded); + bReference = FALSE; + bPasswordVerified = FALSE; + bDoLoad = FALSE; + bFoundInPath = FALSE; + mxScriptCont = NULL; + aStorageName = String::CreateFromAscii(szImbedded); + aRelStorageName = String::CreateFromAscii(szImbedded); } BasicLibInfo::BasicLibInfo( const String& rStorageName ) { - bReference = TRUE; - bPasswordVerified = FALSE; - bDoLoad = FALSE; - mxScriptCont = NULL; - aStorageName = rStorageName; + bReference = TRUE; + bPasswordVerified = FALSE; + bDoLoad = FALSE; + mxScriptCont = NULL; + aStorageName = rStorageName; } void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo ) @@ -716,7 +716,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA StarBASIC* pBasic = GetLib( nBasic ); if ( pBasic ) { -// pBasic->SetParent( pStdLib ); +// pBasic->SetParent( pStdLib ); pStdLib->Insert( pBasic ); pBasic->SetFlag( SBX_EXTSEARCH ); } @@ -939,7 +939,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR { DBG_CHKTHIS( BasicManager, 0 ); -// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE; +// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE; SotStorageStreamRef xManagerStream = rStorage.OpenSotStream ( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)), eStreamReadMode ); @@ -1031,7 +1031,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) { DBG_CHKTHIS( BasicManager, 0 ); -// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE; +// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE; SotStorageStreamRef xManagerStream = rStorage.OpenSotStream ( String::CreateFromAscii(szOldManagerStream), eStreamReadMode ); @@ -1056,17 +1056,17 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) xManagerStream->Seek( nBasicStartOff ); if( !ImplLoadBasic( *xManagerStream, pLibs->GetObject(0)->GetLibRef() ) ) { -// String aErrorText( BasicResId( IDS_SBERR_MGROPEN ) ); +// String aErrorText( BasicResId( IDS_SBERR_MGROPEN ) ); // aErrorText.SearchAndReplace( "XX", aStorName ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, aStorName, ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENMGRSTREAM, aStorName ) ); // and it proceeds ... } - xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator + xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator String aLibs; xManagerStream->ReadByteString(aLibs); xManagerStream->SetBufferSize( 0 ); - xManagerStream.Clear(); // Close stream + xManagerStream.Clear(); // Close stream if ( aLibs.Len() ) { @@ -1104,8 +1104,8 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) AddLib( *xStorageRef, aLibName, FALSE ); else { -// String aErrorText( BasicResId( IDS_SBERR_LIBLOAD ) ); -// aErrorText.SearchAndReplace( "XX", aLibName ); +// String aErrorText( BasicResId( IDS_SBERR_LIBLOAD ) ); +// aErrorText.SearchAndReplace( "XX", aLibName ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, aStorName, ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STORAGENOTFOUND, aStorName ) ); } @@ -1213,7 +1213,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, xStorage->GetName(), ERRCODE_BUTTON_OK ); + StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, xStorage->GetName(), ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLibInfo->GetLibName() ) ); } else @@ -1254,7 +1254,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag } if ( !bLoaded ) { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, pLibInfo->GetLibName(), ERRCODE_BUTTON_OK ); + StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, pLibInfo->GetLibName(), ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_BASICLOADERROR, pLibInfo->GetLibName() ) ); } else @@ -1379,7 +1379,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B // Use original name otherwise ImpLoadLibary failes... pLibInfo->SetLibName( rLibName ); // Funktioniert so aber nicht, wenn Name doppelt -// USHORT nLibId = GetLibId( rLibName ); +// USHORT nLibId = GetLibId( rLibName ); USHORT nLibId = (USHORT) pLibs->GetPos( pLibInfo ); // Set StorageName before load because it is compared with pCurStorage @@ -1393,9 +1393,9 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B if ( bReference ) { - pLibInfo->GetLib()->SetModified( FALSE ); // Don't save in this case + pLibInfo->GetLib()->SetModified( FALSE ); // Don't save in this case pLibInfo->SetRelStorageName( String() ); -// pLibInfo->CalcRelStorageName( GetStorageName() ); +// pLibInfo->CalcRelStorageName( GetStorageName() ); pLibInfo->IsReference() = TRUE; } else @@ -1445,7 +1445,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage ) if ( !pLibInfo || !nLib ) { -// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) ); +// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) ); return FALSE; @@ -1469,7 +1469,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage ) if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) { -// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) ); +// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLibInfo->GetLibName() ) ); } @@ -1507,7 +1507,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage ) if ( pLibInfo->GetLib().Is() ) GetStdLib()->Remove( pLibInfo->GetLib() ); delete pLibs->Remove( pLibInfo ); - return TRUE; // Remove was successful, del unimportant + return TRUE; // Remove was successful, del unimportant } USHORT BasicManager::GetLibCount() const @@ -1632,7 +1632,7 @@ BOOL BasicManager::LoadLib( USHORT nLib ) StarBASIC* pLib = GetLib( nLib ); if ( pLib ) { - // pLib->SetParent( GetStdLib() ); + // pLib->SetParent( GetStdLib() ); GetStdLib()->Insert( pLib ); pLib->SetFlag( SBX_EXTSEARCH ); } @@ -1640,9 +1640,9 @@ BOOL BasicManager::LoadLib( USHORT nLib ) } else { -// String aErrorText( BasicResId( IDS_SBERR_LIBLOAD ) ); -// aErrorText.SearchAndReplace( "XX", "" ); - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, String(), ERRCODE_BUTTON_OK ); +// String aErrorText( BasicResId( IDS_SBERR_LIBLOAD ) ); +// aErrorText.SearchAndReplace( "XX", "" ); + StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, String(), ERRCODE_BUTTON_OK ); pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_LIBNOTFOUND, String::CreateFromInt32(nLib) ) ); } return bDone; @@ -1682,7 +1682,7 @@ StarBASIC* BasicManager::CreateLib //if( !pLibInfo ) //pLibInfo = FindLibInfo( pLib ); //pLibInfo->SetStorageName( LinkTargetURL ); - //pLibInfo->GetLib()->SetModified( FALSE ); // Then don't save + //pLibInfo->GetLib()->SetModified( FALSE ); // Then don't save //pLibInfo->SetRelStorageName( String() ); //pLibInfo->IsReference() = TRUE; } @@ -2117,7 +2117,7 @@ SbxObject* implCreateDialog( Sequence< sal_Int8 > aData ) // HACK! Because this value is defined in basctl/inc/vcsbxdef.hxx // which we can't include here, we have to use the value directly -#define SBXID_DIALOG 101 +#define SBXID_DIALOG 101 class DialogContainer_Impl : public NameContainerHelper diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx index fdef98bce335..30003917ea02 100644 --- a/basic/source/classes/disas.cxx +++ b/basic/source/classes/disas.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ static const char* pOp3[] = { "FIND", // Load (+StringID+Typ) "ELEM", // Load element (+StringID+Typ) "PARAM", // Parameter (+Offset+Typ) - + // Branching "CALL", // Call DECLARE method (+StringID+Typ) "CALL.C", // Call Cdecl-DECLARE method (+StringID+Typ) @@ -154,8 +154,8 @@ static const char* pOp3[] = { "FIND_G", // Searches for global var with special handling due to _GLOBAL_P "DCREATE_REDIMP", // Change dimensions of a user defined Object-Array (+StringId+StringId) "FIND_CM", // Search inside a class module (CM) to enable global search in time - "PUBLIC_P", // Module global Variable (persisted between calls)(+StringID+Typ) - "FIND_STATIC", // local static var lookup (+StringID+Typ) + "PUBLIC_P", // Module global Variable (persisted between calls)(+StringID+Typ) + "FIND_STATIC", // local static var lookup (+StringID+Typ) }; static const char** pOps[3] = { pOp1, pOp2, pOp3 }; @@ -163,27 +163,27 @@ static const char** pOps[3] = { pOp1, pOp2, pOp3 }; typedef void( SbiDisas::*Func )( String& ); // Processing routines static const Func pOperand2[] = { - &SbiDisas::StrOp, // Load a numeric constant (+ID) - &SbiDisas::StrOp, // Load a string constant (+ID) - &SbiDisas::ImmOp, // Immediate Load (+Wert) - &SbiDisas::StrOp, // Save a named argument (+ID) - &SbiDisas::ImmOp, // Strip String to fixed size (+length) + &SbiDisas::StrOp, // Load a numeric constant (+ID) + &SbiDisas::StrOp, // Load a string constant (+ID) + &SbiDisas::ImmOp, // Immediate Load (+Wert) + &SbiDisas::StrOp, // Save a named argument (+ID) + &SbiDisas::ImmOp, // Strip String to fixed size (+length) // Branches - &SbiDisas::LblOp, // Jump (+Target) - &SbiDisas::LblOp, // eval TOS, conditional jump (+Target) - &SbiDisas::LblOp, // eval TOS, conditional jump (+Target) - &SbiDisas::OnOp, // eval TOS, jump in JUMP table (+MaxVal) - &SbiDisas::LblOp, // UP call (+Target) - &SbiDisas::ReturnOp, // UP Return (+0 or Target) - &SbiDisas::LblOp, // test FOR-Variable, increment (+Endlabel) - &SbiDisas::LblOp, // Tos+1 <= Case <= Tos), 2xremove (+Target) - &SbiDisas::LblOp, // Error handler (+Offset) - &SbiDisas::ResumeOp, // Resume after errors (+0 or 1 or Label) + &SbiDisas::LblOp, // Jump (+Target) + &SbiDisas::LblOp, // eval TOS, conditional jump (+Target) + &SbiDisas::LblOp, // eval TOS, conditional jump (+Target) + &SbiDisas::OnOp, // eval TOS, jump in JUMP table (+MaxVal) + &SbiDisas::LblOp, // UP call (+Target) + &SbiDisas::ReturnOp, // UP Return (+0 or Target) + &SbiDisas::LblOp, // test FOR-Variable, increment (+Endlabel) + &SbiDisas::LblOp, // Tos+1 <= Case <= Tos), 2xremove (+Target) + &SbiDisas::LblOp, // Error handler (+Offset) + &SbiDisas::ResumeOp, // Resume after errors (+0 or 1 or Label) // I/O - &SbiDisas::CloseOp, // (+channel/0) - &SbiDisas::CharOp, // (+char) + &SbiDisas::CloseOp, // (+channel/0) + &SbiDisas::CharOp, // (+char) // Objects &SbiDisas::StrOp, // Test classname (+StringId) @@ -196,19 +196,19 @@ static const Func pOperand2[] = { static const Func pOperand3[] = { // All opcodes with two operands - &SbiDisas::VarOp, // Load from RTL (+StringID+Typ) - &SbiDisas::VarOp, // Load (+StringID+Typ) - &SbiDisas::VarOp, // Load Element (+StringID+Typ) - &SbiDisas::OffOp, // Parameter (+Offset+Typ) + &SbiDisas::VarOp, // Load from RTL (+StringID+Typ) + &SbiDisas::VarOp, // Load (+StringID+Typ) + &SbiDisas::VarOp, // Load Element (+StringID+Typ) + &SbiDisas::OffOp, // Parameter (+Offset+Typ) // Branch - &SbiDisas::VarOp, // Call DECLARE-Method (+StringID+Typ) - &SbiDisas::VarOp, // Call CDecl-DECLARE-Methode (+StringID+Typ) - &SbiDisas::CaseOp, // Case-Test (+Test-Opcode+False-Target) - &SbiDisas::StmntOp, // Statement (+Row+Column) + &SbiDisas::VarOp, // Call DECLARE-Method (+StringID+Typ) + &SbiDisas::VarOp, // Call CDecl-DECLARE-Methode (+StringID+Typ) + &SbiDisas::CaseOp, // Case-Test (+Test-Opcode+False-Target) + &SbiDisas::StmntOp, // Statement (+Row+Column) // I/O - &SbiDisas::StrmOp, // (+SvStreamFlags+Flags) + &SbiDisas::StrmOp, // (+SvStreamFlags+Flags) // Objects &SbiDisas::VarDefOp, // Define local var (+StringID+Typ) @@ -221,9 +221,9 @@ static const Func pOperand3[] = { &SbiDisas::VarDefOp, // Define persistent global var P=PERSIST (+StringID+Typ) &SbiDisas::VarOp, // Searches for global var with special handling due to _GLOBAL_P &SbiDisas::Str2Op, // Redimensionate User defined Object-Array (+StringId+StringId) - &SbiDisas::VarOp, // FIND_CM + &SbiDisas::VarOp, // FIND_CM &SbiDisas::VarDefOp, // PUBLIC_P - &SbiDisas::VarOp, // FIND_STATIC + &SbiDisas::VarOp, // FIND_STATIC }; // TODO: Why as method? Isn't a simple define sufficient? @@ -396,7 +396,7 @@ BOOL SbiDisas::DisasLine( String& rText ) if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 ); } while( !bDone ); // snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC ); -// rText += cBuf; +// rText += cBuf; rText.AppendAscii( "; " ); rText += s; rText.AppendAscii( _crlf() ); @@ -623,7 +623,7 @@ void SbiDisas::TypeOp( String& rText ) // From 1996-01-19: type can contain flag for BYVAL (StepARGTYP) if( nOp1 & 0x8000 ) { - nOp1 &= 0x7FFF; // filter away the flag + nOp1 &= 0x7FFF; // filter away the flag rText.AppendAscii( "BYVAL " ); } if( nOp1 < 13 ) diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 5d1538eba062..8174a87feb5a 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -41,13 +41,13 @@ using namespace ::ooo; typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE; class ErrObject : public ErrObjectImpl_BASE -{ +{ rtl::OUString m_sHelpFile; rtl::OUString m_sSource; - rtl::OUString m_sDescription; + rtl::OUString m_sDescription; sal_Int32 m_nNumber; sal_Int32 m_nHelpContext; - + public: ErrObject(); ~ErrObject(); @@ -62,11 +62,11 @@ public: virtual void SAL_CALL setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getSource() throw (uno::RuntimeException); virtual void SAL_CALL setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException); - + // Methods virtual void SAL_CALL Clear( ) throw (uno::RuntimeException); virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException); - // XDefaultProperty + // XDefaultProperty virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException); // Helper method @@ -89,7 +89,7 @@ ErrObject::getNumber() throw (uno::RuntimeException) return m_nNumber; } -void SAL_CALL +void SAL_CALL ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) { pINST->setErrorVB( _number, String() ); @@ -97,65 +97,65 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ErrObject::getHelpContext() throw (uno::RuntimeException) { return m_nHelpContext; } -void SAL_CALL +void SAL_CALL ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException) { m_nHelpContext = _helpcontext; } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ErrObject::getHelpFile() throw (uno::RuntimeException) { return m_sHelpFile; } -void SAL_CALL +void SAL_CALL ErrObject::setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException) { m_sHelpFile = _helpfile; } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ErrObject::getDescription() throw (uno::RuntimeException) { return m_sDescription; } -void SAL_CALL +void SAL_CALL ErrObject::setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException) { m_sDescription = _description; } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ErrObject::getSource() throw (uno::RuntimeException) { return m_sSource; } -void SAL_CALL +void SAL_CALL ErrObject::setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException) { m_sSource = _source; } - + // Methods -void SAL_CALL +void SAL_CALL ErrObject::Clear( ) throw (uno::RuntimeException) { m_sHelpFile = rtl::OUString(); m_sSource = m_sHelpFile; m_sDescription = m_sSource; - m_nNumber = 0; - m_nHelpContext = 0; + m_nNumber = 0; + m_nHelpContext = 0; } -void SAL_CALL +void SAL_CALL ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException) { setData( Number, Source, Description, HelpFile, HelpContext ); @@ -163,8 +163,8 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any pINST->ErrorVB( m_nNumber, m_sDescription ); } -// XDefaultProperty -::rtl::OUString SAL_CALL +// XDefaultProperty +::rtl::OUString SAL_CALL ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException) { static rtl::OUString sDfltPropName( RTL_CONSTASCII_USTRINGPARAM("Number") ); @@ -202,12 +202,12 @@ SbxErrObject::~SbxErrObject() OSL_TRACE("SbxErrObject::~SbxErrObject dtor"); } -uno::Reference< vba::XErrObject > +uno::Reference< vba::XErrObject > SbxErrObject::getUnoErrObject() { SbxVariable* pVar = getErrObject(); SbxErrObject* pGlobErr = static_cast< SbxErrObject* >( pVar ); - return pGlobErr->m_xErr; + return pGlobErr->m_xErr; } SbxVariableRef diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 37b8037bf9e3..4703647b7a35 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 654ad79df750..285deaba692f 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,23 +32,23 @@ #include <tools/tenccvt.hxx> #include <basic/sbx.hxx> #include "sb.hxx" -#include <string.h> // memset() etc +#include <string.h> // memset() etc #include "image.hxx" #include <codegen.hxx> SbiImage::SbiImage() { pStringOff = NULL; pStrings = NULL; - pCode = NULL; - pLegacyPCode = NULL; - nFlags = 0; + pCode = NULL; + pLegacyPCode = NULL; + nFlags = 0; nStrings = 0; nStringSize= 0; nCodeSize = 0; nLegacyCodeSize = nDimBase = 0; - bInit = - bError = FALSE; + bInit = + bError = FALSE; bFirstInit = TRUE; eCharSet = gsl_getSystemTextEncoding(); } @@ -66,15 +66,15 @@ void SbiImage::Clear() ReleaseLegacyBuffer(); pStringOff = NULL; pStrings = NULL; - pCode = NULL; - nFlags = 0; + pCode = NULL; + nFlags = 0; nStrings = 0; nStringSize= 0; nLegacyCodeSize = 0; nCodeSize = 0; eCharSet = gsl_getSystemTextEncoding(); nDimBase = 0; - bError = FALSE; + bError = FALSE; } /************************************************************************** @@ -205,7 +205,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion ) // nStart members. When that is done // the module can release the buffer // or it can wait until this routine - // is called again or when this class // destructs all of which will trigger + // is called again or when this class // destructs all of which will trigger // release of the buffer. } break; @@ -267,7 +267,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer ) { SbiImage aEmptyImg; aEmptyImg.aName = aName; - aEmptyImg.Save( r, B_LEGACYVERSION ); + aEmptyImg.Save( r, B_LEGACYVERSION ); return TRUE; } // First of all the header @@ -325,7 +325,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer ) nPos = SbiOpenRecord( r, B_EXTSOURCE, nUnitCount ); for( UINT16 i = 0 ; i < nUnitCount ; i++ ) { - sal_Int32 nCopyLen = + sal_Int32 nCopyLen = (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen; String aTmp2 = aOUSource.copy( (i+1) * nMaxUnitSize, nCopyLen ); nRemainingLen -= nCopyLen; @@ -357,7 +357,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer ) { nPos = SbiOpenRecord( r, B_STRINGPOOL, nStrings ); // For every String: - // UINT32 Offset of the Strings in the Stringblock + // UINT32 Offset of the Strings in the Stringblock short i; for( i = 0; i < nStrings && SbiGood( r ); i++ ) @@ -419,7 +419,7 @@ void SbiImage::AddString( const String& r ) xub_StrLen len = r.Len() + 1; UINT32 needed = nStringOff + len; if( needed > 0xFFFFFF00L ) - bError = TRUE; // out of mem! + bError = TRUE; // out of mem! else if( needed > nStringSize ) { UINT32 nNewLen = needed + 1024; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 2c01c49f814c..1094508a864c 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 4cebf35be0c7..c74e99689573 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ using com::sun::star::lang::XMultiServiceFactory; SbxObject* StarBASIC::getVBAGlobals( ) { if ( !pVBAGlobals ) - { + { Any aThisDoc; if ( GetUNOConstant("ThisComponent", aThisDoc) ) { @@ -242,7 +242,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] = { 1005, SbERR_SETPROP_FAILED }, { 1006, SbERR_GETPROP_FAILED }, { 1007, SbERR_BASIC_COMPAT }, - { 0xFFFF, 0xFFFFFFFFL } // End mark + { 0xFFFF, 0xFFFFFFFFL } // End mark }; // The StarBASIC factory is a hack. When a SbModule is created, its pointer @@ -309,7 +309,7 @@ SbxBase* SbOLEFactory::Create( UINT16, UINT32 ) return NULL; } -SbUnoObject* createOLEObject_Impl( const String& aType ); // sbunoobj.cxx +SbUnoObject* createOLEObject_Impl( const String& aType ); // sbunoobj.cxx SbxObject* SbOLEFactory::CreateObject( const String& rClassName ) { @@ -387,13 +387,13 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) pDest->AddDim32( lb, ub ); } } - else + else pDest->unoAddDim( 0, -1 ); // variant array USHORT nSavFlags = pVar->GetFlags(); pNewProp->ResetFlag( SBX_FIXED ); - // need to reset the FIXED flag - // when calling PutObject ( because the type will not match Object ) + // need to reset the FIXED flag + // when calling PutObject ( because the type will not match Object ) pNewProp->PutObject( pDest ); pNewProp->SetFlags( nSavFlags ); } @@ -490,7 +490,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) } } - // Copy SbIfaceMapperMethod in a second step to ensure that + // Copy SbIfaceMapperMethod in a second step to ensure that // the corresponding base methods have already been copied for( i = 0 ; i < nMethodCount ; i++ ) { @@ -515,7 +515,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) DBG_ERROR( "Found no ImplMethod copy" ); continue; } - SbIfaceMapperMethod* pNewIfaceMethod = + SbIfaceMapperMethod* pNewIfaceMethod = new SbIfaceMapperMethod( pIfaceMethod->GetName(), pImplMethodCopy ); pMethods->PutDirect( pNewIfaceMethod, i ); } @@ -598,7 +598,7 @@ SbClassModuleObject::~SbClassModuleObject() if( StarBASIC::IsRunning() ) triggerTerminateEvent(); - // Must be deleted by base class dtor because this data + // Must be deleted by base class dtor because this data // is not owned by the SbClassModuleObject object pImage = NULL; pBreaks = NULL; @@ -669,7 +669,7 @@ SbClassData::SbClassData( void ) void SbClassData::clear( void ) { - mxIfaces->Clear(); + mxIfaces->Clear(); maRequiredTypes.clear(); } @@ -806,7 +806,7 @@ void* StarBASIC::operator new( size_t n ) { if( n < sizeof( StarBASIC ) ) { -// DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" ); +// DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" ); n = sizeof( StarBASIC ); } return ::operator new( n ); @@ -836,7 +836,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& r } SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, const rtl::OUString& rSrc ) { - + OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); SbModule* p = NULL; switch ( mInfo.ModuleType ) @@ -856,7 +856,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, break; default: p = new SbModule( rName, isVBAEnabled() ); - + } p->SetSource32( rSrc ); p->SetParent( this ); @@ -929,10 +929,10 @@ SbModule* StarBASIC::FindModule( const String& rName ) struct ClassModuleRunInitItem { - SbModule* m_pModule; - bool m_bProcessing; - bool m_bRunInitDone; - //ModuleVector m_vModulesDependingOnThisModule; + SbModule* m_pModule; + bool m_bProcessing; + bool m_bRunInitDone; + //ModuleVector m_vModulesDependingOnThisModule; ClassModuleRunInitItem( void ) : m_pModule( NULL ) @@ -999,10 +999,10 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit ) for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ ) { SbModule* pModule = (SbModule*)pModules->Get( nMod ); - if( !pModule->IsCompiled() ) + if( !pModule->IsCompiled() ) pModule->Compile(); } - // compile modules first then RunInit ( otherwise there is + // compile modules first then RunInit ( otherwise there is // can be order dependency, e.g. classmodule A has a member // of of type classmodule B and classmodule B hasn't been compiled yet ) @@ -1289,14 +1289,14 @@ USHORT __EXPORT StarBASIC::BreakHdl() } // Calls for error handler and break handler -USHORT StarBASIC::GetLine() { return GetSbData()->nLine; } -USHORT StarBASIC::GetCol1() { return GetSbData()->nCol1; } -USHORT StarBASIC::GetCol2() { return GetSbData()->nCol2; } +USHORT StarBASIC::GetLine() { return GetSbData()->nLine; } +USHORT StarBASIC::GetCol1() { return GetSbData()->nCol1; } +USHORT StarBASIC::GetCol2() { return GetSbData()->nCol2; } // Specific to error handler -SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; } -const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; } -BOOL StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; } +SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; } +const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; } +BOOL StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; } void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode ) { GetSbData()->eLanguageMode = eLanguageMode; @@ -1347,7 +1347,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError ) nRet = 0; } } - + // search loop const SFX_VB_ErrorItem* pErrItem; USHORT nIndex = 0; @@ -1361,11 +1361,11 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError ) } nIndex++; } - while( pErrItem->nErrorVB != 0xFFFF ); // up to end mark + while( pErrItem->nErrorVB != 0xFFFF ); // up to end mark return nRet; } -SbError StarBASIC::GetSfxFromVBError( USHORT nError ) +SbError StarBASIC::GetSfxFromVBError( USHORT nError ) { SbError nRet = 0L; @@ -1407,11 +1407,11 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError ) break; } else if( pErrItem->nErrorVB > nError ) - break; // couldn't found anymore + break; // couldn't found anymore nIndex++; } - while( pErrItem->nErrorVB != 0xFFFF ); // up to end mark + while( pErrItem->nErrorVB != 0xFFFF ); // up to end mark return nRet; } @@ -1534,7 +1534,7 @@ BOOL StarBASIC::CError bRet = (BOOL) GetSbData()->aErrHdl.Call( this ); else bRet = ErrorHdl(); - GetSbData()->bCompiler = FALSE; // only true for error handler + GetSbData()->bCompiler = FALSE; // only true for error handler return bRet; } @@ -1558,7 +1558,7 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, { // very confusing, even though MakeErrorText sets up the error text // seems that this is not used ( if rMsg already has content ) - // In the case of VBA MakeErrorText also formats the error to be alittle more + // In the case of VBA MakeErrorText also formats the error to be alittle more // like vba ( adds an error number etc ) if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) ) { @@ -1664,7 +1664,7 @@ SbxArrayRef StarBASIC::getUnoListeners( void ) /************************************************************************** * -* Laden und Speichern +* Laden und Speichern * **************************************************************************/ @@ -1763,10 +1763,10 @@ bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::u TYPEINIT1(BasicCollection,SbxObject) -static const char pCountStr[] = "Count"; -static const char pAddStr[] = "Add"; -static const char pItemStr[] = "Item"; -static const char pRemoveStr[] = "Remove"; +static const char pCountStr[] = "Count"; +static const char pAddStr[] = "Add"; +static const char pItemStr[] = "Item"; +static const char pRemoveStr[] = "Remove"; static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash; SbxInfoRef BasicCollection::xAddInfo = NULL; @@ -1783,7 +1783,7 @@ BasicCollection::BasicCollection( const XubString& rClass ) nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) ); } Initialize(); - + } BasicCollection::~BasicCollection() @@ -1811,18 +1811,18 @@ void BasicCollection::Initialize() p->SetFlag( SBX_DONTSTORE ); p = Make( String::CreateFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); - if ( !xAddInfo.Is() ) + if ( !xAddInfo.Is() ) { xAddInfo = new SbxInfo; - xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Item") ), SbxVARIANT, SBX_READ ); - xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Key") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); - xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Before") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); - xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("After") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); + xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Item") ), SbxVARIANT, SBX_READ ); + xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Key") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); + xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Before") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); + xAddInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("After") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); } - if ( !xItemInfo.Is() ) + if ( !xItemInfo.Is() ) { xItemInfo = new SbxInfo; - xItemInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Index") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL); + xItemInfo->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Index") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL); } } diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src index 73cc1c3a0b2c..632148acc002 100644 --- a/basic/source/classes/sb.src +++ b/basic/source/classes/sb.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx index 0732b0c0e1d4..039bdddf5f6e 100644 --- a/basic/source/classes/sbintern.cxx +++ b/basic/source/classes/sbintern.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ #include "sbintern.hxx" #include "sbunoobj.hxx" -#include "token.hxx" // Tokenizer -#include "symtbl.hxx" // Symbolverwaltung -#include "parser.hxx" // Parser -#include "codegen.hxx" // Code-Generator +#include "token.hxx" // Tokenizer +#include "symtbl.hxx" // Symbolverwaltung +#include "parser.hxx" // Parser +#include "codegen.hxx" // Code-Generator #include <basic/basmgr.hxx> SV_IMPL_PTRARR(SbErrorStack, SbErrorStackEntry*) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 089a963cf05c..52bdddfef504 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -814,7 +814,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, if( nVarParCount > 1 ) { SbxArrayRef xMethParameters = new SbxArray; - xMethParameters->Put( pMethVar, 0 ); // Method as parameter 0 + xMethParameters->Put( pMethVar, 0 ); // Method as parameter 0 for( USHORT i = 1 ; i < nVarParCount ; ++i ) { SbxVariable* pPar = pArg->Get( i ); @@ -847,7 +847,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, aProcName += pProcProperty->GetName(); pMethVar = Find( aProcName, SbxCLASS_METHOD ); } - if( !pMethVar ) // Let + if( !pMethVar ) // Let { String aProcName; aProcName.AppendAscii( "Property Let " ); @@ -859,7 +859,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, { // Setup parameters SbxArrayRef xArray = new SbxArray; - xArray->Put( pMethVar, 0 ); // Method as parameter 0 + xArray->Put( pMethVar, 0 ); // Method as parameter 0 xArray->Put( pVar, 1 ); pMethVar->SetParameters( xArray ); @@ -1218,7 +1218,7 @@ USHORT SbModule::Run( SbMethod* pMeth ) nRes = TRUE; pINST->pRun = pRt->pNext; - pINST->nCallLvl--; // Call-Level down again + pINST->nCallLvl--; // Call-Level down again // Exist an higher-ranking runtime instance? // Then take over SbDEBUG_BREAK, if set @@ -1254,11 +1254,11 @@ USHORT SbModule::Run( SbMethod* pMeth ) } } else - pINST->nCallLvl--; // Call-Level down again + pINST->nCallLvl--; // Call-Level down again } else { - pINST->nCallLvl--; // Call-Level down again + pINST->nCallLvl--; // Call-Level down again StarBASIC::FatalError( SbERR_STACK_OVERFLOW ); } @@ -1884,11 +1884,11 @@ BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p ) : SbxMethod( r, t ), pMod( p ) { - bInvalid = TRUE; - nStart = + bInvalid = TRUE; + nStart = nDebugFlags = - nLine1 = - nLine2 = 0; + nLine1 = + nLine2 = 0; refStatics = new SbxArray; mCaller = 0; // From: 1996-07.02: HACK due to 'Referenz could not be saved' @@ -1899,11 +1899,11 @@ SbMethod::SbMethod( const SbMethod& r ) : SvRefBase( r ), SbxMethod( r ) { pMod = r.pMod; - bInvalid = r.bInvalid; - nStart = r.nStart; + bInvalid = r.bInvalid; + nStart = r.nStart; nDebugFlags = r.nDebugFlags; - nLine1 = r.nLine1; - nLine2 = r.nLine2; + nLine1 = r.nLine1; + nLine2 = r.nLine2; refStatics = r.refStatics; mCaller = r.mCaller; SetFlag( SBX_NO_MODIFY ); @@ -1938,7 +1938,7 @@ BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer ) INT16 n; rStrm >> n; INT16 nTempStart = (INT16)nStart; - // nDebugFlags = n; // From 1996-01-16: no longer take over + // nDebugFlags = n; // From 1996-01-16: no longer take over if( nVer == 2 ) rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid; // From: 1996-07-02: HACK ue to 'Referenz could not be saved' @@ -2327,7 +2327,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any if ( aArguments.getLength() > 0 ) // Setup parameters { SbxArrayRef xArray = new SbxArray; - xArray->Put( pMeth, 0 ); // Method as parameter 0 + xArray->Put( pMeth, 0 ); // Method as parameter 0 for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i ) { diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx index 5a6aa36970ef..8150466b4c00 100644 --- a/basic/source/comp/buffer.cxx +++ b/basic/source/comp/buffer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -212,7 +212,7 @@ BOOL SbiBuffer::operator +=( UINT32 n ) if ( operator +=( n1 ) && operator +=( n2 ) ) return TRUE; return TRUE; - } + } return FALSE; } diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index da8d6d96e8af..c12962f796c1 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ SbiCodeGen::SbiCodeGen( SbModule& r, SbiParser* p, short nInc ) : rMod( r ), aCode( p, nInc ) { pParser = p; - bStmnt = FALSE; + bStmnt = FALSE; nLine = 0; nCol = 0; nForLevel = 0; @@ -129,7 +129,7 @@ void SbiCodeGen::Save() // OPTION EXPLICIT-Flag uebernehmen if( pParser->bExplicit ) p->SetFlag( SBIMG_EXPLICIT ); - + int nIfaceCount = 0; if( rMod.mnType == com::sun::star::script::ModuleType::CLASS ) { @@ -180,13 +180,13 @@ void SbiCodeGen::Save() USHORT nPassCount = 1; if( nIfaceCount ) { - int nPropPrefixFound = + int nPropPrefixFound = aProcName.Search( String( RTL_CONSTASCII_USTRINGPARAM("Property ") ) ); String aPureProcName = aProcName; String aPropPrefix; if( nPropPrefixFound == 0 ) { - aPropPrefix = aProcName.Copy( 0, 13 ); // 13 == Len( "Property ?et " ) + aPropPrefix = aProcName.Copy( 0, 13 ); // 13 == Len( "Property ?et " ) aPureProcName = aProcName.Copy( 13 ); } for( int i = 0 ; i < nIfaceCount ; i++ ) @@ -222,7 +222,7 @@ void SbiCodeGen::Save() case PROPERTY_MODE_LET: { // type == type of first parameter - ePropType = SbxVARIANT; // Default + ePropType = SbxVARIANT; // Default SbiSymPool* pPool = &pProc->GetParams(); if( pPool->GetSize() > 1 ) { @@ -276,7 +276,7 @@ void SbiCodeGen::Save() // Die Zusatzdaten retten aHelpFile = pInfo->GetHelpFile(); aComment = pInfo->GetComment(); - nHelpId = pInfo->GetHelpId(); + nHelpId = pInfo->GetHelpId(); } // Und die Parameterliste neu aufbauen pInfo = new SbxInfo( aHelpFile, nHelpId ); @@ -313,7 +313,7 @@ void SbiCodeGen::Save() pMeth->SetInfo( pInfo ); } - } // for( iPass... + } // for( iPass... } } // Der Code @@ -352,9 +352,9 @@ public: virtual ~PCodeVisitor(); virtual void start( BYTE* pStart ) = 0; - virtual void processOpCode0( SbiOpcode eOp ) = 0; - virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0; - virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0; + virtual void processOpCode0( SbiOpcode eOp ) = 0; + virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0; + virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0; virtual bool processParams() = 0; virtual void end() = 0; }; @@ -391,7 +391,7 @@ public: for( ; pCode < pEnd; ) { SbiOpcode eOp = (SbiOpcode)(*pCode++); - + if ( eOp <= SbOP0_END ) visitor.processOpCode0( eOp ); else if( eOp >= SbOP1_START && eOp <= SbOP1_END ) @@ -412,7 +412,7 @@ public: else pCode += ( sizeof( T ) * 2 ); visitor.processOpCode2( eOp, nOp1, nOp2 ); - } + } } visitor.end(); } @@ -425,22 +425,22 @@ class OffSetAccumulator : public PCodeVisitor< T > T m_nNumSingleParams; T m_nNumDoubleParams; public: - + OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){} virtual void start( BYTE* /*pStart*/ ){} virtual void processOpCode0( SbiOpcode /*eOp*/ ){ ++m_nNumOp0; } virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ){ ++m_nNumSingleParams; } virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) { ++m_nNumDoubleParams; } virtual void end(){} - S offset() - { - T result = 0 ; + S offset() + { + T result = 0 ; static const S max = std::numeric_limits< S >::max(); - result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 ) * m_nNumDoubleParams ); - if ( result > max ) + result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 ) * m_nNumDoubleParams ); + if ( result > max ) return max; - - return static_cast<S>(result); + + return static_cast<S>(result); } virtual bool processParams(){ return false; } }; @@ -456,7 +456,7 @@ class BufferTransformer : public PCodeVisitor< T > public: BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {} virtual void start( BYTE* pStart ){ m_pStart = pStart; } - virtual void processOpCode0( SbiOpcode eOp ) + virtual void processOpCode0( SbiOpcode eOp ) { m_ConvertedBuf += (UINT8)eOp; } @@ -480,12 +480,12 @@ public: nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) ); break; default: - break; // - + break; // + } m_ConvertedBuf += (S)nOp1; } - virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) + virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) { m_ConvertedBuf += (UINT8)eOp; if ( eOp == _CASEIS ) @@ -493,33 +493,33 @@ public: nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) ); m_ConvertedBuf += (S)nOp1; m_ConvertedBuf += (S)nOp2; - + } virtual bool processParams(){ return true; } virtual void end() {} // yeuch, careful here, you can only call // GetBuffer on the returned SbiBuffer once, also // you (as the caller) get to own the memory - SbiBuffer& buffer() - { + SbiBuffer& buffer() + { return m_ConvertedBuf; } static S convertBufferOffSet( BYTE* pStart, T nOp1 ) { PCodeBufferWalker< T > aBuff( pStart, nOp1); OffSetAccumulator< T, S > aVisitor; - aBuff.visitBuffer( aVisitor ); + aBuff.visitBuffer( aVisitor ); return aVisitor.offset(); } }; -UINT32 +UINT32 SbiCodeGen::calcNewOffSet( BYTE* pCode, UINT16 nOffset ) { return BufferTransformer< UINT16, UINT32 >::convertBufferOffSet( pCode, nOffset ); } -UINT16 +UINT16 SbiCodeGen::calcLegacyOffSet( BYTE* pCode, UINT32 nOffset ) { return BufferTransformer< UINT32, UINT16 >::convertBufferOffSet( pCode, nOffset ); @@ -531,7 +531,7 @@ PCodeBuffConvertor<T,S>::convert() { PCodeBufferWalker< T > aBuf( m_pStart, m_nSize ); BufferTransformer< T, S > aTrnsfrmer; - aBuf.visitBuffer( aTrnsfrmer ); + aBuf.visitBuffer( aTrnsfrmer ); m_pCnvtdBuf = (BYTE*)aTrnsfrmer.buffer().GetBuffer(); m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() ); } diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index ce76fc065af4..2c972ad6ffaf 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -116,7 +116,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed ) { // STRING*n ? if( Peek() == MUL ) - { // fixed size! + { // fixed size! Next(); SbiConstExpression aSize( this ); nSize = aSize.GetShortValue(); @@ -209,7 +209,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) Error( SbERR_NOT_IN_SUBR, eCurTok ); if( eCurTok == PUBLIC || eCurTok == GLOBAL ) { - bSwitchPool = TRUE; // im richtigen Moment auf globalen Pool schalten + bSwitchPool = TRUE; // im richtigen Moment auf globalen Pool schalten if( eCurTok == GLOBAL ) bPersistantGlobal = TRUE; } @@ -298,7 +298,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) if( !bVBASupportOn && bStatic ) { nEndOfStaticLbl = aGen.Gen( _JUMP, 0 ); - aGen.Statement(); // bei static hier nachholen + aGen.Statement(); // bei static hier nachholen } BOOL bDefined = FALSE; @@ -359,20 +359,20 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) SbiOpcode eOp2; switch ( pDef->GetScope() ) { - case SbGLOBAL: eOp2 = bPersistantGlobal ? _GLOBAL_P : _GLOBAL; + case SbGLOBAL: eOp2 = bPersistantGlobal ? _GLOBAL_P : _GLOBAL; goto global; - case SbPUBLIC: eOp2 = bPersistantGlobal ? _PUBLIC_P : _PUBLIC; + case SbPUBLIC: eOp2 = bPersistantGlobal ? _PUBLIC_P : _PUBLIC; // AB 9.7.97, #40689, kein eigener Opcode mehr if( bVBASupportOn && bStatic ) { eOp2 = _STATIC; break; } - global: aGen.BackChain( nGblChain ); + global: aGen.BackChain( nGblChain ); nGblChain = 0; bGblDefs = bNewGblDefs = TRUE; break; - default: eOp2 = _LOCAL; + default: eOp2 = _LOCAL; } UINT32 nOpnd2 = sal::static_int_cast< UINT16 >( pDef->GetType() ); if( pDef->IsWithEvents() ) @@ -380,7 +380,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) short nFixedStringLength = pDef->GetFixedStringLength(); if( nFixedStringLength >= 0 ) - nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17)); // len = all bits above 0x10000 + nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17)); // len = all bits above 0x10000 aGen.Gen( eOp2, pDef->GetId(), nOpnd2 ); } @@ -447,7 +447,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) } SbiExpression aVar( this, *pDef ); if( !TestToken( EQ ) ) - goto MyBreak; // AB 24.6.1996 (s.u.) + goto MyBreak; // AB 24.6.1996 (s.u.) SbiConstExpression aExpr( this ); if( !bDefined && aExpr.IsValid() ) { @@ -498,7 +498,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) } } if( !TestComma() ) - goto MyBreak; // AB 24.6.1996 (s.u.) + goto MyBreak; // AB 24.6.1996 (s.u.) // #27963# AB, 24.6.1996 // Einfuehrung bSwitchPool (s.o.): pPool darf beim VarDecl-Aufruf @@ -507,7 +507,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) // d.h. pPool muss immer am Schleifen-Ende zurueckgesetzt werden. // auch bei break pPool = pOldPool; - continue; // MyBreak überspingen + continue; // MyBreak überspingen MyBreak: pPool = pOldPool; break; @@ -595,7 +595,7 @@ void SbiParser::DefType( BOOL bPrivate ) pDim = NULL; pElem = VarDecl(&pDim,FALSE,FALSE); if( !pElem ) - bDone = TRUE; // Error occured + bDone = TRUE; // Error occured } if( pElem ) { @@ -727,14 +727,14 @@ void SbiParser::DefEnum( BOOL bPrivate ) pElem = VarDecl( &pDim, FALSE, TRUE ); if( !pElem ) { - bDone = TRUE; // Error occured + bDone = TRUE; // Error occured break; } else if( pDim ) { delete pDim; Error( SbERR_SYNTAX ); - bDone = TRUE; // Error occured + bDone = TRUE; // Error occured break; } @@ -764,7 +764,7 @@ void SbiParser::DefEnum( BOOL bPrivate ) if( pOld ) { Error( SbERR_VAR_DEFINED, pElem->GetName() ); - bDone = TRUE; // Error occured + bDone = TRUE; // Error occured break; } @@ -877,9 +877,9 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl ) BOOL bParamArray = FALSE; while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ ) { - if ( Peek() == BYVAL ) Next(), bByVal = TRUE; - else if ( Peek() == BYREF ) Next(), bByVal = FALSE; - else if ( Peek() == _OPTIONAL_ ) Next(), bOptional = TRUE; + if ( Peek() == BYVAL ) Next(), bByVal = TRUE; + else if ( Peek() == BYREF ) Next(), bByVal = FALSE; + else if ( Peek() == _OPTIONAL_ ) Next(), bOptional = TRUE; } if( bCompatible && Peek() == PARAMARRAY ) { @@ -933,9 +933,9 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl ) TypeDecl( *pDef ); if( eType != SbxVARIANT && pDef->GetType() != eType ) Error( SbERR_BAD_DECLARATION, aName ); -// if( pDef->GetType() == SbxOBJECT ) -// pDef->SetType( SbxVARIANT ), -// Error( SbERR_SYNTAX ); +// if( pDef->GetType() == SbxOBJECT ) +// pDef->SetType( SbxVARIANT ), +// Error( SbERR_SYNTAX ); if( pDef->GetType() == SbxVARIANT && !( bFunc || bProp ) ) pDef->SetType( SbxEMPTY ); return pDef; diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index eb6c27360959..664655e22b24 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,32 +35,32 @@ // Umsetztabelle fuer Token-Operatoren und Opcodes typedef struct { - SbiToken eTok; // Token - SbiOpcode eOp; // Opcode + SbiToken eTok; // Token + SbiOpcode eOp; // Opcode } OpTable; static OpTable aOpTable [] = { { EXPON,_EXP }, - { MUL, _MUL }, - { DIV, _DIV }, - { IDIV, _IDIV }, - { MOD, _MOD }, - { PLUS, _PLUS }, + { MUL, _MUL }, + { DIV, _DIV }, + { IDIV, _IDIV }, + { MOD, _MOD }, + { PLUS, _PLUS }, { MINUS,_MINUS }, - { EQ, _EQ }, - { NE, _NE }, - { LE, _LE }, - { GE, _GE }, - { LT, _LT }, - { GT, _GT }, - { AND, _AND }, - { OR, _OR }, - { XOR, _XOR }, - { EQV, _EQV }, - { IMP, _IMP }, - { NOT, _NOT }, - { NEG, _NEG }, - { CAT, _CAT }, + { EQ, _EQ }, + { NE, _NE }, + { LE, _LE }, + { GE, _GE }, + { LT, _LT }, + { GT, _GT }, + { AND, _AND }, + { OR, _OR }, + { XOR, _XOR }, + { EQV, _EQV }, + { IMP, _IMP }, + { NOT, _NOT }, + { NEG, _NEG }, + { CAT, _CAT }, { LIKE, _LIKE }, { IS, _IS }, { NIL, _NOP }}; @@ -72,9 +72,9 @@ void SbiExprNode::Gen( RecursiveMode eRecMode ) { switch( GetType() ) { - case SbxEMPTY: pGen->Gen( _EMPTY ); break; + case SbxEMPTY: pGen->Gen( _EMPTY ); break; case SbxINTEGER: pGen->Gen( _CONST, (short) nVal ); break; - case SbxSTRING: + case SbxSTRING: { USHORT nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, TRUE ); pGen->Gen( _SCONST, nStringId ); break; @@ -112,17 +112,17 @@ void SbiExprNode::Gen( RecursiveMode eRecMode ) // AB: 17.12.1995, Spezialbehandlung fuer WITH else if( (pWithParent_ = GetWithParent()) != NULL ) { - eOp = _ELEM; // .-Ausdruck in WITH + eOp = _ELEM; // .-Ausdruck in WITH } else { - eOp = ( aVar.pDef->GetScope() == SbRTL ) ? _RTL : + eOp = ( aVar.pDef->GetScope() == SbRTL ) ? _RTL : (aVar.pDef->IsGlobal() ? _FIND_G : _FIND); } if( eOp == _FIND ) { - + SbiProcDef* pProc = aVar.pDef->GetProcDef(); if ( pGen->GetParser()->bClassModule ) eOp = _FIND_CM; @@ -182,7 +182,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp ) nId |= 0x8000; aVar.pPar->Gen(); } - + pGen->Gen( eOp, nId, sal::static_int_cast< UINT16 >( GetType() ) ); if( aVar.pvMorePar ) @@ -209,7 +209,7 @@ void SbiExprList::Gen() pParser->aGen.Gen( _ARGC ); // AB 10.1.96: Typ-Anpassung bei DECLARE USHORT nCount = 1 /*, nParAnz = 0*/; -// SbiSymPool* pPool = NULL; +// SbiSymPool* pPool = NULL; for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ ) { pExpr->Gen(); @@ -229,17 +229,17 @@ void SbiExprList::Gen() // Spaeter, wenn Named Args bei DECLARE moeglich //for( USHORT i = 1 ; i < nParAnz ; i++ ) //{ - // SbiSymDef* pDef = pPool->Get( i ); - // const String& rName = pDef->GetName(); - // if( rName.Len() ) - // { - // if( pExpr->GetName().ICompare( rName ) - // == COMPARE_EQUAL ) - // { - // pParser->aGen.Gen( _ARGTYP, pDef->GetType() ); - // break; - // } - // } + // SbiSymDef* pDef = pPool->Get( i ); + // const String& rName = pDef->GetName(); + // if( rName.Len() ) + // { + // if( pExpr->GetName().ICompare( rName ) + // == COMPARE_EQUAL ) + // { + // pParser->aGen.Gen( _ARGTYP, pDef->GetType() ); + // break; + // } + // } //} } */ @@ -263,7 +263,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode ) { USHORT uBase = pParser->nBase; if( pParser->IsCompatible() ) - uBase |= 0x8000; // #109275 Flag compatiblity + uBase |= 0x8000; // #109275 Flag compatiblity pParser->aGen.Gen( _BASED, uBase ); pParser->aGen.Gen( _ARGV ); } diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index bfd0aea3271b..ec8ad8ae7fd3 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,8 +51,8 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode* pLeft = l; pRight = r; eTok = t; - nVal = 0; - eType = SbxVARIANT; // Nodes sind immer Variant + nVal = 0; + eType = SbxVARIANT; // Nodes sind immer Variant eNodeType = SbxNODE; bComposite= TRUE; } @@ -116,11 +116,11 @@ void SbiExprNode::BaseInit( SbiParser* p ) { pGen = &p->aGen; eTok = NIL; - pLeft = NULL; - pRight = NULL; + pLeft = NULL; + pRight = NULL; pWithParent = NULL; - bComposite = FALSE; - bError = FALSE; + bComposite = FALSE; + bError = FALSE; } SbiExprNode::~SbiExprNode() @@ -343,8 +343,8 @@ void SbiExprNode::FoldConstants() else if( nr < SbxMINLNG ) err = TRUE, nr = SbxMINLNG; ll = (long) nl; lr = (long) nr; - llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); - lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); + llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); + lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); if( err ) { pGen->GetParser()->Error( SbERR_MATH_OVERFLOW ); diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 5622f3663ab8..1c835fbf7073 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -30,7 +30,7 @@ #include "precompiled_basic.hxx" #include "sbcomp.hxx" -#include <basic/sbx.hxx> // w.g. ...IMPL_REF(...sbxvariable) +#include <basic/sbx.hxx> // w.g. ...IMPL_REF(...sbxvariable) #include "expr.hxx" /*************************************************************************** @@ -264,7 +264,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo ) && !pParser->WhiteSpace() ); if( bObj ) { - bBracket = FALSE; // Now the bracket for the first term is obsolete + bBracket = FALSE; // Now the bracket for the first term is obsolete if( eType == SbxVARIANT ) eType = SbxOBJECT; else @@ -342,7 +342,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo ) // Typcheck bei Variablen: // ist explizit im Scanner etwas anderes angegeben? // Bei Methoden ist dies OK! - if( eType != SbxVARIANT && // Variant nimmt alles + if( eType != SbxVARIANT && // Variant nimmt alles eType != pDef->GetType() && !pDef->GetProcDef() ) { @@ -518,7 +518,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf ) pRes = new SbiExprNode( pParser, pRes, eTok, Like() ); } break; - case DOT: // .with + case DOT: // .with pRes = Term(); break; case NUMBER: pParser->Next(); @@ -532,7 +532,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf ) if( nParenLevel == 0 && m_eMode == EXPRMODE_LPAREN_PENDING && pParser->Peek() == RPAREN ) { m_eMode = EXPRMODE_EMPTY_PAREN; - pRes = new SbiExprNode(); // Dummy node + pRes = new SbiExprNode(); // Dummy node pParser->Next(); break; } @@ -964,7 +964,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa { pExpr = new SbiExpression( pParser, 0, SbxEMPTY ); //if( bConst ) - // pParser->Error( SbERR_SYNTAX ), bError = TRUE; + // pParser->Error( SbERR_SYNTAX ), bError = TRUE; } // Benannte Argumente: entweder .name= oder name:= else @@ -1012,7 +1012,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa pExpr->SetByVal(); //pExpr = bConst ? new SbiConstExpression( pParser ) - // : new SbiExpression( pParser ); + // : new SbiExpression( pParser ); if( !bAssumeArrayMode ) { if( pParser->Peek() == ASSIGN ) @@ -1024,7 +1024,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa pParser->Next(); pExpr = new SbiExpression( pParser ); //if( bConst ) - // pParser->Error( SbERR_SYNTAX ), bError = TRUE; + // pParser->Error( SbERR_SYNTAX ), bError = TRUE; } pExpr->GetName() = aName; } diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 7ca4a7babdea..3c750dac00be 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -173,7 +173,7 @@ void SbiParser::LineInput() pExpr->Gen(); aGen.Gen( _LINPUT ); delete pExpr; - aGen.Gen( _CHAN0 ); // ResetChannel() nicht mehr in StepLINPUT() + aGen.Gen( _CHAN0 ); // ResetChannel() nicht mehr in StepLINPUT() } // INPUT @@ -204,7 +204,7 @@ void SbiParser::Input() else break; } delete pExpr; - aGen.Gen( _CHAN0 ); // ResetChannel() nicht mehr in StepINPUT() + aGen.Gen( _CHAN0 ); // ResetChannel() nicht mehr in StepINPUT() } // OPEN stringexpr FOR mode ACCCESS access mode AS Channel [Len=n] @@ -236,7 +236,7 @@ void SbiParser::Open() Next(); eTok = Next(); // #27964# Nur STREAM_READ,STREAM_WRITE-Flags in nMode beeinflussen - nMode &= ~(STREAM_READ | STREAM_WRITE); // loeschen + nMode &= ~(STREAM_READ | STREAM_WRITE); // loeschen if( eTok == READ ) { if( Peek() == WRITE ) diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx index 260ac341a46a..10284fb580a9 100644 --- a/basic/source/comp/loops.cxx +++ b/basic/source/comp/loops.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ void SbiParser::If() // eingefuegt werden, damit bei ELSEIF nicht erneut die Bedingung // ausgewertet wird. Die Tabelle nimmt alle Absprungstellen auf. #define JMP_TABLE_SIZE 100 - UINT32 pnJmpToEndLbl[JMP_TABLE_SIZE]; // 100 ELSEIFs zulaessig - USHORT iJmp = 0; // aktueller Tabellen-Index + UINT32 pnJmpToEndLbl[JMP_TABLE_SIZE]; // 100 ELSEIFs zulaessig + USHORT iJmp = 0; // aktueller Tabellen-Index // multiline IF nEndLbl = aGen.Gen( _JUMPF, 0 ); @@ -66,9 +66,9 @@ void SbiParser::If() while( eTok == ELSEIF ) { // #27720# Bei erfolgreichem IF/ELSEIF auf ENDIF springen - if( iJmp >= JMP_TABLE_SIZE ) + if( iJmp >= JMP_TABLE_SIZE ) { - Error( SbERR_PROG_TOO_LARGE ); bAbort = TRUE; return; + Error( SbERR_PROG_TOO_LARGE ); bAbort = TRUE; return; } pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 ); @@ -214,24 +214,24 @@ void SbiParser::For() if( bForEach ) Next(); SbiExpression aLvalue( this, SbOPERAND ); - aLvalue.Gen(); // Variable auf dem Stack + aLvalue.Gen(); // Variable auf dem Stack if( bForEach ) { TestToken( _IN_ ); SbiExpression aCollExpr( this, SbOPERAND ); - aCollExpr.Gen(); // Colletion var to for stack - TestEoln(); + aCollExpr.Gen(); // Colletion var to for stack + TestEoln(); aGen.Gen( _INITFOREACH ); } else { TestToken( EQ ); SbiExpression aStartExpr( this ); - aStartExpr.Gen(); // Startausdruck auf dem Stack + aStartExpr.Gen(); // Startausdruck auf dem Stack TestToken( TO ); SbiExpression aStopExpr( this ); - aStopExpr.Gen(); // Endausdruck auf dem Stack + aStopExpr.Gen(); // Endausdruck auf dem Stack if( Peek() == STEP ) { Next(); @@ -318,7 +318,7 @@ void SbiParser::OnGoto() do { SbiToken eTok2 = NIL; - eTok2 = Next(); // Label holen + eTok2 = Next(); // Label holen if( MayBeLabel() ) { UINT32 nOff = pProc->GetLabels().Reference( aSym ); @@ -397,7 +397,7 @@ void SbiParser::Select() Error( SbERR_SYNTAX ); SbiToken eTok2 = Peek(); if( eTok2 == IS || ( eTok2 >= EQ && eTok2 <= GE ) ) - { // CASE [IS] operator expr + { // CASE [IS] operator expr if( eTok2 == IS ) Next(); eTok2 = Peek(); @@ -412,7 +412,7 @@ void SbiParser::Select() SbxEQ + ( eTok2 - EQ ) ) ); } else - { // CASE expr | expr TO expr + { // CASE expr | expr TO expr SbiExpression aCase1( this ); aCase1.Gen(); if( Peek() == TO ) @@ -475,14 +475,14 @@ void SbiParser::On() String aString = SbiTokenizer::Symbol(eTok); if (aString.EqualsIgnoreCaseAscii("ERROR")) //if (!aString.ICompare("ERROR")) - eTok = _ERROR_; // Error kommt als SYMBOL + eTok = _ERROR_; // Error kommt als SYMBOL if( eTok != _ERROR_ && eTok != LOCAL ) OnGoto(); else { if( eTok == LOCAL ) Next(); Next (); // Kein TestToken mehr, da es sonst einen Fehler gibt - Next(); // Token nach Error holen + Next(); // Token nach Error holen if( eCurTok == GOTO ) { // ON ERROR GOTO label|0 @@ -507,7 +507,7 @@ void SbiParser::On() bError_ = true; } if( bError_ ) - Error( SbERR_LABEL_EXPECTED ); + Error( SbERR_LABEL_EXPECTED ); } else if( eCurTok == RESUME ) { diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 6d6c02ce0308..1e8e7b2cee1d 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,87 +32,87 @@ #include "sbcomp.hxx" #include <com/sun/star/script/ModuleType.hpp> -struct SbiParseStack { // "Stack" fuer Statement-Blocks - SbiParseStack* pNext; // Chain - SbiExprNode* pWithVar; // Variable fuer WITH - SbiToken eExitTok; // Exit-Token - UINT32 nChain; // JUMP-Chain +struct SbiParseStack { // "Stack" fuer Statement-Blocks + SbiParseStack* pNext; // Chain + SbiExprNode* pWithVar; // Variable fuer WITH + SbiToken eExitTok; // Exit-Token + UINT32 nChain; // JUMP-Chain }; struct SbiStatement { SbiToken eTok; - void( SbiParser::*Func )(); // Verarbeitungsroutine - BOOL bMain; // TRUE: ausserhalb SUBs OK - BOOL bSubr; // TRUE: in SUBs OK + void( SbiParser::*Func )(); // Verarbeitungsroutine + BOOL bMain; // TRUE: ausserhalb SUBs OK + BOOL bSubr; // TRUE: in SUBs OK }; -#define Y TRUE -#define N FALSE +#define Y TRUE +#define N FALSE static SbiStatement StmntTable [] = { { ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE -{ CALL, &SbiParser::Call, N, Y, }, // CALL -{ CLOSE, &SbiParser::Close, N, Y, }, // CLOSE -{ _CONST_, &SbiParser::Dim, Y, Y, }, // CONST -{ DECLARE, &SbiParser::Declare, Y, N, }, // DECLARE -{ DEFBOOL, &SbiParser::DefXXX, Y, N, }, // DEFBOOL -{ DEFCUR, &SbiParser::DefXXX, Y, N, }, // DEFCUR -{ DEFDATE, &SbiParser::DefXXX, Y, N, }, // DEFDATE -{ DEFDBL, &SbiParser::DefXXX, Y, N, }, // DEFDBL -{ DEFERR, &SbiParser::DefXXX, Y, N, }, // DEFERR -{ DEFINT, &SbiParser::DefXXX, Y, N, }, // DEFINT -{ DEFLNG, &SbiParser::DefXXX, Y, N, }, // DEFLNG -{ DEFOBJ, &SbiParser::DefXXX, Y, N, }, // DEFOBJ -{ DEFSNG, &SbiParser::DefXXX, Y, N, }, // DEFSNG -{ DEFSTR, &SbiParser::DefXXX, Y, N, }, // DEFSTR -{ DEFVAR, &SbiParser::DefXXX, Y, N, }, // DEFVAR -{ DIM, &SbiParser::Dim, Y, Y, }, // DIM -{ DO, &SbiParser::DoLoop, N, Y, }, // DO -{ ELSE, &SbiParser::NoIf, N, Y, }, // ELSE -{ ELSEIF, &SbiParser::NoIf, N, Y, }, // ELSEIF -{ ENDIF, &SbiParser::NoIf, N, Y, }, // ENDIF -{ END, &SbiParser::Stop, N, Y, }, // END -{ ENUM, &SbiParser::Enum, Y, N, }, // TYPE -{ ERASE, &SbiParser::Erase, N, Y, }, // ERASE -{ _ERROR_, &SbiParser::ErrorStmnt, N, Y, }, // ERROR -{ EXIT, &SbiParser::Exit, N, Y, }, // EXIT -{ FOR, &SbiParser::For, N, Y, }, // FOR -{ FUNCTION, &SbiParser::SubFunc, Y, N, }, // FUNCTION -{ GOSUB, &SbiParser::Goto, N, Y, }, // GOSUB -{ GLOBAL, &SbiParser::Dim, Y, N, }, // GLOBAL -{ GOTO, &SbiParser::Goto, N, Y, }, // GOTO -{ IF, &SbiParser::If, N, Y, }, // IF +{ CALL, &SbiParser::Call, N, Y, }, // CALL +{ CLOSE, &SbiParser::Close, N, Y, }, // CLOSE +{ _CONST_, &SbiParser::Dim, Y, Y, }, // CONST +{ DECLARE, &SbiParser::Declare, Y, N, }, // DECLARE +{ DEFBOOL, &SbiParser::DefXXX, Y, N, }, // DEFBOOL +{ DEFCUR, &SbiParser::DefXXX, Y, N, }, // DEFCUR +{ DEFDATE, &SbiParser::DefXXX, Y, N, }, // DEFDATE +{ DEFDBL, &SbiParser::DefXXX, Y, N, }, // DEFDBL +{ DEFERR, &SbiParser::DefXXX, Y, N, }, // DEFERR +{ DEFINT, &SbiParser::DefXXX, Y, N, }, // DEFINT +{ DEFLNG, &SbiParser::DefXXX, Y, N, }, // DEFLNG +{ DEFOBJ, &SbiParser::DefXXX, Y, N, }, // DEFOBJ +{ DEFSNG, &SbiParser::DefXXX, Y, N, }, // DEFSNG +{ DEFSTR, &SbiParser::DefXXX, Y, N, }, // DEFSTR +{ DEFVAR, &SbiParser::DefXXX, Y, N, }, // DEFVAR +{ DIM, &SbiParser::Dim, Y, Y, }, // DIM +{ DO, &SbiParser::DoLoop, N, Y, }, // DO +{ ELSE, &SbiParser::NoIf, N, Y, }, // ELSE +{ ELSEIF, &SbiParser::NoIf, N, Y, }, // ELSEIF +{ ENDIF, &SbiParser::NoIf, N, Y, }, // ENDIF +{ END, &SbiParser::Stop, N, Y, }, // END +{ ENUM, &SbiParser::Enum, Y, N, }, // TYPE +{ ERASE, &SbiParser::Erase, N, Y, }, // ERASE +{ _ERROR_, &SbiParser::ErrorStmnt, N, Y, }, // ERROR +{ EXIT, &SbiParser::Exit, N, Y, }, // EXIT +{ FOR, &SbiParser::For, N, Y, }, // FOR +{ FUNCTION, &SbiParser::SubFunc, Y, N, }, // FUNCTION +{ GOSUB, &SbiParser::Goto, N, Y, }, // GOSUB +{ GLOBAL, &SbiParser::Dim, Y, N, }, // GLOBAL +{ GOTO, &SbiParser::Goto, N, Y, }, // GOTO +{ IF, &SbiParser::If, N, Y, }, // IF { IMPLEMENTS, &SbiParser::Implements, Y, N, }, // IMPLEMENTS -{ INPUT, &SbiParser::Input, N, Y, }, // INPUT -{ LET, &SbiParser::Assign, N, Y, }, // LET -{ LINE, &SbiParser::Line, N, Y, }, // LINE, -> LINE INPUT (#i92642) -{ LINEINPUT,&SbiParser::LineInput, N, Y, }, // LINE INPUT -{ LOOP, &SbiParser::BadBlock, N, Y, }, // LOOP -{ LSET, &SbiParser::LSet, N, Y, }, // LSET -{ NAME, &SbiParser::Name, N, Y, }, // NAME -{ NEXT, &SbiParser::BadBlock, N, Y, }, // NEXT -{ ON, &SbiParser::On, N, Y, }, // ON -{ OPEN, &SbiParser::Open, N, Y, }, // OPEN -{ OPTION, &SbiParser::Option, Y, N, }, // OPTION -{ PRINT, &SbiParser::Print, N, Y, }, // PRINT -{ PRIVATE, &SbiParser::Dim, Y, N, }, // PRIVATE -{ PROPERTY, &SbiParser::SubFunc, Y, N, }, // FUNCTION -{ PUBLIC, &SbiParser::Dim, Y, N, }, // PUBLIC -{ REDIM, &SbiParser::ReDim, N, Y, }, // DIM -{ RESUME, &SbiParser::Resume, N, Y, }, // RESUME -{ RETURN, &SbiParser::Return, N, Y, }, // RETURN -{ RSET, &SbiParser::RSet, N, Y, }, // RSET -{ SELECT, &SbiParser::Select, N, Y, }, // SELECT -{ SET, &SbiParser::Set, N, Y, }, // SET -{ STATIC, &SbiParser::Static, Y, Y, }, // STATIC -{ STOP, &SbiParser::Stop, N, Y, }, // STOP -{ SUB, &SbiParser::SubFunc, Y, N, }, // SUB -{ TYPE, &SbiParser::Type, Y, N, }, // TYPE -{ UNTIL, &SbiParser::BadBlock, N, Y, }, // UNTIL -{ WHILE, &SbiParser::While, N, Y, }, // WHILE -{ WEND, &SbiParser::BadBlock, N, Y, }, // WEND -{ WITH, &SbiParser::With, N, Y, }, // WITH -{ WRITE, &SbiParser::Write, N, Y, }, // WRITE +{ INPUT, &SbiParser::Input, N, Y, }, // INPUT +{ LET, &SbiParser::Assign, N, Y, }, // LET +{ LINE, &SbiParser::Line, N, Y, }, // LINE, -> LINE INPUT (#i92642) +{ LINEINPUT,&SbiParser::LineInput, N, Y, }, // LINE INPUT +{ LOOP, &SbiParser::BadBlock, N, Y, }, // LOOP +{ LSET, &SbiParser::LSet, N, Y, }, // LSET +{ NAME, &SbiParser::Name, N, Y, }, // NAME +{ NEXT, &SbiParser::BadBlock, N, Y, }, // NEXT +{ ON, &SbiParser::On, N, Y, }, // ON +{ OPEN, &SbiParser::Open, N, Y, }, // OPEN +{ OPTION, &SbiParser::Option, Y, N, }, // OPTION +{ PRINT, &SbiParser::Print, N, Y, }, // PRINT +{ PRIVATE, &SbiParser::Dim, Y, N, }, // PRIVATE +{ PROPERTY, &SbiParser::SubFunc, Y, N, }, // FUNCTION +{ PUBLIC, &SbiParser::Dim, Y, N, }, // PUBLIC +{ REDIM, &SbiParser::ReDim, N, Y, }, // DIM +{ RESUME, &SbiParser::Resume, N, Y, }, // RESUME +{ RETURN, &SbiParser::Return, N, Y, }, // RETURN +{ RSET, &SbiParser::RSet, N, Y, }, // RSET +{ SELECT, &SbiParser::Select, N, Y, }, // SELECT +{ SET, &SbiParser::Set, N, Y, }, // SET +{ STATIC, &SbiParser::Static, Y, Y, }, // STATIC +{ STOP, &SbiParser::Stop, N, Y, }, // STOP +{ SUB, &SbiParser::SubFunc, Y, N, }, // SUB +{ TYPE, &SbiParser::Type, Y, N, }, // TYPE +{ UNTIL, &SbiParser::BadBlock, N, Y, }, // UNTIL +{ WHILE, &SbiParser::While, N, Y, }, // WHILE +{ WEND, &SbiParser::BadBlock, N, Y, }, // WEND +{ WITH, &SbiParser::With, N, Y, }, // WITH +{ WRITE, &SbiParser::Write, N, Y, }, // WRITE { NIL, NULL, N, N } }; @@ -132,21 +132,21 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) aRtlSyms( aGblStrings, SbRTL ), aGen( *pm, this, 1024 ) { - pBasic = pb; + pBasic = pb; eCurExpr = SbSYMBOL; eEndTok = NIL; pProc = NULL; pStack = NULL; pWithVar = NULL; - nBase = 0; - bText = + nBase = 0; + bText = bGblDefs = bNewGblDefs = bSingleLineIf = bExplicit = FALSE; bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS ); OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule ); - pPool = &aPublics; + pPool = &aPublics; for( short i = 0; i < 26; i++ ) eDefTypes[ i ] = SbxVARIANT; // Kein expliziter Defaulttyp @@ -241,8 +241,8 @@ void SbiParser::Exit() for( SbiParseStack* p = pStack; p; p = p->pNext ) { SbiToken eExitTok = p->eExitTok; - if( eTok == eExitTok || - (eTok == PROPERTY && (eExitTok == GET || eExitTok == LET) ) ) // #i109051 + if( eTok == eExitTok || + (eTok == PROPERTY && (eExitTok == GET || eExitTok == LET) ) ) // #i109051 { p->nChain = aGen.Gen( _JUMP, p->nChain ); return; @@ -373,7 +373,7 @@ BOOL SbiParser::Parse() // Ende des Parsings? if( eCurTok == eEndTok || - ( bVBASupportOn && // #i109075 + ( bVBASupportOn && // #i109075 (eCurTok == ENDFUNC || eCurTok == ENDPROPERTY || eCurTok == ENDSUB) && (eEndTok == ENDFUNC || eEndTok == ENDPROPERTY || eEndTok == ENDSUB) ) ) { @@ -438,7 +438,7 @@ BOOL SbiParser::Parse() // globalen Chain pflegen // AB #41606/#40689: Durch die neue static-Behandlung kann noch // ein nGblChain vorhanden sein, daher vorher abfragen - if( bNewGblDefs && nGblChain == 0 && + if( bNewGblDefs && nGblChain == 0 && ( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) ) { nGblChain = aGen.Gen( _JUMP, 0 ); @@ -622,8 +622,8 @@ void SbiParser::Set() aLvalue.Gen(); aExpr.Gen(); // Its a good idea to distinguish between - // set someting = another & - // someting = another + // set someting = another & + // someting = another // ( its necessary for vba objects where set is object // specific and also doesn't involve processing default params ) if( pDef->GetTypeId() ) @@ -711,7 +711,7 @@ void SbiParser::DefXXX() void SbiParser::Stop() { aGen.Gen( _STOP ); - Peek(); // #35694: Nur Peek(), damit EOL in Single-Line-If erkannt wird + Peek(); // #35694: Nur Peek(), damit EOL in Single-Line-If erkannt wird } // IMPLEMENTS @@ -761,7 +761,7 @@ void SbiParser::EnableCompatibility() { if( !bCompatible ) AddConstants(); - bCompatible = TRUE; + bCompatible = TRUE; } // OPTION @@ -806,7 +806,7 @@ void SbiParser::Option() break; case CLASSMODULE: - bClassModule = TRUE; + bClassModule = TRUE; aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS ); break; case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 5c0a31fc47a6..638d320da151 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -23,7 +23,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. - * + * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove @@ -44,10 +44,10 @@ #include <hash_map> // Trace Settings -static const char* GpTraceFileName = "d:\\zBasic.Asm\\BasicTrace.txt"; -static const bool GbIncludePCodes = false; -static const int GnIndentPerCallLevel = 4; -static const int GnIndentForPCode = 2; +static const char* GpTraceFileName = "d:\\zBasic.Asm\\BasicTrace.txt"; +static const bool GbIncludePCodes = false; +static const int GnIndentPerCallLevel = 4; +static const int GnIndentForPCode = 2; struct TraceTextData { @@ -57,8 +57,8 @@ struct TraceTextData typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap; typedef std::hash_map< ::rtl::OUString, PCToTextDataMap*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleTraceMap; -ModuleTraceMap GaModuleTraceMap; -ModuleTraceMap& rModuleTraceMap = GaModuleTraceMap; +ModuleTraceMap GaModuleTraceMap; +ModuleTraceMap& rModuleTraceMap = GaModuleTraceMap; static void lcl_PrepareTraceForModule( SbModule* pModule ) { @@ -165,7 +165,7 @@ String dumpMethodParameters( SbMethod* pMethod ) SbxBase::SetError( eOld ); return aStr; -} +} // Public functions void dbg_InitTrace( void ) @@ -214,7 +214,7 @@ void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl ) //nCallLvl--; //if( nCallLvl < 0 ) - // nCallLvl = 0; + // nCallLvl = 0; int nIndent = nCallLvl * GnIndentPerCallLevel; const TraceTextData& rTraceTextData = itInner->second; @@ -466,7 +466,7 @@ BOOL SbModule::Compile() /************************************************************************** * -* Syntax-Highlighting +* Syntax-Highlighting * **************************************************************************/ diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index a430ae0f7460..152f2a065224 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,25 +48,25 @@ SbiScanner::SbiScanner( const ::rtl::OUString& rBuf, StarBASIC* p ) : aBuf( rBuf { pBasic = p; pLine = NULL; - nVal = 0; + nVal = 0; eScanType = SbxVARIANT; nErrors = 0; nBufPos = 0; nCurCol1 = 0; nSavedCol1 = 0; nColLock = 0; - nLine = 0; - nCol1 = 0; - nCol2 = 0; + nLine = 0; + nCol1 = 0; + nCol2 = 0; nCol = 0; - bError = + bError = bAbort = bSpaces = bNumber = bSymbol = bUsedForHilite = - bCompatible = - bVBASupportOn = + bCompatible = + bVBASupportOn = bPrevLineExtentsComment = FALSE; bHash = bErrors = TRUE; @@ -217,9 +217,9 @@ BOOL SbiScanner::NextSym() if( BasicSimpleCharClass::isAlpha( *pLine, bCompatible ) || *pLine == '_' ) { // Wenn nach '_' nichts kommt, ist es ein Zeilenabschluss! - if( *pLine == '_' && !*(pLine+1) ) - { pLine++; - goto eoln; } + if( *pLine == '_' && !*(pLine+1) ) + { pLine++; + goto eoln; } bSymbol = TRUE; short n = nCol; for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) || ( *pLine == '_' ) ); pLine++ ) @@ -227,10 +227,10 @@ BOOL SbiScanner::NextSym() aSym = aLine.copy( n, nCol - n ); // Abschliessendes '_' durch Space ersetzen, wenn Zeilenende folgt // (sonst falsche Zeilenfortsetzung) - if( !bUsedForHilite && !*pLine && *(pLine-1) == '_' ) + if( !bUsedForHilite && !*pLine && *(pLine-1) == '_' ) { - aSym.GetBufferAccess(); // #109693 force copy if necessary - *((sal_Unicode*)(pLine-1)) = ' '; // cast wegen const + aSym.GetBufferAccess(); // #109693 force copy if necessary + *((sal_Unicode*)(pLine-1)) = ' '; // cast wegen const } // Typkennung? // Das Ausrufezeichen bitte nicht testen, wenn @@ -302,8 +302,8 @@ BOOL SbiScanner::NextSym() aSym = p; bNumber = TRUE; // Komma, Exponent mehrfach vorhanden? if( comma > 1 || exp > 1 ) - { aError = '.'; - GenError( SbERR_BAD_CHAR_IN_NUMBER ); } + { aError = '.'; + GenError( SbERR_BAD_CHAR_IN_NUMBER ); } // #57844 Lokalisierte Funktion benutzen nVal = rtl_math_uStringToDouble( buf, buf+(p-buf), '.', ',', NULL, NULL ); @@ -415,7 +415,7 @@ BOOL SbiScanner::NextSym() if( *pLine != cSep || cSep == ']' ) break; } else aError = cSep, GenError( SbERR_EXPECTED ); } - // If VBA Interop then doen't eat the [] chars + // If VBA Interop then doen't eat the [] chars if ( cSep == ']' && bVBASupportOn ) aSym = aLine.copy( n - 1, nCol - n + 1); else @@ -424,14 +424,14 @@ BOOL SbiScanner::NextSym() String s( cSep ); s += cSep; USHORT nIdx = 0; - do + do { nIdx = aSym.Search( s, nIdx ); if( nIdx == STRING_NOTFOUND ) break; aSym.Erase( nIdx, 1 ); nIdx++; - } + } while( true ); if( cSep != ']' ) eScanType = ( cSep == '#' ) ? SbxDATE : SbxSTRING; @@ -477,15 +477,15 @@ PrevLineCommentLbl: eoln: if( nCol && *--pLine == '_' ) { - pLine = NULL; + pLine = NULL; bool bRes = NextSym(); if( bVBASupportOn && aSym.GetBuffer()[0] == '.' ) { // object _ // .Method // ^^^ <- spaces is legal in MSO VBA - OSL_TRACE("*** resetting bSpaces***"); - bSpaces = FALSE; + OSL_TRACE("*** resetting bSpaces***"); + bSpaces = FALSE; } return bRes; } @@ -508,68 +508,68 @@ LetterTable::LetterTable( void ) for( int i = 0 ; i < 256 ; ++i ) IsLetterTab[i] = false; - IsLetterTab[0xC0] = true; // À , CAPITAL LETTER A WITH GRAVE ACCENT - IsLetterTab[0xC1] = true; // Á , CAPITAL LETTER A WITH ACUTE ACCENT - IsLetterTab[0xC2] = true; // Â , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT - IsLetterTab[0xC3] = true; // Ã , CAPITAL LETTER A WITH TILDE - IsLetterTab[0xC4] = true; // Ä , CAPITAL LETTER A WITH DIAERESIS - IsLetterTab[0xC5] = true; // Å , CAPITAL LETTER A WITH RING ABOVE - IsLetterTab[0xC6] = true; // Æ , CAPITAL LIGATURE AE - IsLetterTab[0xC7] = true; // Ç , CAPITAL LETTER C WITH CEDILLA - IsLetterTab[0xC8] = true; // È , CAPITAL LETTER E WITH GRAVE ACCENT - IsLetterTab[0xC9] = true; // É , CAPITAL LETTER E WITH ACUTE ACCENT - IsLetterTab[0xCA] = true; // Ê , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT - IsLetterTab[0xCB] = true; // Ë , CAPITAL LETTER E WITH DIAERESIS - IsLetterTab[0xCC] = true; // Ì , CAPITAL LETTER I WITH GRAVE ACCENT - IsLetterTab[0xCD] = true; // Í , CAPITAL LETTER I WITH ACUTE ACCENT - IsLetterTab[0xCE] = true; // Î , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT - IsLetterTab[0xCF] = true; // Ï , CAPITAL LETTER I WITH DIAERESIS - IsLetterTab[0xD0] = true; // Ð , CAPITAL LETTER ETH - IsLetterTab[0xD1] = true; // Ñ , CAPITAL LETTER N WITH TILDE - IsLetterTab[0xD2] = true; // Ò , CAPITAL LETTER O WITH GRAVE ACCENT - IsLetterTab[0xD3] = true; // Ó , CAPITAL LETTER O WITH ACUTE ACCENT - IsLetterTab[0xD4] = true; // Ô , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT - IsLetterTab[0xD5] = true; // Õ , CAPITAL LETTER O WITH TILDE - IsLetterTab[0xD6] = true; // Ö , CAPITAL LETTER O WITH DIAERESIS - IsLetterTab[0xD8] = true; // Ø , CAPITAL LETTER O WITH STROKE - IsLetterTab[0xD9] = true; // Ù , CAPITAL LETTER U WITH GRAVE ACCENT - IsLetterTab[0xDA] = true; // Ú , CAPITAL LETTER U WITH ACUTE ACCENT - IsLetterTab[0xDB] = true; // Û , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT - IsLetterTab[0xDC] = true; // Ü , CAPITAL LETTER U WITH DIAERESIS - IsLetterTab[0xDD] = true; // Ý , CAPITAL LETTER Y WITH ACUTE ACCENT - IsLetterTab[0xDE] = true; // Þ , CAPITAL LETTER THORN - IsLetterTab[0xDF] = true; // ß , SMALL LETTER SHARP S - IsLetterTab[0xE0] = true; // à , SMALL LETTER A WITH GRAVE ACCENT - IsLetterTab[0xE1] = true; // á , SMALL LETTER A WITH ACUTE ACCENT - IsLetterTab[0xE2] = true; // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT - IsLetterTab[0xE3] = true; // ã , SMALL LETTER A WITH TILDE - IsLetterTab[0xE4] = true; // ä , SMALL LETTER A WITH DIAERESIS - IsLetterTab[0xE5] = true; // å , SMALL LETTER A WITH RING ABOVE - IsLetterTab[0xE6] = true; // æ , SMALL LIGATURE AE - IsLetterTab[0xE7] = true; // ç , SMALL LETTER C WITH CEDILLA - IsLetterTab[0xE8] = true; // è , SMALL LETTER E WITH GRAVE ACCENT - IsLetterTab[0xE9] = true; // é , SMALL LETTER E WITH ACUTE ACCENT - IsLetterTab[0xEA] = true; // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT - IsLetterTab[0xEB] = true; // ë , SMALL LETTER E WITH DIAERESIS - IsLetterTab[0xEC] = true; // ì , SMALL LETTER I WITH GRAVE ACCENT - IsLetterTab[0xED] = true; // í , SMALL LETTER I WITH ACUTE ACCENT - IsLetterTab[0xEE] = true; // î , SMALL LETTER I WITH CIRCUMFLEX ACCENT - IsLetterTab[0xEF] = true; // ï , SMALL LETTER I WITH DIAERESIS - IsLetterTab[0xF0] = true; // ð , SMALL LETTER ETH - IsLetterTab[0xF1] = true; // ñ , SMALL LETTER N WITH TILDE - IsLetterTab[0xF2] = true; // ò , SMALL LETTER O WITH GRAVE ACCENT - IsLetterTab[0xF3] = true; // ó , SMALL LETTER O WITH ACUTE ACCENT - IsLetterTab[0xF4] = true; // ô , SMALL LETTER O WITH CIRCUMFLEX ACCENT - IsLetterTab[0xF5] = true; // õ , SMALL LETTER O WITH TILDE - IsLetterTab[0xF6] = true; // ö , SMALL LETTER O WITH DIAERESIS - IsLetterTab[0xF8] = true; // ø , SMALL LETTER O WITH OBLIQUE BAR - IsLetterTab[0xF9] = true; // ù , SMALL LETTER U WITH GRAVE ACCENT - IsLetterTab[0xFA] = true; // ú , SMALL LETTER U WITH ACUTE ACCENT - IsLetterTab[0xFB] = true; // û , SMALL LETTER U WITH CIRCUMFLEX ACCENT - IsLetterTab[0xFC] = true; // ü , SMALL LETTER U WITH DIAERESIS - IsLetterTab[0xFD] = true; // ý , SMALL LETTER Y WITH ACUTE ACCENT - IsLetterTab[0xFE] = true; // þ , SMALL LETTER THORN - IsLetterTab[0xFF] = true; // ÿ , SMALL LETTER Y WITH DIAERESIS + IsLetterTab[0xC0] = true; // À , CAPITAL LETTER A WITH GRAVE ACCENT + IsLetterTab[0xC1] = true; // Á , CAPITAL LETTER A WITH ACUTE ACCENT + IsLetterTab[0xC2] = true; // Â , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT + IsLetterTab[0xC3] = true; // Ã , CAPITAL LETTER A WITH TILDE + IsLetterTab[0xC4] = true; // Ä , CAPITAL LETTER A WITH DIAERESIS + IsLetterTab[0xC5] = true; // Å , CAPITAL LETTER A WITH RING ABOVE + IsLetterTab[0xC6] = true; // Æ , CAPITAL LIGATURE AE + IsLetterTab[0xC7] = true; // Ç , CAPITAL LETTER C WITH CEDILLA + IsLetterTab[0xC8] = true; // È , CAPITAL LETTER E WITH GRAVE ACCENT + IsLetterTab[0xC9] = true; // É , CAPITAL LETTER E WITH ACUTE ACCENT + IsLetterTab[0xCA] = true; // Ê , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT + IsLetterTab[0xCB] = true; // Ë , CAPITAL LETTER E WITH DIAERESIS + IsLetterTab[0xCC] = true; // Ì , CAPITAL LETTER I WITH GRAVE ACCENT + IsLetterTab[0xCD] = true; // Í , CAPITAL LETTER I WITH ACUTE ACCENT + IsLetterTab[0xCE] = true; // Î , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT + IsLetterTab[0xCF] = true; // Ï , CAPITAL LETTER I WITH DIAERESIS + IsLetterTab[0xD0] = true; // Ð , CAPITAL LETTER ETH + IsLetterTab[0xD1] = true; // Ñ , CAPITAL LETTER N WITH TILDE + IsLetterTab[0xD2] = true; // Ò , CAPITAL LETTER O WITH GRAVE ACCENT + IsLetterTab[0xD3] = true; // Ó , CAPITAL LETTER O WITH ACUTE ACCENT + IsLetterTab[0xD4] = true; // Ô , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT + IsLetterTab[0xD5] = true; // Õ , CAPITAL LETTER O WITH TILDE + IsLetterTab[0xD6] = true; // Ö , CAPITAL LETTER O WITH DIAERESIS + IsLetterTab[0xD8] = true; // Ø , CAPITAL LETTER O WITH STROKE + IsLetterTab[0xD9] = true; // Ù , CAPITAL LETTER U WITH GRAVE ACCENT + IsLetterTab[0xDA] = true; // Ú , CAPITAL LETTER U WITH ACUTE ACCENT + IsLetterTab[0xDB] = true; // Û , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT + IsLetterTab[0xDC] = true; // Ü , CAPITAL LETTER U WITH DIAERESIS + IsLetterTab[0xDD] = true; // Ý , CAPITAL LETTER Y WITH ACUTE ACCENT + IsLetterTab[0xDE] = true; // Þ , CAPITAL LETTER THORN + IsLetterTab[0xDF] = true; // ß , SMALL LETTER SHARP S + IsLetterTab[0xE0] = true; // à , SMALL LETTER A WITH GRAVE ACCENT + IsLetterTab[0xE1] = true; // á , SMALL LETTER A WITH ACUTE ACCENT + IsLetterTab[0xE2] = true; // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT + IsLetterTab[0xE3] = true; // ã , SMALL LETTER A WITH TILDE + IsLetterTab[0xE4] = true; // ä , SMALL LETTER A WITH DIAERESIS + IsLetterTab[0xE5] = true; // å , SMALL LETTER A WITH RING ABOVE + IsLetterTab[0xE6] = true; // æ , SMALL LIGATURE AE + IsLetterTab[0xE7] = true; // ç , SMALL LETTER C WITH CEDILLA + IsLetterTab[0xE8] = true; // è , SMALL LETTER E WITH GRAVE ACCENT + IsLetterTab[0xE9] = true; // é , SMALL LETTER E WITH ACUTE ACCENT + IsLetterTab[0xEA] = true; // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT + IsLetterTab[0xEB] = true; // ë , SMALL LETTER E WITH DIAERESIS + IsLetterTab[0xEC] = true; // ì , SMALL LETTER I WITH GRAVE ACCENT + IsLetterTab[0xED] = true; // í , SMALL LETTER I WITH ACUTE ACCENT + IsLetterTab[0xEE] = true; // î , SMALL LETTER I WITH CIRCUMFLEX ACCENT + IsLetterTab[0xEF] = true; // ï , SMALL LETTER I WITH DIAERESIS + IsLetterTab[0xF0] = true; // ð , SMALL LETTER ETH + IsLetterTab[0xF1] = true; // ñ , SMALL LETTER N WITH TILDE + IsLetterTab[0xF2] = true; // ò , SMALL LETTER O WITH GRAVE ACCENT + IsLetterTab[0xF3] = true; // ó , SMALL LETTER O WITH ACUTE ACCENT + IsLetterTab[0xF4] = true; // ô , SMALL LETTER O WITH CIRCUMFLEX ACCENT + IsLetterTab[0xF5] = true; // õ , SMALL LETTER O WITH TILDE + IsLetterTab[0xF6] = true; // ö , SMALL LETTER O WITH DIAERESIS + IsLetterTab[0xF8] = true; // ø , SMALL LETTER O WITH OBLIQUE BAR + IsLetterTab[0xF9] = true; // ù , SMALL LETTER U WITH GRAVE ACCENT + IsLetterTab[0xFA] = true; // ú , SMALL LETTER U WITH ACUTE ACCENT + IsLetterTab[0xFB] = true; // û , SMALL LETTER U WITH CIRCUMFLEX ACCENT + IsLetterTab[0xFC] = true; // ü , SMALL LETTER U WITH DIAERESIS + IsLetterTab[0xFD] = true; // ý , SMALL LETTER Y WITH ACUTE ACCENT + IsLetterTab[0xFE] = true; // þ , SMALL LETTER THORN + IsLetterTab[0xFF] = true; // ÿ , SMALL LETTER Y WITH DIAERESIS } bool LetterTable::isLetterUnicode( sal_Unicode c ) diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index 5778655406f8..1bfab6df05cb 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ SV_IMPL_PTRARR(SbiSymbols,SbiSymDef*) /*************************************************************************** |* -|* SbiStringPool +|* SbiStringPool |* ***************************************************************************/ @@ -101,16 +101,16 @@ short SbiStringPool::Add( double n, SbxDataType t ) /*************************************************************************** |* -|* SbiSymPool +|* SbiSymPool |* ***************************************************************************/ SbiSymPool::SbiSymPool( SbiStringPool& r, SbiSymScope s ) : rStrings( r ) { - pParser = r.GetParser(); + pParser = r.GetParser(); eScope = s; pParent = NULL; - nCur = + nCur = nProcId = 0; } @@ -144,9 +144,9 @@ SbiSymDef* SbiSymPool::AddSym( const String& rName ) { SbiSymDef* p = new SbiSymDef( rName ); p->nPos = aData.Count(); - p->nId = rStrings.Add( rName ); + p->nId = rStrings.Add( rName ); p->nProcId = nProcId; - p->pIn = this; + p->pIn = this; const SbiSymDef* q = p; aData.Insert( q, q->nPos ); return p; @@ -156,10 +156,10 @@ SbiProcDef* SbiSymPool::AddProc( const String& rName ) { SbiProcDef* p = new SbiProcDef( pParser, rName ); p->nPos = aData.Count(); - p->nId = rStrings.Add( rName ); + p->nId = rStrings.Add( rName ); // Procs sind immer global p->nProcId = 0; - p->pIn = this; + p->pIn = this; const SbiSymDef* q = p; aData.Insert( q, q->nPos ); return p; @@ -250,7 +250,7 @@ UINT32 SbiSymPool::Define( const String& rName ) { SbiSymDef* p = Find( rName ); if( p ) - { if( p->IsDefined() ) + { if( p->IsDefined() ) pParser->Error( SbERR_LABEL_DEFINED, rName ); } else @@ -282,31 +282,31 @@ void SbiSymPool::CheckRefs() /*************************************************************************** |* -|* Symbol-Definitionen +|* Symbol-Definitionen |* ***************************************************************************/ SbiSymDef::SbiSymDef( const String& rName ) : aName( rName ) { - eType = SbxEMPTY; - nDims = 0; + eType = SbxEMPTY; + nDims = 0; nTypeId = 0; nProcId = 0; - nId = 0; - nPos = 0; - nLen = 0; - nChain = 0; - bAs = - bNew = - bStatic = - bOpt = + nId = 0; + nPos = 0; + nLen = 0; + nChain = 0; + bAs = + bNew = + bStatic = + bOpt = bParamArray = bWithEvents = - bByVal = + bByVal = bChained = bGlobal = FALSE; - pIn = - pPool = NULL; + pIn = + pPool = NULL; nDefaultId = 0; nFixedStringLength = -1; } @@ -390,7 +390,7 @@ UINT32 SbiSymDef::Define() SbiSymPool& SbiSymDef::GetPool() { if( !pPool ) - pPool = new SbiSymPool( pIn->pParser->aGblStrings, SbLOCAL ); // wird gedumpt + pPool = new SbiSymPool( pIn->pParser->aGblStrings, SbLOCAL ); // wird gedumpt return *pPool; } @@ -403,8 +403,8 @@ SbiSymScope SbiSymDef::GetScope() const // Die Prozedur-Definition hat drei Pools: // 1) aParams: wird durch die Definition gefuellt. Enthaelt die Namen -// der Parameter, wie sie innerhalb des Rumpfes verwendet werden. -// Das erste Element ist der Returnwert. +// der Parameter, wie sie innerhalb des Rumpfes verwendet werden. +// Das erste Element ist der Returnwert. // 2) pPool: saemtliche lokale Variable // 3) aLabels: Labels @@ -412,17 +412,17 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName, BOOL bProcDecl ) : SbiSymDef( rName ) , aParams( pParser->aGblStrings, SbPARAM ) // wird gedumpt - , aLabels( pParser->aLclStrings, SbLOCAL ) // wird nicht gedumpt + , aLabels( pParser->aLclStrings, SbLOCAL ) // wird nicht gedumpt , mbProcDecl( bProcDecl ) { aParams.SetParent( &pParser->aPublics ); pPool = new SbiSymPool( pParser->aGblStrings, SbLOCAL ); // Locals pPool->SetParent( &aParams ); - nLine1 = - nLine2 = 0; + nLine1 = + nLine2 = 0; mePropMode = PROPERTY_MODE_NONE; bPublic = TRUE; - bCdecl = FALSE; + bCdecl = FALSE; bStatic = FALSE; // Fuer Returnwerte ist das erste Element der Parameterliste // immer mit dem Namen und dem Typ der Proc definiert @@ -483,23 +483,23 @@ void SbiProcDef::Match( SbiProcDef* pOld ) } void SbiProcDef::setPropertyMode( PropertyMode ePropMode ) -{ +{ mePropMode = ePropMode; if( mePropMode != PROPERTY_MODE_NONE ) { // Prop name = original scanned procedure name maPropName = aName; - // CompleteProcName includes "Property xxx " + // CompleteProcName includes "Property xxx " // to avoid conflicts with other symbols String aCompleteProcName; aCompleteProcName.AppendAscii( "Property " ); switch( mePropMode ) { - case PROPERTY_MODE_GET: aCompleteProcName.AppendAscii( "Get " ); break; - case PROPERTY_MODE_LET: aCompleteProcName.AppendAscii( "Let " ); break; - case PROPERTY_MODE_SET: aCompleteProcName.AppendAscii( "Set " ); break; - case PROPERTY_MODE_NONE: + case PROPERTY_MODE_GET: aCompleteProcName.AppendAscii( "Get " ); break; + case PROPERTY_MODE_LET: aCompleteProcName.AppendAscii( "Let " ); break; + case PROPERTY_MODE_SET: aCompleteProcName.AppendAscii( "Set " ); break; + case PROPERTY_MODE_NONE: DBG_ERROR( "Illegal PropertyMode PROPERTY_MODE_NONE" ); break; } diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index bd853a9bda89..b0bb3672104a 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,324 +34,324 @@ struct TokenTable { SbiToken t; const char *s; }; -static short nToken; // Anzahl der Tokens +static short nToken; // Anzahl der Tokens static TokenTable* pTokTable; -static TokenTable aTokTable_Basic [] = { // Token-Tabelle: - - { CAT, "&" }, - { MUL, "*" }, - { PLUS, "+" }, - { MINUS, "-" }, - { DIV, "/" }, - { EOS, ":" }, - { ASSIGN, ":=" }, - { LT, "<" }, - { LE, "<=" }, - { NE, "<>" }, - { EQ, "=" }, - { GT, ">" }, - { GE, ">=" }, - { ACCESS, "Access" }, - { ALIAS, "Alias" }, - { AND, "And" }, - { ANY, "Any" }, - { APPEND, "Append" }, - { AS, "As" }, +static TokenTable aTokTable_Basic [] = { // Token-Tabelle: + + { CAT, "&" }, + { MUL, "*" }, + { PLUS, "+" }, + { MINUS, "-" }, + { DIV, "/" }, + { EOS, ":" }, + { ASSIGN, ":=" }, + { LT, "<" }, + { LE, "<=" }, + { NE, "<>" }, + { EQ, "=" }, + { GT, ">" }, + { GE, ">=" }, + { ACCESS, "Access" }, + { ALIAS, "Alias" }, + { AND, "And" }, + { ANY, "Any" }, + { APPEND, "Append" }, + { AS, "As" }, { ATTRIBUTE,"Attribute" }, - { BASE, "Base" }, - { BINARY, "Binary" }, - { TBOOLEAN, "Boolean" }, - { BYREF, "ByRef", }, - { TBYTE, "Byte", }, - { BYVAL, "ByVal", }, - { CALL, "Call" }, - { CASE, "Case" }, - { _CDECL_, "Cdecl" }, + { BASE, "Base" }, + { BINARY, "Binary" }, + { TBOOLEAN, "Boolean" }, + { BYREF, "ByRef", }, + { TBYTE, "Byte", }, + { BYVAL, "ByVal", }, + { CALL, "Call" }, + { CASE, "Case" }, + { _CDECL_, "Cdecl" }, { CLASSMODULE, "ClassModule" }, - { CLOSE, "Close" }, - { COMPARE, "Compare" }, + { CLOSE, "Close" }, + { COMPARE, "Compare" }, { COMPATIBLE,"Compatible" }, - { _CONST_, "Const" }, + { _CONST_, "Const" }, { TCURRENCY,"Currency" }, - { TDATE, "Date" }, - { DECLARE, "Declare" }, - { DEFBOOL, "DefBool" }, - { DEFCUR, "DefCur" }, - { DEFDATE, "DefDate" }, - { DEFDBL, "DefDbl" }, - { DEFERR, "DefErr" }, - { DEFINT, "DefInt" }, - { DEFLNG, "DefLng" }, - { DEFOBJ, "DefObj" }, - { DEFSNG, "DefSng" }, - { DEFSTR, "DefStr" }, - { DEFVAR, "DefVar" }, - { DIM, "Dim" }, - { DO, "Do" }, - { TDOUBLE, "Double" }, - { EACH, "Each" }, - { ELSE, "Else" }, - { ELSEIF, "ElseIf" }, - { END, "End" }, - { ENDENUM, "End Enum" }, - { ENDFUNC, "End Function" }, - { ENDIF, "End If" }, + { TDATE, "Date" }, + { DECLARE, "Declare" }, + { DEFBOOL, "DefBool" }, + { DEFCUR, "DefCur" }, + { DEFDATE, "DefDate" }, + { DEFDBL, "DefDbl" }, + { DEFERR, "DefErr" }, + { DEFINT, "DefInt" }, + { DEFLNG, "DefLng" }, + { DEFOBJ, "DefObj" }, + { DEFSNG, "DefSng" }, + { DEFSTR, "DefStr" }, + { DEFVAR, "DefVar" }, + { DIM, "Dim" }, + { DO, "Do" }, + { TDOUBLE, "Double" }, + { EACH, "Each" }, + { ELSE, "Else" }, + { ELSEIF, "ElseIf" }, + { END, "End" }, + { ENDENUM, "End Enum" }, + { ENDFUNC, "End Function" }, + { ENDIF, "End If" }, { ENDPROPERTY, "End Property" }, { ENDSELECT,"End Select" }, - { ENDSUB, "End Sub" }, - { ENDTYPE, "End Type" }, - { ENDIF, "EndIf" }, - { ENUM, "Enum" }, - { EQV, "Eqv" }, - { ERASE, "Erase" }, - { _ERROR_, "Error" }, - { EXIT, "Exit" }, - { EXPLICIT, "Explicit" }, - { FOR, "For" }, - { FUNCTION, "Function" }, - { GET, "Get" }, - { GLOBAL, "Global" }, - { GOSUB, "GoSub" }, - { GOTO, "GoTo" }, - { IF, "If" }, - { IMP, "Imp" }, + { ENDSUB, "End Sub" }, + { ENDTYPE, "End Type" }, + { ENDIF, "EndIf" }, + { ENUM, "Enum" }, + { EQV, "Eqv" }, + { ERASE, "Erase" }, + { _ERROR_, "Error" }, + { EXIT, "Exit" }, + { EXPLICIT, "Explicit" }, + { FOR, "For" }, + { FUNCTION, "Function" }, + { GET, "Get" }, + { GLOBAL, "Global" }, + { GOSUB, "GoSub" }, + { GOTO, "GoTo" }, + { IF, "If" }, + { IMP, "Imp" }, { IMPLEMENTS, "Implements" }, - { _IN_, "In" }, - { INPUT, "Input" }, // auch INPUT # - { TINTEGER, "Integer" }, - { IS, "Is" }, - { LET, "Let" }, - { LIB, "Lib" }, - { LIKE, "Like" }, - { LINE, "Line" }, + { _IN_, "In" }, + { INPUT, "Input" }, // auch INPUT # + { TINTEGER, "Integer" }, + { IS, "Is" }, + { LET, "Let" }, + { LIB, "Lib" }, + { LIKE, "Like" }, + { LINE, "Line" }, { LINEINPUT,"Line Input" }, - { LOCAL, "Local" }, - { LOCK, "Lock" }, - { TLONG, "Long" }, - { LOOP, "Loop" }, - { LPRINT, "LPrint" }, + { LOCAL, "Local" }, + { LOCK, "Lock" }, + { TLONG, "Long" }, + { LOOP, "Loop" }, + { LPRINT, "LPrint" }, { LSET, "LSet" }, // JSM - { MOD, "Mod" }, - { NAME, "Name" }, - { NEW, "New" }, - { NEXT, "Next" }, - { NOT, "Not" }, - { TOBJECT, "Object" }, - { ON, "On" }, - { OPEN, "Open" }, - { OPTION, "Option" }, - { _OPTIONAL_, "Optional" }, - { OR, "Or" }, - { OUTPUT, "Output" }, - { PARAMARRAY, "ParamArray" }, + { MOD, "Mod" }, + { NAME, "Name" }, + { NEW, "New" }, + { NEXT, "Next" }, + { NOT, "Not" }, + { TOBJECT, "Object" }, + { ON, "On" }, + { OPEN, "Open" }, + { OPTION, "Option" }, + { _OPTIONAL_, "Optional" }, + { OR, "Or" }, + { OUTPUT, "Output" }, + { PARAMARRAY, "ParamArray" }, { PRESERVE, "Preserve" }, - { PRINT, "Print" }, - { PRIVATE, "Private" }, - { PROPERTY, "Property" }, - { PUBLIC, "Public" }, - { RANDOM, "Random" }, - { READ, "Read" }, - { REDIM, "ReDim" }, - { REM, "Rem" }, - { RESUME, "Resume" }, - { RETURN, "Return" }, + { PRINT, "Print" }, + { PRIVATE, "Private" }, + { PROPERTY, "Property" }, + { PUBLIC, "Public" }, + { RANDOM, "Random" }, + { READ, "Read" }, + { REDIM, "ReDim" }, + { REM, "Rem" }, + { RESUME, "Resume" }, + { RETURN, "Return" }, { RSET, "RSet" }, // JSM - { SELECT, "Select" }, - { SET, "Set" }, + { SELECT, "Select" }, + { SET, "Set" }, #ifdef SHARED #undef SHARED #define tmpSHARED #endif - { SHARED, "Shared" }, + { SHARED, "Shared" }, #ifdef tmpSHARED #define SHARED #undef tmpSHARED #endif - { TSINGLE, "Single" }, - { STATIC, "Static" }, - { STEP, "Step" }, - { STOP, "Stop" }, - { TSTRING, "String" }, - { SUB, "Sub" }, - { STOP, "System" }, - { TEXT, "Text" }, - { THEN, "Then" }, - { TO, "To", }, - { TYPE, "Type" }, - { TYPEOF, "TypeOf" }, - { UNTIL, "Until" }, - { TVARIANT, "Variant" }, - { VBASUPPORT, "VbaSupport" }, - { WEND, "Wend" }, - { WHILE, "While" }, - { WITH, "With" }, - { WITHEVENTS, "WithEvents" }, - { WRITE, "Write" }, // auch WRITE # - { XOR, "Xor" }, - { NIL, "" } + { TSINGLE, "Single" }, + { STATIC, "Static" }, + { STEP, "Step" }, + { STOP, "Stop" }, + { TSTRING, "String" }, + { SUB, "Sub" }, + { STOP, "System" }, + { TEXT, "Text" }, + { THEN, "Then" }, + { TO, "To", }, + { TYPE, "Type" }, + { TYPEOF, "TypeOf" }, + { UNTIL, "Until" }, + { TVARIANT, "Variant" }, + { VBASUPPORT, "VbaSupport" }, + { WEND, "Wend" }, + { WHILE, "While" }, + { WITH, "With" }, + { WITHEVENTS, "WithEvents" }, + { WRITE, "Write" }, // auch WRITE # + { XOR, "Xor" }, + { NIL, "" } }; /* -TokenTable aTokTable_Java [] = { // Token-Tabelle: - - { JS_LOG_NOT, "!" }, - { JS_NE, "!=" }, - { JS_MOD, "%" }, - { JS_ASS_MOD, "%=" }, - { JS_BIT_AND, "&" }, - { JS_LOG_AND, "&&" }, - { JS_ASS_AND, "&=" }, - { JS_LPAREN, "(" }, - { JS_RPAREN, ")" }, - { JS_MUL, "*" }, - { JS_ASS_MUL, "*=" }, - { JS_PLUS, "+" }, - { JS_INC, "++" }, - { JS_ASS_PLUS, "+=" }, - { JS_COMMA, "," }, - { JS_MINUS, "-" }, - { JS_DEC, "--" }, - { JS_ASS_MINUS, "-=" }, - { JS_DIV, "/" }, - { JS_ASS_DIV, "/=" }, - { JS_COND_SEL, ":" }, - { JS_LT, "<" }, - { JS_LSHIFT, "<<" }, +TokenTable aTokTable_Java [] = { // Token-Tabelle: + + { JS_LOG_NOT, "!" }, + { JS_NE, "!=" }, + { JS_MOD, "%" }, + { JS_ASS_MOD, "%=" }, + { JS_BIT_AND, "&" }, + { JS_LOG_AND, "&&" }, + { JS_ASS_AND, "&=" }, + { JS_LPAREN, "(" }, + { JS_RPAREN, ")" }, + { JS_MUL, "*" }, + { JS_ASS_MUL, "*=" }, + { JS_PLUS, "+" }, + { JS_INC, "++" }, + { JS_ASS_PLUS, "+=" }, + { JS_COMMA, "," }, + { JS_MINUS, "-" }, + { JS_DEC, "--" }, + { JS_ASS_MINUS, "-=" }, + { JS_DIV, "/" }, + { JS_ASS_DIV, "/=" }, + { JS_COND_SEL, ":" }, + { JS_LT, "<" }, + { JS_LSHIFT, "<<" }, { JS_ASS_LSHIFT,"<<=" }, - { JS_LE, "<=" }, - { JS_NE, "<>" }, + { JS_LE, "<=" }, + { JS_NE, "<>" }, { JS_ASSIGNMENT,"=" }, - { JS_EQ, "==" }, - { JS_GT, ">" }, - { JS_RSHIFT, ">>" }, + { JS_EQ, "==" }, + { JS_GT, ">" }, + { JS_RSHIFT, ">>" }, { JS_ASS_RSHIFT,">>=" }, - { JS_RSHIFT_Z, ">>>" }, + { JS_RSHIFT_Z, ">>>" }, { JS_ASS_RSHIFT_Z,">>>=" }, - { JS_GE, ">=" }, + { JS_GE, ">=" }, { JS_COND_QUEST,"?" }, - { ACCESS, "Access" }, - { ALIAS, "Alias" }, - { AND, "And" }, - { ANY, "Any" }, - { APPEND, "Append" }, - { AS, "As" }, - { BASE, "Base" }, - { BINARY, "Binary" }, - { TBOOLEAN, "Boolean" }, - { BYVAL, "ByVal", }, - { CALL, "Call" }, - { CASE, "Case" }, - { _CDECL_, "Cdecl" }, - { CLOSE, "Close" }, - { COMPARE, "Compare" }, - { _CONST_, "Const" }, + { ACCESS, "Access" }, + { ALIAS, "Alias" }, + { AND, "And" }, + { ANY, "Any" }, + { APPEND, "Append" }, + { AS, "As" }, + { BASE, "Base" }, + { BINARY, "Binary" }, + { TBOOLEAN, "Boolean" }, + { BYVAL, "ByVal", }, + { CALL, "Call" }, + { CASE, "Case" }, + { _CDECL_, "Cdecl" }, + { CLOSE, "Close" }, + { COMPARE, "Compare" }, + { _CONST_, "Const" }, { TCURRENCY,"Currency" }, - { TDATE, "Date" }, - { DECLARE, "Declare" }, - { DEFBOOL, "DefBool" }, - { DEFCUR, "DefCur" }, - { DEFDATE, "DefDate" }, - { DEFDBL, "DefDbl" }, - { DEFERR, "DefErr" }, - { DEFINT, "DefInt" }, - { DEFLNG, "DefLng" }, - { DEFOBJ, "DefObj" }, - { DEFSNG, "DefSng" }, - { DEFSTR, "DefStr" }, - { DEFVAR, "DefVar" }, - { DIM, "Dim" }, - { DO, "Do" }, - { TDOUBLE, "Double" }, - { EACH, "Each" }, - { ELSE, "Else" }, - { ELSEIF, "ElseIf" }, - { END, "End" }, - { ENDFUNC, "End Function" }, - { ENDIF, "End If" }, + { TDATE, "Date" }, + { DECLARE, "Declare" }, + { DEFBOOL, "DefBool" }, + { DEFCUR, "DefCur" }, + { DEFDATE, "DefDate" }, + { DEFDBL, "DefDbl" }, + { DEFERR, "DefErr" }, + { DEFINT, "DefInt" }, + { DEFLNG, "DefLng" }, + { DEFOBJ, "DefObj" }, + { DEFSNG, "DefSng" }, + { DEFSTR, "DefStr" }, + { DEFVAR, "DefVar" }, + { DIM, "Dim" }, + { DO, "Do" }, + { TDOUBLE, "Double" }, + { EACH, "Each" }, + { ELSE, "Else" }, + { ELSEIF, "ElseIf" }, + { END, "End" }, + { ENDFUNC, "End Function" }, + { ENDIF, "End If" }, { ENDSELECT,"End Select" }, - { ENDSUB, "End Sub" }, - { ENDTYPE, "End Type" }, - { ENDIF, "EndIf" }, - { EQV, "Eqv" }, - { ERASE, "Erase" }, - { _ERROR_, "Error" }, - { EXIT, "Exit" }, - { EXPLICIT, "Explicit" }, - { FOR, "For" }, - { FUNCTION, "Function" }, - { GLOBAL, "Global" }, - { GOSUB, "GoSub" }, - { GOTO, "GoTo" }, - { IF, "If" }, - { IMP, "Imp" }, - { _IN_, "In" }, - { INPUT, "Input" }, // auch INPUT # - { TINTEGER, "Integer" }, - { IS, "Is" }, - { LET, "Let" }, - { LIB, "Lib" }, - { LINE, "Line" }, + { ENDSUB, "End Sub" }, + { ENDTYPE, "End Type" }, + { ENDIF, "EndIf" }, + { EQV, "Eqv" }, + { ERASE, "Erase" }, + { _ERROR_, "Error" }, + { EXIT, "Exit" }, + { EXPLICIT, "Explicit" }, + { FOR, "For" }, + { FUNCTION, "Function" }, + { GLOBAL, "Global" }, + { GOSUB, "GoSub" }, + { GOTO, "GoTo" }, + { IF, "If" }, + { IMP, "Imp" }, + { _IN_, "In" }, + { INPUT, "Input" }, // auch INPUT # + { TINTEGER, "Integer" }, + { IS, "Is" }, + { LET, "Let" }, + { LIB, "Lib" }, + { LINE, "Line" }, { LINEINPUT,"Line Input" }, - { LOCAL, "Local" }, - { LOCK, "Lock" }, - { TLONG, "Long" }, - { LOOP, "Loop" }, - { LPRINT, "LPrint" }, + { LOCAL, "Local" }, + { LOCK, "Lock" }, + { TLONG, "Long" }, + { LOOP, "Loop" }, + { LPRINT, "LPrint" }, { LSET, "LSet" }, // JSM - { MOD, "Mod" }, - { NAME, "Name" }, - { NEW, "New" }, - { NEXT, "Next" }, - { NOT, "Not" }, - { TOBJECT, "Object" }, - { ON, "On" }, - { OPEN, "Open" }, - { OPTION, "Option" }, - { _OPTIONAL_, "Optional" }, - { OR, "Or" }, - { OUTPUT, "Output" }, + { MOD, "Mod" }, + { NAME, "Name" }, + { NEW, "New" }, + { NEXT, "Next" }, + { NOT, "Not" }, + { TOBJECT, "Object" }, + { ON, "On" }, + { OPEN, "Open" }, + { OPTION, "Option" }, + { _OPTIONAL_, "Optional" }, + { OR, "Or" }, + { OUTPUT, "Output" }, { PRESERVE, "Preserve" }, - { PRINT, "Print" }, - { PRIVATE, "Private" }, - { PUBLIC, "Public" }, - { RANDOM, "Random" }, - { READ, "Read" }, - { REDIM, "ReDim" }, - { REM, "Rem" }, - { RESUME, "Resume" }, - { RETURN, "Return" }, + { PRINT, "Print" }, + { PRIVATE, "Private" }, + { PUBLIC, "Public" }, + { RANDOM, "Random" }, + { READ, "Read" }, + { REDIM, "ReDim" }, + { REM, "Rem" }, + { RESUME, "Resume" }, + { RETURN, "Return" }, { RSET, "RSet" }, // JSM - { SELECT, "Select" }, - { SET, "Set" }, - { SHARED, "Shared" }, - { TSINGLE, "Single" }, - { STATIC, "Static" }, - { STEP, "Step" }, - { STOP, "Stop" }, - { TSTRING, "String" }, - { SUB, "Sub" }, - { STOP, "System" }, - { TEXT, "Text" }, - { THEN, "Then" }, - { TO, "To", }, - { TYPE, "Type" }, - { UNTIL, "Until" }, - { TVARIANT, "Variant" }, - { WEND, "Wend" }, - { WHILE, "While" }, - { WITH, "With" }, - { WRITE, "Write" }, // auch WRITE # - { XOR, "Xor" }, - { JS_LINDEX, "[" }, - { JS_RINDEX, "]" }, - { JS_BIT_XOR, "^" }, - { JS_ASS_XOR, "^=" }, - { JS_BIT_OR, "|" }, - { JS_ASS_OR, "|=" }, - { JS_LOG_OR, "||" }, - { JS_BIT_NOT, "~" }, + { SELECT, "Select" }, + { SET, "Set" }, + { SHARED, "Shared" }, + { TSINGLE, "Single" }, + { STATIC, "Static" }, + { STEP, "Step" }, + { STOP, "Stop" }, + { TSTRING, "String" }, + { SUB, "Sub" }, + { STOP, "System" }, + { TEXT, "Text" }, + { THEN, "Then" }, + { TO, "To", }, + { TYPE, "Type" }, + { UNTIL, "Until" }, + { TVARIANT, "Variant" }, + { WEND, "Wend" }, + { WHILE, "While" }, + { WITH, "With" }, + { WRITE, "Write" }, // auch WRITE # + { XOR, "Xor" }, + { JS_LINDEX, "[" }, + { JS_RINDEX, "]" }, + { JS_BIT_XOR, "^" }, + { JS_ASS_XOR, "^=" }, + { JS_BIT_OR, "|" }, + { JS_ASS_OR, "|=" }, + { JS_LOG_OR, "||" }, + { JS_BIT_NOT, "~" }, { NIL } }; */ @@ -386,7 +386,7 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb ) { pTokTable = aTokTable_Basic; //if( StarBASIC::GetGlobalLanguageMode() == SB_LANG_JAVASCRIPT ) - // pTokTable = aTokTable_Java; + // pTokTable = aTokTable_Java; TokenTable *tp; bEof = bAs = FALSE; eCurTok = NIL; @@ -580,20 +580,20 @@ special: USHORT nOldCol1 = nCol1; USHORT nOldCol2 = nCol2; String aOldSym = aSym; - SaveLine(); // pLine im Scanner sichern + SaveLine(); // pLine im Scanner sichern eCurTok = Peek(); switch( eCurTok ) { - case IF: Next(); eCurTok = ENDIF; break; + case IF: Next(); eCurTok = ENDIF; break; case SELECT: Next(); eCurTok = ENDSELECT; break; - case SUB: Next(); eCurTok = ENDSUB; break; + case SUB: Next(); eCurTok = ENDSUB; break; case FUNCTION: Next(); eCurTok = ENDFUNC; break; case PROPERTY: Next(); eCurTok = ENDPROPERTY; break; - case TYPE: Next(); eCurTok = ENDTYPE; break; - case ENUM: Next(); eCurTok = ENDENUM; break; - case WITH: Next(); eCurTok = ENDWITH; break; - default : eCurTok = END; + case TYPE: Next(); eCurTok = ENDTYPE; break; + case ENUM: Next(); eCurTok = ENDENUM; break; + case WITH: Next(); eCurTok = ENDWITH; break; + default : eCurTok = END; } nCol1 = nOldCol1; if( eCurTok == END ) @@ -604,7 +604,7 @@ special: nCol = nOldCol; nCol2 = nOldCol2; aSym = aOldSym; - RestoreLine(); // pLine im Scanner restaurieren + RestoreLine(); // pLine im Scanner restaurieren } return eCurTok; } diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx index 7a6a2092693d..e66fa80f2159 100644 --- a/basic/source/inc/buffer.hxx +++ b/basic/source/inc/buffer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,31 +34,31 @@ class SbiParser; -class SbiBuffer { // Code/Konstanten-Puffer: - SbiParser* pParser; // fuer Fehlermeldungen - char* pBuf; // Puffer-Pointer - char* pCur; // aktueller Puffer-Pointer - UINT32 nOff; // aktuelles Offset - UINT32 nSize; // aktuelle Groesse - short nInc; // Inkrement - BOOL Check( USHORT ); // Buffergroesse testen +class SbiBuffer { // Code/Konstanten-Puffer: + SbiParser* pParser; // fuer Fehlermeldungen + char* pBuf; // Puffer-Pointer + char* pCur; // aktueller Puffer-Pointer + UINT32 nOff; // aktuelles Offset + UINT32 nSize; // aktuelle Groesse + short nInc; // Inkrement + BOOL Check( USHORT ); // Buffergroesse testen public: - SbiBuffer( SbiParser*, short ); // Inkrement + SbiBuffer( SbiParser*, short ); // Inkrement ~SbiBuffer(); - void Patch( UINT32, UINT32 ); // Patchen - void Chain( UINT32 ); // Back-Chain - void Align( INT32 ); // Alignment + void Patch( UINT32, UINT32 ); // Patchen + void Chain( UINT32 ); // Back-Chain + void Align( INT32 ); // Alignment BOOL Add( const void*, USHORT );// Element anfuegen BOOL operator += (const String&);// Basic-String speichern - BOOL operator += (INT8); // Zeichen speichern - BOOL operator += (INT16); // Integer speichern - BOOL operator += (UINT8); // Zeichen speichern - BOOL operator += (UINT16); // Integer speichern - BOOL operator += (UINT32); // Integer speichern - BOOL operator += (INT32); // Integer speichern - char* GetBuffer(); // Puffer rausgeben (selbst loeschen!) + BOOL operator += (INT8); // Zeichen speichern + BOOL operator += (INT16); // Integer speichern + BOOL operator += (UINT8); // Zeichen speichern + BOOL operator += (UINT16); // Integer speichern + BOOL operator += (UINT32); // Integer speichern + BOOL operator += (INT32); // Integer speichern + char* GetBuffer(); // Puffer rausgeben (selbst loeschen!) char* GetBufferPtr(){ return pBuf; } - UINT32 GetSize() { return nOff; } + UINT32 GetSize() { return nOff; } }; #endif diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index cfafcddec8e0..3b1dd88eb7a5 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,13 +35,13 @@ class SbModule; #include "opcodes.hxx" #include "buffer.hxx" -class SbiCodeGen { // Code-Erzeugung: - SbiParser* pParser; // fuer Fehlermeldungen, Line, Column etc. - SbModule& rMod; // aktuelles Modul - SbiBuffer aCode; // Code-Puffer - short nLine, nCol; // Zeile, Spalte fuer Stmnt-Befehl - short nForLevel; // #29955 for-Schleifen-Ebene - BOOL bStmnt; // TRUE: Statement-Opcode liegt an +class SbiCodeGen { // Code-Erzeugung: + SbiParser* pParser; // fuer Fehlermeldungen, Line, Column etc. + SbModule& rMod; // aktuelles Modul + SbiBuffer aCode; // Code-Puffer + short nLine, nCol; // Zeile, Spalte fuer Stmnt-Befehl + short nForLevel; // #29955 for-Schleifen-Ebene + BOOL bStmnt; // TRUE: Statement-Opcode liegt an public: SbiCodeGen( SbModule&, SbiParser*, short ); SbiParser* GetParser() { return pParser; } @@ -50,11 +50,11 @@ public: UINT32 Gen( SbiOpcode, UINT32 ); UINT32 Gen( SbiOpcode, UINT32, UINT32 ); void Patch( UINT32 o, UINT32 v ){ aCode.Patch( o, v ); } - void BackChain( UINT32 off ) { aCode.Chain( off ); } + void BackChain( UINT32 off ) { aCode.Chain( off ); } void Statement(); - void GenStmnt(); // evtl. Statement-Opcode erzeugen + void GenStmnt(); // evtl. Statement-Opcode erzeugen UINT32 GetPC(); - UINT32 GetOffset() { return GetPC() + 1; } + UINT32 GetOffset() { return GetPC() + 1; } void Save(); // #29955 for-Schleifen-Ebene pflegen @@ -67,15 +67,15 @@ public: }; template < class T, class S > -class PCodeBuffConvertor +class PCodeBuffConvertor { - T m_nSize; // + T m_nSize; // BYTE* m_pStart; BYTE* m_pCnvtdBuf; - S m_nCnvtdSize; // + S m_nCnvtdSize; // // Disable usual copying symantics and bodgy default ctor - PCodeBuffConvertor(); + PCodeBuffConvertor(); PCodeBuffConvertor(const PCodeBuffConvertor& ); PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ); public: @@ -88,7 +88,7 @@ public: // #111897 PARAM_INFO flags start at 0x00010000 to not // conflict with DefaultId in SbxParamInfo::nUserData -#define PARAM_INFO_PARAMARRAY 0x0010000 +#define PARAM_INFO_PARAMARRAY 0x0010000 #endif diff --git a/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx index 2c39e711f993..b7904df3bf85 100644 --- a/basic/source/inc/collelem.hxx +++ b/basic/source/inc/collelem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx index 93929dab42a9..f7e463bdd2ec 100644 --- a/basic/source/inc/disas.hxx +++ b/basic/source/inc/disas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,43 +31,43 @@ #include "image.hxx" #include "opcodes.hxx" -// find a place for this limit ( also used in +// find a place for this limit ( also used in class SvStream; #define MAX_LABELS 0x2000L class SbiDisas { const SbiImage& rImg; SbModule* pMod; - char cLabels[ MAX_LABELS ]; // Bitvektor fuer Labels - UINT32 nOff; // aktuelle Position - UINT32 nPC; // Position des Opcodes - SbiOpcode eOp; // Opcode - UINT32 nOp1, nOp2; // Operanden - UINT32 nParts; // 1, 2 oder 3 - UINT32 nLine; // aktuelle Zeile - BOOL DisasLine( String& ); - BOOL Fetch(); // naechster Opcode + char cLabels[ MAX_LABELS ]; // Bitvektor fuer Labels + UINT32 nOff; // aktuelle Position + UINT32 nPC; // Position des Opcodes + SbiOpcode eOp; // Opcode + UINT32 nOp1, nOp2; // Operanden + UINT32 nParts; // 1, 2 oder 3 + UINT32 nLine; // aktuelle Zeile + BOOL DisasLine( String& ); + BOOL Fetch(); // naechster Opcode public: SbiDisas( SbModule*, const SbiImage* ); void Disas( SvStream& ); void Disas( String& ); // NICHT AUFRUFEN - void StrOp( String& ); - void Str2Op( String& ); - void ImmOp( String& ); - void OnOp( String& ); - void LblOp( String& ); - void ReturnOp( String& ); - void ResumeOp( String& ); - void PromptOp( String& ); - void CloseOp( String& ); - void CharOp( String& ); - void VarOp( String& ); - void VarDefOp( String& ); - void OffOp( String& ); - void TypeOp( String& ); - void CaseOp( String& ); - void StmntOp( String& ); - void StrmOp( String& ); + void StrOp( String& ); + void Str2Op( String& ); + void ImmOp( String& ); + void OnOp( String& ); + void LblOp( String& ); + void ReturnOp( String& ); + void ResumeOp( String& ); + void PromptOp( String& ); + void CloseOp( String& ); + void CharOp( String& ); + void VarOp( String& ); + void VarDefOp( String& ); + void OffOp( String& ); + void TypeOp( String& ); + void CaseOp( String& ); + void StmntOp( String& ); + void StrmOp( String& ); }; #endif diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 94c10ca86b2e..e779a3200fca 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,22 +47,22 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer // Methods to distinguish between different library types virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName ); virtual SfxLibrary* SAL_CALL implCreateLibraryLink - ( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL, + ( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& StorageURL, sal_Bool ReadOnly ); virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ); virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const; virtual void SAL_CALL writeLibraryElement - ( + ( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary, - const ::rtl::OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput + const ::rtl::OUString& aElementName, + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(::com::sun::star::uno::Exception); virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement - ( + ( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary, - const ::rtl::OUString& aElementName, + const ::rtl::OUString& aElementName, const ::rtl::OUString& aFile, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xElementStream ); @@ -87,7 +87,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // Resource handling - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > implCreateStringResource( class SfxDialogLibrary* pDialog ); // Methods XServiceInfo @@ -102,7 +102,7 @@ public: static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(); static ::rtl::OUString getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create - ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager ) + ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); }; @@ -114,10 +114,10 @@ typedef ::cppu::ImplHelper1 < ::com::sun::star::resource::XStringResourceSuppl class SfxDialogLibrary :public SfxLibrary ,public SfxDialogLibrary_BASE { - SfxDialogLibraryContainer* m_pParent; + SfxDialogLibraryContainer* m_pParent; ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourcePersistence> m_xStringResourcePersistence; - ::rtl::OUString m_aName; + < ::com::sun::star::resource::XStringResourcePersistence> m_xStringResourcePersistence; + ::rtl::OUString m_aName; // Provide modify state including resources virtual sal_Bool isModified( void ); @@ -152,13 +152,13 @@ public: DECLARE_XTYPEPROVIDER() // XStringResourceSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString getName( void ) { return m_aName; } - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > getStringResourcePersistence( void ) { return m_xStringResourcePersistence; diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 852978b5740f..785ee8e1514b 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,27 +47,27 @@ class SbiProcDef; typedef ::std::vector<SbiExprList*> SbiExprListVector; struct SbVar { // Variablen-Element: - SbiExprNode* pNext; // Weiteres Element (bei Strukturen) - SbiSymDef* pDef; // Symboldefinition - SbiExprList* pPar; // optionale Parameter (wird geloescht) + SbiExprNode* pNext; // Weiteres Element (bei Strukturen) + SbiSymDef* pDef; // Symboldefinition + SbiExprList* pPar; // optionale Parameter (wird geloescht) SbiExprListVector* pvMorePar; // Array of arrays foo(pPar)(avMorePar[0])(avMorePar[1])... }; struct KeywordSymbolInfo { - String m_aKeywordSymbol; - SbxDataType m_eSbxDataType; - SbiToken m_eTok; + String m_aKeywordSymbol; + SbxDataType m_eSbxDataType; + SbiToken m_eTok; }; -enum SbiExprType { // Expression-Typen: +enum SbiExprType { // Expression-Typen: SbSTDEXPR, // normaler Ausdruck SbLVALUE, // beliebiger lValue SbSYMBOL, // beliebiges zusammengesetztes Symbol - SbOPERAND // Variable/Funktion + SbOPERAND // Variable/Funktion }; -enum SbiExprMode { // Expression context: +enum SbiExprMode { // Expression context: EXPRMODE_STANDARD, // default EXPRMODE_STANDALONE, // a param1, param2 OR a( param1, param2 ) = 42 EXPRMODE_LPAREN_PENDING, // start of parameter list with bracket, special handling @@ -83,8 +83,8 @@ enum SbiNodeType { SbxSTRVAL, // aStrVal = Wert, before #i59791/#i45570: nStringId = Wert SbxVARVAL, // aVar = Wert SbxTYPEOF, // TypeOf ObjExpr Is Type - SbxNODE, // Node - SbxNEW, // new <type> expression + SbxNODE, // Node + SbxNEW, // new <type> expression SbxDUMMY }; @@ -99,20 +99,20 @@ class SbiExprNode { // Operatoren (und Operanden) friend class SbiExpression; friend class SbiConstExpression; union { - USHORT nTypeStrId; // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf + USHORT nTypeStrId; // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf double nVal; // numerischer Wert SbVar aVar; // oder Variable }; - String aStrVal; // #i59791/#i45570 Store string directly + String aStrVal; // #i59791/#i45570 Store string directly SbiExprNode* pLeft; // linker Zweig SbiExprNode* pRight; // rechter Zweig (NULL bei unaeren Ops) SbiExprNode* pWithParent; // Knoten, dessen Member this per with ist - SbiCodeGen* pGen; // Code-Generator + SbiCodeGen* pGen; // Code-Generator SbiNodeType eNodeType; // Art des Nodes SbxDataType eType; // aktueller Datentyp SbiToken eTok; // Token des Operators - BOOL bComposite; // TRUE: Zusammengesetzter Ausdruck - BOOL bError; // TRUE: Fehlerhaft + BOOL bComposite; // TRUE: Zusammengesetzter Ausdruck + BOOL bError; // TRUE: Fehlerhaft void FoldConstants(); // Constant Folding durchfuehren void CollectBits(); // Umwandeln von Zahlen in Strings BOOL IsOperand() // TRUE, wenn Operand @@ -125,15 +125,15 @@ class SbiExprNode { // Operatoren (und Operanden) BOOL IsString(); // TRUE bei Strings BOOL IsLvalue(); // TRUE, falls als Lvalue verwendbar void GenElement( SbiOpcode ); // Element - void BaseInit( SbiParser* p ); // Hilfsfunktion fuer Ctor, AB 17.12.95 + void BaseInit( SbiParser* p ); // Hilfsfunktion fuer Ctor, AB 17.12.95 public: SbiExprNode( void ); SbiExprNode( SbiParser*, double, SbxDataType ); SbiExprNode( SbiParser*, const String& ); SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL ); SbiExprNode( SbiParser*, SbiExprNode*, SbiToken, SbiExprNode* ); - SbiExprNode( SbiParser*, SbiExprNode*, USHORT ); // #120061 TypeOf - SbiExprNode( SbiParser*, USHORT ); // new <type> + SbiExprNode( SbiParser*, SbiExprNode*, USHORT ); // #120061 TypeOf + SbiExprNode( SbiParser*, USHORT ); // new <type> virtual ~SbiExprNode(); BOOL IsValid() { return BOOL( !bError ); } @@ -142,24 +142,24 @@ public: BOOL IsIntConst(); // TRUE bei Integer-Konstanten BOOL IsVariable(); // TRUE, wenn Variable - SbiExprNode* GetWithParent() { return pWithParent; } - void SetWithParent( SbiExprNode* p ) { pWithParent = p; } + SbiExprNode* GetWithParent() { return pWithParent; } + void SetWithParent( SbiExprNode* p ) { pWithParent = p; } SbxDataType GetType() { return eType; } - void SetType( SbxDataType eTp ) { eType = eTp; } + void SetType( SbxDataType eTp ) { eType = eTp; } SbiNodeType GetNodeType() { return eNodeType; } - SbiSymDef* GetVar(); // Variable (falls vorhanden) - SbiSymDef* GetRealVar(); // letzte Variable in x.y.z - SbiExprNode* GetRealNode(); // letzter Knoten in x.y.z + SbiSymDef* GetVar(); // Variable (falls vorhanden) + SbiSymDef* GetRealVar(); // letzte Variable in x.y.z + SbiExprNode* GetRealNode(); // letzter Knoten in x.y.z short GetDepth(); // Tiefe eines Baumes berechnen - const String& GetString() { return aStrVal; } - short GetNumber() { return (short)nVal; } - SbiExprList* GetParameters() { return aVar.pPar; } - SbiExprListVector* GetMoreParameters() { return aVar.pvMorePar; } + const String& GetString() { return aStrVal; } + short GetNumber() { return (short)nVal; } + SbiExprList* GetParameters() { return aVar.pPar; } + SbiExprListVector* GetMoreParameters() { return aVar.pvMorePar; } void Optimize(); // Baumabgleich - void Gen( RecursiveMode eRecMode = UNDEFINED ); // Ausgabe eines Nodes + void Gen( RecursiveMode eRecMode = UNDEFINED ); // Ausgabe eines Nodes }; class SbiExpression { // der Ausdruck: @@ -167,13 +167,13 @@ class SbiExpression { // der Ausdruck: friend class SbiParameters; friend class SbiDimList; protected: - String aArgName; // Name fuer bananntes Argument - SbiParser* pParser; // fuer Fehlermeldungen, Parsing + String aArgName; // Name fuer bananntes Argument + SbiParser* pParser; // fuer Fehlermeldungen, Parsing SbiExpression* pNext; // Link bei Parameterlisten SbiExprNode* pExpr; // Der Expression-Baum - SbiExprType eCurExpr; // Art des Ausdrucks - SbiExprMode m_eMode; // Expression context - BOOL bBased; // TRUE: einfacher DIM-Teil (+BASE) + SbiExprType eCurExpr; // Art des Ausdrucks + SbiExprMode m_eMode; // Expression context + BOOL bBased; // TRUE: einfacher DIM-Teil (+BASE) BOOL bError; // TRUE: Fehler BOOL bByVal; // TRUE: ByVal-Parameter BOOL bBracket; // TRUE: Parameter list with brackets @@ -200,8 +200,8 @@ public: SbiExpression( SbiParser*, SbiToken ); // Spezial-Expr mit Spezial-Tokens ~SbiExpression(); String& GetName() { return aArgName; } - void SetBased() { bBased = TRUE; } - BOOL IsBased() { return bBased; } + void SetBased() { bBased = TRUE; } + BOOL IsBased() { return bBased; } void SetByVal() { bByVal = TRUE; } BOOL IsByVal() { return bByVal; } BOOL IsBracket() { return bBracket; } @@ -213,10 +213,10 @@ public: const String& GetString() { return pExpr->GetString(); } SbiSymDef* GetVar() { return pExpr->GetVar(); } SbiSymDef* GetRealVar() { return pExpr->GetRealVar(); } - SbiExprNode* GetExprNode() { return pExpr; } + SbiExprNode* GetExprNode() { return pExpr; } SbxDataType GetType() { return pExpr->GetType(); } void SetType( SbxDataType eType){ pExpr->eType = eType; } - void Gen( RecursiveMode eRecMode = UNDEFINED ); // Ausgabe eines Nodes + void Gen( RecursiveMode eRecMode = UNDEFINED ); // Ausgabe eines Nodes }; class SbiConstExpression : public SbiExpression { @@ -233,10 +233,10 @@ public: // numerische Konstante class SbiExprList { // Basisklasse fuer Parameter und Dims protected: - SbiParser* pParser; // Parser + SbiParser* pParser; // Parser SbiExpression* pFirst; // Expressions short nExpr; // Anzahl Expressions - short nDim; // Anzahl Dimensionen + short nDim; // Anzahl Dimensionen BOOL bError; // TRUE: Fehler BOOL bBracket; // TRUE: Klammern public: @@ -245,9 +245,9 @@ public: BOOL IsBracket() { return bBracket; } BOOL IsValid() { return BOOL( !bError ); } short GetSize() { return nExpr; } - short GetDims() { return nDim; } + short GetDims() { return nDim; } SbiExpression* Get( short ); - BOOL Test( const SbiProcDef& ); // Parameter-Checks + BOOL Test( const SbiProcDef& ); // Parameter-Checks void Gen(); // Code-Erzeugung void addExpression( SbiExpression* pExpr ); }; diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx index 0319daf7261b..7bfb1f0dd9de 100644 --- a/basic/source/inc/filefmt.hxx +++ b/basic/source/inc/filefmt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,24 +64,24 @@ class SvStream; // Alle Datei-Offsets in Records sind relativ zum Start des Moduls! -#define B_LIBRARY 0x4C42 // BL Library Record -#define B_MODULE 0x4D42 // BM Module Record -#define B_NAME 0x4E4D // MN module name -#define B_COMMENT 0x434D // MC comment -#define B_SOURCE 0x4353 // SC source code -#define B_PCODE 0x4350 // PC p-code -#define B_OLDPUBLICS 0x7550 // Pu publics -#define B_PUBLICS 0x5550 // PU publics -#define B_POOLDIR 0x4450 // PD symbol pool directory -#define B_SYMPOOL 0x5953 // SY symbol pool -#define B_STRINGPOOL 0x5453 // ST symbol pool -#define B_LINERANGES 0x524C // LR line ranges for publics -#define B_MODEND 0x454D // ME module end -#define B_SBXOBJECTS 0x5853 // SX SBX objects - -#define EXTENDED_BINARY_MODULES +#define B_LIBRARY 0x4C42 // BL Library Record +#define B_MODULE 0x4D42 // BM Module Record +#define B_NAME 0x4E4D // MN module name +#define B_COMMENT 0x434D // MC comment +#define B_SOURCE 0x4353 // SC source code +#define B_PCODE 0x4350 // PC p-code +#define B_OLDPUBLICS 0x7550 // Pu publics +#define B_PUBLICS 0x5550 // PU publics +#define B_POOLDIR 0x4450 // PD symbol pool directory +#define B_SYMPOOL 0x5953 // SY symbol pool +#define B_STRINGPOOL 0x5453 // ST symbol pool +#define B_LINERANGES 0x524C // LR line ranges for publics +#define B_MODEND 0x454D // ME module end +#define B_SBXOBJECTS 0x5853 // SX SBX objects + +#define EXTENDED_BINARY_MODULES #ifdef EXTENDED_BINARY_MODULES -#define B_EXTSOURCE 0x5345 // ES extended source +#define B_EXTSOURCE 0x5345 // ES extended source #endif // Ein Library Record enthaelt nur Module Records diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx index 24a530ed1061..fcd1f58b573c 100644 --- a/basic/source/inc/image.hxx +++ b/basic/source/inc/image.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,72 +39,72 @@ struct SbPublicEntry; class SbiImage { - friend class SbiCodeGen; // Compiler-Klassen, die die private- + friend class SbiCodeGen; // Compiler-Klassen, die die private- - SbxArrayRef rTypes; // User defined types - SbxArrayRef rEnums; // Enum types - UINT32* pStringOff; // StringId-Offsets - sal_Unicode* pStrings; // StringPool - char* pCode; // Code-Image - char* pLegacyPCode; // Code-Image - BOOL bError; // TRUE: Fehler - USHORT nFlags; // Flags (s.u.) - short nStrings; // Anzahl Strings - UINT32 nStringSize; // Groesse des String-Puffers - UINT32 nCodeSize; // Groesse des Code-Blocks - UINT16 nLegacyCodeSize; // Groesse des Code-Blocks - UINT16 nDimBase; // OPTION BASE-Wert - rtl_TextEncoding eCharSet; // Zeichensatz fuer Strings + SbxArrayRef rTypes; // User defined types + SbxArrayRef rEnums; // Enum types + UINT32* pStringOff; // StringId-Offsets + sal_Unicode* pStrings; // StringPool + char* pCode; // Code-Image + char* pLegacyPCode; // Code-Image + BOOL bError; // TRUE: Fehler + USHORT nFlags; // Flags (s.u.) + short nStrings; // Anzahl Strings + UINT32 nStringSize; // Groesse des String-Puffers + UINT32 nCodeSize; // Groesse des Code-Blocks + UINT16 nLegacyCodeSize; // Groesse des Code-Blocks + UINT16 nDimBase; // OPTION BASE-Wert + rtl_TextEncoding eCharSet; // Zeichensatz fuer Strings // temporaere Verwaltungs-Variable: - short nStringIdx; // aktueller String-Index - UINT32 nStringOff; // aktuelle Pos im Stringpuffer + short nStringIdx; // aktueller String-Index + UINT32 nStringOff; // aktuelle Pos im Stringpuffer // Routinen fuer Compiler: - void MakeStrings( short ); // StringPool einrichten + void MakeStrings( short ); // StringPool einrichten void AddString( const String& );// String zufuegen - void AddCode( char*, UINT32 ); // Codeblock dazu + void AddCode( char*, UINT32 ); // Codeblock dazu void AddType(SbxObject *); // User-Type mit aufnehmen void AddEnum(SbxObject *); // Register enum type public: - String aName; // Makroname - ::rtl::OUString aOUSource; // Quellcode - String aComment; // Kommentar - BOOL bInit; // TRUE: Init-Code ist gelaufen - BOOL bFirstInit; // TRUE, wenn das Image das erste mal nach + String aName; // Makroname + ::rtl::OUString aOUSource; // Quellcode + String aComment; // Kommentar + BOOL bInit; // TRUE: Init-Code ist gelaufen + BOOL bFirstInit; // TRUE, wenn das Image das erste mal nach // dem Compilieren initialisiert wird. SbiImage(); ~SbiImage(); - void Clear(); // Inhalt loeschen - BOOL Load( SvStream&, UINT32& nVer ); // Loads image from stream + void Clear(); // Inhalt loeschen + BOOL Load( SvStream&, UINT32& nVer ); // Loads image from stream // nVer is set to version // of image BOOL Load( SvStream& ); BOOL Save( SvStream&, UINT32 = B_CURVERSION ); - BOOL IsError() { return bError; } + BOOL IsError() { return bError; } - const char* GetCode() const { return pCode; } - UINT32 GetCodeSize() const { return nCodeSize; } - ::rtl::OUString& GetSource32() { return aOUSource; } - USHORT GetBase() const { return nDimBase; } - String GetString( short nId ) const; + const char* GetCode() const { return pCode; } + UINT32 GetCodeSize() const { return nCodeSize; } + ::rtl::OUString& GetSource32() { return aOUSource; } + USHORT GetBase() const { return nDimBase; } + String GetString( short nId ) const; //const char* GetString( short nId ) const; const SbxObject* FindType (String aTypeName) const; - SbxArrayRef GetEnums() { return rEnums; } - - void SetFlag( USHORT n ) { nFlags |= n; } - USHORT GetFlag( USHORT n ) const { return nFlags & n; } - UINT16 CalcLegacyOffset( INT32 nOffset ); - UINT32 CalcNewOffset( INT16 nOffset ); - void ReleaseLegacyBuffer(); - BOOL ExceedsLegacyLimits(); + SbxArrayRef GetEnums() { return rEnums; } + void SetFlag( USHORT n ) { nFlags |= n; } + USHORT GetFlag( USHORT n ) const { return nFlags & n; } + UINT16 CalcLegacyOffset( INT32 nOffset ); + UINT32 CalcNewOffset( INT16 nOffset ); + void ReleaseLegacyBuffer(); + BOOL ExceedsLegacyLimits(); + }; -#define SBIMG_EXPLICIT 0x0001 // OPTION EXPLICIT ist aktiv -#define SBIMG_COMPARETEXT 0x0002 // OPTION COMPARE TEXT ist aktiv -#define SBIMG_INITCODE 0x0004 // Init-Code vorhanden -#define SBIMG_CLASSMODULE 0x0008 // OPTION ClassModule is active +#define SBIMG_EXPLICIT 0x0001 // OPTION EXPLICIT ist aktiv +#define SBIMG_COMPARETEXT 0x0002 // OPTION COMPARE TEXT ist aktiv +#define SBIMG_INITCODE 0x0004 // Init-Code vorhanden +#define SBIMG_CLASSMODULE 0x0008 // OPTION ClassModule is active #endif diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 6d04889776b7..025ef857b4c2 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,23 +40,23 @@ class SvStream; #define CHANNELS 256 #define CONSOLE 0 -#define SBSTRM_INPUT 0x0001 // Input -#define SBSTRM_OUTPUT 0x0002 // Output -#define SBSTRM_RANDOM 0x0004 // Random -#define SBSTRM_APPEND 0x0008 // Append -#define SBSTRM_BINARY 0x0010 // Binary +#define SBSTRM_INPUT 0x0001 // Input +#define SBSTRM_OUTPUT 0x0002 // Output +#define SBSTRM_RANDOM 0x0004 // Random +#define SBSTRM_APPEND 0x0008 // Append +#define SBSTRM_BINARY 0x0010 // Binary class SbiStream { - SvStream* pStrm; // der Stream - ULONG nExpandOnWriteTo; // bei Schreibzugriff, den Stream + SvStream* pStrm; // der Stream + ULONG nExpandOnWriteTo; // bei Schreibzugriff, den Stream // bis zu dieser Groesse aufblasen - ByteString aLine; // aktuelle Zeile - ULONG nLine; // aktuelle Zeilennummer - short nLen; // Pufferlaenge - short nMode; // Bits: - short nChan; // aktueller Kanal - SbError nError; // letzter Fehlercode - void MapError(); // Fehlercode mappen + ByteString aLine; // aktuelle Zeile + ULONG nLine; // aktuelle Zeilennummer + short nLen; // Pufferlaenge + short nMode; // Bits: + short nChan; // aktueller Kanal + SbError nError; // letzter Fehlercode + void MapError(); // Fehlercode mappen public: SbiStream(); @@ -67,36 +67,36 @@ public: SbError Read( char& ); SbError Write( const ByteString&, USHORT = 0 ); - bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; } - bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; } - bool IsBinary() const { return (nMode & SBSTRM_BINARY) != 0; } - bool IsSeq() const { return (nMode & SBSTRM_RANDOM) == 0; } - bool IsAppend() const { return (nMode & SBSTRM_APPEND) != 0; } - short GetBlockLen() const { return nLen; } - short GetMode() const { return nMode; } - ULONG GetLine() const { return nLine; } - void SetExpandOnWriteTo( ULONG n ) { nExpandOnWriteTo = n; } + bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; } + bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; } + bool IsBinary() const { return (nMode & SBSTRM_BINARY) != 0; } + bool IsSeq() const { return (nMode & SBSTRM_RANDOM) == 0; } + bool IsAppend() const { return (nMode & SBSTRM_APPEND) != 0; } + short GetBlockLen() const { return nLen; } + short GetMode() const { return nMode; } + ULONG GetLine() const { return nLine; } + void SetExpandOnWriteTo( ULONG n ) { nExpandOnWriteTo = n; } void ExpandFile(); - SvStream* GetStrm() { return pStrm; } + SvStream* GetStrm() { return pStrm; } }; class SbiIoSystem { SbiStream* pChan[ CHANNELS ]; - ByteString aPrompt; // Input-Prompt - ByteString aIn, aOut; // Console-Buffer - short nChan; // aktueller Kanal - SbError nError; // letzter Fehlercode - void ReadCon( ByteString& ); - void WriteCon( const ByteString& ); + ByteString aPrompt; // Input-Prompt + ByteString aIn, aOut; // Console-Buffer + short nChan; // aktueller Kanal + SbError nError; // letzter Fehlercode + void ReadCon( ByteString& ); + void WriteCon( const ByteString& ); public: SbiIoSystem(); ~SbiIoSystem(); SbError GetError(); void Shutdown(); void SetPrompt( const ByteString& r ) { aPrompt = r; } - void SetChannel( short n ) { nChan = n; } - short GetChannel() const { return nChan;} - void ResetChannel() { nChan = 0; } + void SetChannel( short n ) { nChan = n; } + short GetChannel() const { return nChan;} + void ResetChannel() { nChan = 0; } void Open( short, const ByteString&, short, short, short ); void Close(); void Read( ByteString&, short = 0 ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 2b3b65f74eca..d86ca14a93e1 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -688,15 +688,15 @@ protected: //=================================================================== class ScriptSubPackageIterator { - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > m_xMainPackage; + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > m_xMainPackage; - bool m_bIsValid; - bool m_bIsBundle; + bool m_bIsValid; + bool m_bIsBundle; com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aSubPkgSeq; - sal_Int32 m_nSubPkgCount; - sal_Int32 m_iNextSubPkg; + < com::sun::star::deployment::XPackage > > m_aSubPkgSeq; + sal_Int32 m_nSubPkgCount; + sal_Int32 m_iNextSubPkg; com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implDetectScriptPackage( const com::sun::star::uno::Reference @@ -735,36 +735,36 @@ protected: com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledScriptPackage( bool& rbPureDialogLib ); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - IteratorState m_eState; + IteratorState m_eState; com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; - bool m_bUserPackagesLoaded; + < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; + bool m_bUserPackagesLoaded; com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; - bool m_bSharedPackagesLoaded; + < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; + bool m_bSharedPackagesLoaded; com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; - bool m_bBundledPackagesLoaded; + < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; + bool m_bBundledPackagesLoaded; - int m_iUserPackage; - int m_iSharedPackage; - int m_iBundledPackage; + int m_iUserPackage; + int m_iSharedPackage; + int m_iBundledPackage; - ScriptSubPackageIterator* m_pScriptSubPackageIterator; + ScriptSubPackageIterator* m_pScriptSubPackageIterator; }; // end class ScriptExtensionIterator -} // namespace basic +} // namespace basic #endif diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx index a6ebfdc5df20..bd659bbafeb3 100644 --- a/basic/source/inc/object.hxx +++ b/basic/source/inc/object.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx index 309ff38c5564..0481051df8a8 100644 --- a/basic/source/inc/opcodes.hxx +++ b/basic/source/inc/opcodes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,10 +58,10 @@ enum SbiOpcode { _ARGV, // TOS ==> aktueller Argv _INPUT, // Input ==> TOS _LINPUT, // Line Input ==> TOS - _GET, // TOS anfassen + _GET, // TOS anfassen _SET, // Speichern Objekt TOS ==> TOS-1 - _PUT, // TOS ==> TOS-1 - _PUTC, // TOS ==> TOS-1, dann ReadOnly + _PUT, // TOS ==> TOS-1 + _PUTC, // TOS ==> TOS-1, dann ReadOnly _DIM, // DIM _REDIM, // REDIM _REDIMP, // REDIM PRESERVE @@ -70,7 +70,7 @@ enum SbiOpcode { _STOP, // Programmende _INITFOR, // FOR-Variable initialisieren _NEXT, // FOR-Variable inkrementieren - _CASE, // Anfang CASE + _CASE, // Anfang CASE _ENDCASE, // Ende CASE _STDERROR, // Standard-Fehlerbehandlung _NOERROR, // keine Fehlerbehandlung @@ -83,13 +83,13 @@ enum SbiOpcode { _RENAME, // Rename Tos+1 to Tos _PROMPT, // TOS = Prompt for Input _RESTART, // Restartpunkt definieren - _CHAN0, // I/O-Kanal 0 + _CHAN0, // I/O-Kanal 0 // Sonstiges _EMPTY, // Leeren Ausdruck auf Stack - _ERROR, // TOS = Fehlercode - _LSET, // Speichern Objekt TOS ==> TOS-1 + _ERROR, // TOS = Fehlercode + _LSET, // Speichern Objekt TOS ==> TOS-1 _RSET, // Speichern Objekt TOS ==> TOS-1 - _REDIMP_ERASE, // Copies array to be later used by REDIM PRESERVE before erasing it + _REDIMP_ERASE, // Copies array to be later used by REDIM PRESERVE before erasing it _INITFOREACH, _VBASET, // VBA-like Set _ERASE_CLEAR, // Erase array and clear variable @@ -124,45 +124,45 @@ enum SbiOpcode { // Verwaltung _SETCLASS, // Set + Klassennamen testen (+StringId) _TESTCLASS, // Check TOS class (+StringId) - _LIB, // Libnamen fuer Declare-Procs setzen (+StringId) - _BASED, // TOS wird um BASE erhoeht, BASE davor gepusht (+base) + _LIB, // Libnamen fuer Declare-Procs setzen (+StringId) + _BASED, // TOS wird um BASE erhoeht, BASE davor gepusht (+base) // Typanpassung im Argv - _ARGTYP, // Letzten Parameter in Argv konvertieren (+Typ) + _ARGTYP, // Letzten Parameter in Argv konvertieren (+Typ) _VBASETCLASS, // VBA-like Set SbOP1_END, // Alle Opcodes mit zwei Operanden - _RTL = 0x80, // Laden aus RTL (+StringID+Typ) + _RTL = 0x80, // Laden aus RTL (+StringID+Typ) SbOP2_START = _RTL, - _FIND, // Laden (+StringID+Typ) - _ELEM, // Laden Element (+StringID+Typ) - _PARAM, // Parameter (+Offset+Typ) + _FIND, // Laden (+StringID+Typ) + _ELEM, // Laden Element (+StringID+Typ) + _PARAM, // Parameter (+Offset+Typ) // Verzweigen - _CALL, // DECLARE-Methode rufen (+StringID+Typ) - _CALLC, // Cdecl-DECLARE-Methode rufen (+StringID+Typ) + _CALL, // DECLARE-Methode rufen (+StringID+Typ) + _CALLC, // Cdecl-DECLARE-Methode rufen (+StringID+Typ) _CASEIS, // Case-Test (+Test-Opcode+True-Target) // Verwaltung _STMNT, // Beginn eines Statements (+Line+Col) // E/A _OPEN, // (+SvStreamFlags+Flags) // Objekte - _LOCAL, // Lokale Variable definieren (+StringID+Typ) - _PUBLIC, // Modulglobale Variable (+StringID+Typ) - _GLOBAL, // Globale Variable definieren, public-Anweisung (+StringID+Typ) - _CREATE, // Objekt kreieren (+StringId+StringID) - _STATIC, // Statische Variabl (+StringID+Typ) JSM - _TCREATE, // User Defined Objekt kreieren - _DCREATE, // Objekt-Array kreieren (+StringId+StringID) - _GLOBAL_P, // Globale Variable definieren, die beim Neustart von Basic + _LOCAL, // Lokale Variable definieren (+StringID+Typ) + _PUBLIC, // Modulglobale Variable (+StringID+Typ) + _GLOBAL, // Globale Variable definieren, public-Anweisung (+StringID+Typ) + _CREATE, // Objekt kreieren (+StringId+StringID) + _STATIC, // Statische Variabl (+StringID+Typ) JSM + _TCREATE, // User Defined Objekt kreieren + _DCREATE, // Objekt-Array kreieren (+StringId+StringID) + _GLOBAL_P, // Globale Variable definieren, die beim Neustart von Basic // nicht ueberschrieben wird, P=PERSIST (+StringID+Typ) - _FIND_G, // Sucht globale Variable mit Spezialbehandlung wegen _GLOBAL_P - _DCREATE_REDIMP, // Objekt-Array redimensionieren (+StringId+StringID) - _FIND_CM, // Search inside a class module (CM) to enable global search in time - _PUBLIC_P, // Module global Variable (persisted between calls)(+StringID+Typ) - _FIND_STATIC, // local static var lookup (+StringID+Typ) + _FIND_G, // Sucht globale Variable mit Spezialbehandlung wegen _GLOBAL_P + _DCREATE_REDIMP, // Objekt-Array redimensionieren (+StringId+StringID) + _FIND_CM, // Search inside a class module (CM) to enable global search in time + _PUBLIC_P, // Module global Variable (persisted between calls)(+StringID+Typ) + _FIND_STATIC, // local static var lookup (+StringID+Typ) SbOP2_END diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index 3db87e49817c..0fcd794dae0d 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,108 +43,108 @@ class SbiParser : public SbiTokenizer { friend class SbiExpression; - SbiParseStack* pStack; // Block-Stack - SbiProcDef* pProc; // aktuelle Prozedur - SbiExprNode* pWithVar; // aktuelle With-Variable - SbiToken eEndTok; // das Ende-Token - UINT32 nGblChain; // Chainkette fuer globale DIMs - BOOL bGblDefs; // TRUE globale Definitionen allgemein - BOOL bNewGblDefs; // TRUE globale Definitionen vor Sub - BOOL bSingleLineIf; // TRUE einzeiliges if-Statement + SbiParseStack* pStack; // Block-Stack + SbiProcDef* pProc; // aktuelle Prozedur + SbiExprNode* pWithVar; // aktuelle With-Variable + SbiToken eEndTok; // das Ende-Token + UINT32 nGblChain; // Chainkette fuer globale DIMs + BOOL bGblDefs; // TRUE globale Definitionen allgemein + BOOL bNewGblDefs; // TRUE globale Definitionen vor Sub + BOOL bSingleLineIf; // TRUE einzeiliges if-Statement SbiSymDef* VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration void DefStatic( BOOL bPrivate ); void DefProc( BOOL bStatic, BOOL bPrivate ); // Prozedur einlesen - void DefVar( SbiOpcode eOp, BOOL bStatic ); // DIM/REDIM einlesen - void TypeDecl( SbiSymDef&, BOOL bAsNewAlreadyParsed=FALSE ); // AS-Deklaration - void OpenBlock( SbiToken, SbiExprNode* = NULL ); // Block oeffnen - void CloseBlock(); // Block aufloesen - BOOL Channel( BOOL=FALSE ); // Kanalnummer parsen - void StmntBlock( SbiToken ); // Statement-Block abarbeiten - void DefType( BOOL bPrivate ); // Parse type declaration - void DefEnum( BOOL bPrivate ); // Parse enum declaration + void DefVar( SbiOpcode eOp, BOOL bStatic ); // DIM/REDIM einlesen + void TypeDecl( SbiSymDef&, BOOL bAsNewAlreadyParsed=FALSE ); // AS-Deklaration + void OpenBlock( SbiToken, SbiExprNode* = NULL ); // Block oeffnen + void CloseBlock(); // Block aufloesen + BOOL Channel( BOOL=FALSE ); // Kanalnummer parsen + void StmntBlock( SbiToken ); // Statement-Block abarbeiten + void DefType( BOOL bPrivate ); // Parse type declaration + void DefEnum( BOOL bPrivate ); // Parse enum declaration void DefDeclare( BOOL bPrivate ); - void EnableCompatibility(); + void EnableCompatibility(); public: - SbxArrayRef rTypeArray; // das Type-Array - SbxArrayRef rEnumArray; // Enum types - SbiStringPool aGblStrings; // der String-Pool - SbiStringPool aLclStrings; // der String-Pool - SbiSymPool aGlobals; // globale Variable - SbiSymPool aPublics; // modulglobale Variable - SbiSymPool aRtlSyms; // Runtime-Library - SbiCodeGen aGen; // Code-Generator - StarBASIC* pBasic; // StarBASIC-Instanz - SbiSymPool* pPool; // aktueller Pool - SbiExprType eCurExpr; // aktueller Expr-Typ - short nBase; // OPTION BASE-Wert - BOOL bText; // OPTION COMPARE TEXT - BOOL bExplicit; // TRUE: OPTION EXPLICIT - BOOL bClassModule; // TRUE: OPTION ClassModule - StringVector aIfaceVector; // Holds all interfaces implemented by a class module + SbxArrayRef rTypeArray; // das Type-Array + SbxArrayRef rEnumArray; // Enum types + SbiStringPool aGblStrings; // der String-Pool + SbiStringPool aLclStrings; // der String-Pool + SbiSymPool aGlobals; // globale Variable + SbiSymPool aPublics; // modulglobale Variable + SbiSymPool aRtlSyms; // Runtime-Library + SbiCodeGen aGen; // Code-Generator + StarBASIC* pBasic; // StarBASIC-Instanz + SbiSymPool* pPool; // aktueller Pool + SbiExprType eCurExpr; // aktueller Expr-Typ + short nBase; // OPTION BASE-Wert + BOOL bText; // OPTION COMPARE TEXT + BOOL bExplicit; // TRUE: OPTION EXPLICIT + BOOL bClassModule; // TRUE: OPTION ClassModule + StringVector aIfaceVector; // Holds all interfaces implemented by a class module StringVector aRequiredTypes; // Types used in Dim As New <type> outside subs - SbxDataType eDefTypes[26]; // DEFxxx-Datentypen + SbxDataType eDefTypes[26]; // DEFxxx-Datentypen SbiParser( StarBASIC*, SbModule* ); - BOOL Parse(); // die Aktion - SbiExprNode* GetWithVar(); // Innerste With-Variable liefern + BOOL Parse(); // die Aktion + SbiExprNode* GetWithVar(); // Innerste With-Variable liefern // AB 31.3.1996, Symbol in Runtime-Library suchen SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType ); void AddConstants( void ); - BOOL HasGlobalCode(); // Globaler Code definiert? + BOOL HasGlobalCode(); // Globaler Code definiert? - BOOL TestToken( SbiToken ); // bestimmtes TOken? - BOOL TestSymbol( BOOL=FALSE ); // Symbol? - BOOL TestComma(); // Komma oder EOLN? - void TestEoln(); // EOLN? + BOOL TestToken( SbiToken ); // bestimmtes TOken? + BOOL TestSymbol( BOOL=FALSE ); // Symbol? + BOOL TestComma(); // Komma oder EOLN? + void TestEoln(); // EOLN? - void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL ); // Let oder Call - void ErrorStmnt(); // ERROR n - void NotImp(); // nicht implementiert - void BadBlock(); // LOOP/WEND/NEXT - void BadSyntax(); // Falsches SbiToken - void NoIf(); // ELSE/ELSE IF ohne IF - void Assign(); // LET + void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL ); // Let oder Call + void ErrorStmnt(); // ERROR n + void NotImp(); // nicht implementiert + void BadBlock(); // LOOP/WEND/NEXT + void BadSyntax(); // Falsches SbiToken + void NoIf(); // ELSE/ELSE IF ohne IF + void Assign(); // LET void Attribute(); // Attribute - void Call(); // CALL - void Close(); // CLOSE - void Declare(); // DECLARE - void DefXXX(); // DEFxxx - void Dim(); // DIM - void ReDim(); // ReDim(); - void Erase(); // ERASE - void Exit(); // EXIT - void For(); // FOR...NEXT - void Goto(); // GOTO / GOSUB - void If(); // IF - void Implements(); // IMPLEMENTS - void Input(); // INPUT, INPUT # - void Line(); // LINE -> LINE INPUT [#] (#i92642) - void LineInput(); // LINE INPUT, LINE INPUT # - void LSet(); // LSET - void Name(); // NAME .. AS .. - void On(); // ON ERROR/variable - void OnGoto(); // ON...GOTO / GOSUB - void Open(); // OPEN - void Option(); // OPTION - void Print(); // PRINT, PRINT # - void SubFunc(); // SUB / FUNCTION - void Resume(); // RESUME - void Return(); // RETURN - void RSet(); // RSET - void DoLoop(); // DO...LOOP - void Select(); // SELECT ... CASE - void Set(); // SET - void Static(); // STATIC - void Stop(); // STOP/SYSTEM - void Type(); // TYPE...AS...END TYPE - void Enum(); // TYPE...END ENUM - void While(); // WHILE/WEND - void With(); // WITH - void Write(); // WRITE + void Call(); // CALL + void Close(); // CLOSE + void Declare(); // DECLARE + void DefXXX(); // DEFxxx + void Dim(); // DIM + void ReDim(); // ReDim(); + void Erase(); // ERASE + void Exit(); // EXIT + void For(); // FOR...NEXT + void Goto(); // GOTO / GOSUB + void If(); // IF + void Implements(); // IMPLEMENTS + void Input(); // INPUT, INPUT # + void Line(); // LINE -> LINE INPUT [#] (#i92642) + void LineInput(); // LINE INPUT, LINE INPUT # + void LSet(); // LSET + void Name(); // NAME .. AS .. + void On(); // ON ERROR/variable + void OnGoto(); // ON...GOTO / GOSUB + void Open(); // OPEN + void Option(); // OPTION + void Print(); // PRINT, PRINT # + void SubFunc(); // SUB / FUNCTION + void Resume(); // RESUME + void Return(); // RETURN + void RSet(); // RSET + void DoLoop(); // DO...LOOP + void Select(); // SELECT ... CASE + void Set(); // SET + void Static(); // STATIC + void Stop(); // STOP/SYSTEM + void Type(); // TYPE...AS...END TYPE + void Enum(); // TYPE...END ENUM + void While(); // WHILE/WEND + void With(); // WITH + void Write(); // WRITE }; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 1381d082dcdd..7f88e28f99ce 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,35 +37,35 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#define NS_BEANS ::com::sun::star::beans -#define NS_LANG ::com::sun::star::lang -#define NS_UNO ::com::sun::star::uno +#define NS_BEANS ::com::sun::star::beans +#define NS_LANG ::com::sun::star::lang +#define NS_UNO ::com::sun::star::uno typedef NS_BEANS::PropertyValue* SbPropertyValuePtr; SV_DECL_PTRARR( SbPropertyValueArr_Impl, SbPropertyValuePtr, 4, 4 ) -typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySet, +typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySet, NS_BEANS::XPropertyAccess > SbPropertyValuesHelper; //========================================================================== -class SbPropertyValues: public SbPropertyValuesHelper +class SbPropertyValues: public SbPropertyValuesHelper { - SbPropertyValueArr_Impl _aPropVals; + SbPropertyValueArr_Impl _aPropVals; NS_UNO::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo; private: - INT32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const; + INT32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const; public: SbPropertyValues(); - virtual ~SbPropertyValues(); + virtual ~SbPropertyValues(); // XPropertySet - virtual NS_UNO::Reference< NS_BEANS::XPropertySetInfo > SAL_CALL + virtual NS_UNO::Reference< NS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( NS_UNO::RuntimeException ); - virtual void SAL_CALL setPropertyValue( + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const NS_UNO::Any& aValue) throw (::com::sun::star::beans::UnknownPropertyException, @@ -73,23 +73,23 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual NS_UNO::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) - throw( NS_BEANS::UnknownPropertyException, - NS_LANG::WrappedTargetException, + virtual NS_UNO::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + throw( NS_BEANS::UnknownPropertyException, + NS_LANG::WrappedTargetException, NS_UNO::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const NS_UNO::Reference< NS_BEANS::XPropertyChangeListener >& ) throw (); - virtual void SAL_CALL removePropertyChangeListener( + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const NS_UNO::Reference< NS_BEANS::XPropertyChangeListener >& ) throw (); - virtual void SAL_CALL addVetoableChangeListener( + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, const NS_UNO::Reference< NS_BEANS::XVetoableChangeListener >& ) throw (); - virtual void SAL_CALL removeVetoableChangeListener( + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, const NS_UNO::Reference< NS_BEANS::XVetoableChangeListener >& ) throw (); @@ -125,14 +125,14 @@ public: throw ( NS_UNO::RuntimeException ); }; -class SbPropertySetInfo: public SbPropertySetInfoHelper +class SbPropertySetInfo: public SbPropertySetInfoHelper { PropertySetInfoImpl aImpl; public: SbPropertySetInfo(); SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals ); - virtual ~SbPropertySetInfo(); + virtual ~SbPropertySetInfo(); // XPropertySetInfo virtual NS_UNO::Sequence< NS_BEANS::Property > SAL_CALL getProperties(void) @@ -153,11 +153,11 @@ class SbPropertyContainer: public SbPropertyContainerHelper public: SbPropertyContainer(); - virtual ~SbPropertyContainer(); + virtual ~SbPropertyContainer(); // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, - INT16 Attributes, + virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, + INT16 Attributes, const NS_UNO::Any& DefaultValue) throw( NS_BEANS::PropertyExistException, NS_BEANS::IllegalTypeException, NS_LANG::IllegalArgumentException, NS_UNO::RuntimeException ); diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index b6b0814d1e33..24af07f9c3a8 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,16 +76,16 @@ public: #endif /* _USE_UNO */ -class SbiInstance; // aktiver StarBASIC-Prozess -class SbiRuntime; // aktive StarBASIC-Prozedur-Instanz +class SbiInstance; // aktiver StarBASIC-Prozess +class SbiRuntime; // aktive StarBASIC-Prozedur-Instanz struct SbiArgvStack; // Argv stack element struct SbiGosubStack; // GOSUB stack element class SbiImage; // Code-Image class SbiIoSystem; // Dateisystem -class SbiDdeControl; // DDE-Steuerung -class SbiDllMgr; // Aufrufe in DLLs -class SvNumberFormatter; // Zeit/Datumsfunktionen +class SbiDdeControl; // DDE-Steuerung +class SbiDllMgr; // Aufrufe in DLLs +class SvNumberFormatter; // Zeit/Datumsfunktionen enum ForType { @@ -95,18 +95,18 @@ enum ForType FOR_EACH_XENUMERATION }; -struct SbiForStack { // for/next stack: - SbiForStack* pNext; // Chain - SbxVariableRef refVar; // loop variable - SbxVariableRef refEnd; // end expression / for each: Array/BasicCollection object - SbxVariableRef refInc; // increment expression +struct SbiForStack { // for/next stack: + SbiForStack* pNext; // Chain + SbxVariableRef refVar; // loop variable + SbxVariableRef refEnd; // end expression / for each: Array/BasicCollection object + SbxVariableRef refInc; // increment expression // For each support - ForType eForType; - INT32 nCurCollectionIndex; - INT32* pArrayCurIndices; - INT32* pArrayLowerBounds; - INT32* pArrayUpperBounds; + ForType eForType; + INT32 nCurCollectionIndex; + INT32* pArrayCurIndices; + INT32* pArrayLowerBounds; + INT32* pArrayUpperBounds; Reference< XEnumeration > xEnumeration; SbiForStack( void ) @@ -122,20 +122,20 @@ struct SbiForStack { // for/next stack: } }; -struct SbiGosubStack { // GOSUB-Stack: - SbiGosubStack* pNext; // Chain - const BYTE* pCode; // Return-Pointer - USHORT nStartForLvl; // #118235: For Level in moment of gosub +struct SbiGosubStack { // GOSUB-Stack: + SbiGosubStack* pNext; // Chain + const BYTE* pCode; // Return-Pointer + USHORT nStartForLvl; // #118235: For Level in moment of gosub }; #define MAXRECURSION 500 // max. 500 Rekursionen -#define Sb_ATTR_NORMAL 0x0000 -#define Sb_ATTR_HIDDEN 0x0002 -#define Sb_ATTR_SYSTEM 0x0004 -#define Sb_ATTR_VOLUME 0x0008 -#define Sb_ATTR_DIRECTORY 0x0010 -#define Sb_ATTR_ARCHIVE 0x0020 +#define Sb_ATTR_NORMAL 0x0000 +#define Sb_ATTR_HIDDEN 0x0002 +#define Sb_ATTR_SYSTEM 0x0004 +#define Sb_ATTR_VOLUME 0x0008 +#define Sb_ATTR_DIRECTORY 0x0010 +#define Sb_ATTR_ARCHIVE 0x0020 class Dir; @@ -146,12 +146,12 @@ class SbiRTLData public: #ifdef _OLD_FILE_IMPL - Dir* pDir; + Dir* pDir; #else ::osl::Directory* pDir; #endif - INT16 nDirFlags; - short nCurDirPos; + INT16 nDirFlags; + short nCurDirPos; String sFullNameToBeChecked; WildCard* pWildCard; @@ -179,53 +179,53 @@ class SbiInstance { friend class SbiRuntime; - SbiRTLData aRTLData; + SbiRTLData aRTLData; - SbiIoSystem* pIosys; // Dateisystem - SbiDdeControl* pDdeCtrl; // DDE - SbiDllMgr* pDllMgr; // DLL-Calls (DECLARE) - StarBASIC* pBasic; + SbiIoSystem* pIosys; // Dateisystem + SbiDdeControl* pDdeCtrl; // DDE + SbiDllMgr* pDllMgr; // DLL-Calls (DECLARE) + StarBASIC* pBasic; SvNumberFormatter* pNumberFormatter; LanguageType meFormatterLangType; DateFormat meFormatterDateFormat; - sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx; + sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx; - SbError nErr; // aktueller Fehlercode - String aErrorMsg; // letzte Error-Message fuer $ARG - USHORT nErl; // aktuelle Fehlerzeile - BOOL bReschedule; // Flag: TRUE = Reschedule in Hauptschleife - BOOL bCompatibility; // Flag: TRUE = VBA runtime compatibility mode + SbError nErr; // aktueller Fehlercode + String aErrorMsg; // letzte Error-Message fuer $ARG + USHORT nErl; // aktuelle Fehlerzeile + BOOL bReschedule; // Flag: TRUE = Reschedule in Hauptschleife + BOOL bCompatibility; // Flag: TRUE = VBA runtime compatibility mode ComponentVector_t ComponentVector; public: - SbiRuntime* pRun; // Call-Stack + SbiRuntime* pRun; // Call-Stack SbiInstance* pNext; // Instanzen-Chain // #31460 Neues Konzept fuer StepInto/Over/Out, // Erklaerung siehe runtime.cxx bei SbiInstance::CalcBreakCallLevel() - USHORT nCallLvl; // Call-Level (wg. Rekursion) - USHORT nBreakCallLvl; // Call-Level zum Anhalten - void CalcBreakCallLevel( USHORT nFlags ); // Gemaess Flags setzen + USHORT nCallLvl; // Call-Level (wg. Rekursion) + USHORT nBreakCallLvl; // Call-Level zum Anhalten + void CalcBreakCallLevel( USHORT nFlags ); // Gemaess Flags setzen SbiInstance( StarBASIC* ); ~SbiInstance(); - void Error( SbError ); // trappable Error - void Error( SbError, const String& rMsg ); // trappable Error mit Message + void Error( SbError ); // trappable Error + void Error( SbError, const String& rMsg ); // trappable Error mit Message void ErrorVB( sal_Int32 nVBNumber, const String& rMsg ); void setErrorVB( sal_Int32 nVBNumber, const String& rMsg ); - void FatalError( SbError ); // non-trappable Error + void FatalError( SbError ); // non-trappable Error void FatalError( SbError, const String& ); // non-trappable Error - void Abort(); // Abbruch mit aktuellem Fehlercode + void Abort(); // Abbruch mit aktuellem Fehlercode void Stop(); - SbError GetErr() { return nErr; } - String GetErrorMsg() { return aErrorMsg; } - xub_StrLen GetErl() { return nErl; } - void EnableReschedule( BOOL bEnable ) { bReschedule = bEnable; } - BOOL IsReschedule( void ) { return bReschedule; } - void EnableCompatibility( BOOL bEnable ) { bCompatibility = bEnable; } - BOOL IsCompatibility( void ) { return bCompatibility; } + SbError GetErr() { return nErr; } + String GetErrorMsg() { return aErrorMsg; } + xub_StrLen GetErl() { return nErl; } + void EnableReschedule( BOOL bEnable ) { bReschedule = bEnable; } + BOOL IsReschedule( void ) { return bReschedule; } + void EnableCompatibility( BOOL bEnable ) { bCompatibility = bEnable; } + BOOL IsCompatibility( void ) { return bCompatibility; } ComponentVector_t& getComponentVector( void ) { return ComponentVector; } @@ -250,7 +250,7 @@ public: LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL ); }; -SbiIoSystem* SbGetIoSystem(); // das aktuelle I/O-System +SbiIoSystem* SbGetIoSystem(); // das aktuelle I/O-System // Verkettbare Items, um Referenzen temporaer zu halten @@ -276,31 +276,31 @@ class SbiRuntime static pStep1 aStep1[]; // Opcode-Tabelle Gruppe 1 static pStep2 aStep2[]; // Opcode-Tabelle Gruppe 2 - StarBASIC& rBasic; // StarBASIC-Instanz - SbiInstance* pInst; // aktiver Thread - SbModule* pMod; // aktuelles Modul - SbMethod* pMeth; // Methoden-Instanz - SbiIoSystem* pIosys; // I/O-System + StarBASIC& rBasic; // StarBASIC-Instanz + SbiInstance* pInst; // aktiver Thread + SbModule* pMod; // aktuelles Modul + SbMethod* pMeth; // Methoden-Instanz + SbiIoSystem* pIosys; // I/O-System const SbiImage* pImg; // Code-Image SbxArrayRef refExprStk; // expression stack SbxArrayRef refCaseStk; // CASE expression stack SbxArrayRef refRedimpArray; // Array saved to use for REDIM PRESERVE SbxVariableRef refRedim; // Array saved to use for REDIM - SbxVariableRef xDummyVar; // Ersatz fuer nicht gefundene Variablen - SbxVariable* mpExtCaller; // Caller ( external - e.g. button name, shape, range object etc. - only in vba mode ) - SbiArgvStack* pArgvStk; // ARGV-Stack - SbiGosubStack* pGosubStk; // GOSUB stack - SbiForStack* pForStk; // FOR/NEXT-Stack - USHORT nExprLvl; // Tiefe des Expr-Stacks + SbxVariableRef xDummyVar; // Ersatz fuer nicht gefundene Variablen + SbxVariable* mpExtCaller; // Caller ( external - e.g. button name, shape, range object etc. - only in vba mode ) + SbiArgvStack* pArgvStk; // ARGV-Stack + SbiGosubStack* pGosubStk; // GOSUB stack + SbiForStack* pForStk; // FOR/NEXT-Stack + USHORT nExprLvl; // Tiefe des Expr-Stacks USHORT nGosubLvl; // Zum Vermeiden von Tot-Rekursionen - USHORT nForLvl; // #118235: Maintain for level + USHORT nForLvl; // #118235: Maintain for level const BYTE* pCode; // aktueller Code-Pointer const BYTE* pStmnt; // Beginn des lezten Statements const BYTE* pError; // Adresse des aktuellen Error-Handlers const BYTE* pRestart; // Restart-Adresse const BYTE* pErrCode; // Restart-Adresse RESUME NEXT const BYTE* pErrStmnt; // Restart-Adresse RESUMT 0 - String aLibName; // Lib-Name fuer Declare-Call + String aLibName; // Lib-Name fuer Declare-Call SbxArrayRef refParams; // aktuelle Prozedur-Parameter SbxArrayRef refLocals; // lokale Variable SbxArrayRef refArgv; // aktueller Argv @@ -312,9 +312,9 @@ class SbiRuntime BOOL bInError; // TRUE: in einem Fehler-Handler BOOL bBlocked; // TRUE: blocked by next call level, #i48868 BOOL bVBAEnabled; - USHORT nFlags; // Debugging-Flags - SbError nError; // letzter Fehler - USHORT nOps; // Opcode-Zaehler + USHORT nFlags; // Debugging-Flags + SbError nError; // letzter Fehler + USHORT nOps; // Opcode-Zaehler sal_uInt32 m_nLastTime; RefSaveItem* pRefSaveList; // #74254 Temporaere Referenzen sichern @@ -350,7 +350,7 @@ class SbiRuntime void PushVar( SbxVariable* ); // Variable push SbxVariableRef PopVar(); // Variable pop SbxVariable* GetTOS( short=0 ); // Variable vom TOS holen - void TOSMakeTemp(); // TOS in temp. Variable wandeln + void TOSMakeTemp(); // TOS in temp. Variable wandeln BOOL ClearExprStack(); // Expr-Stack freigeben void PushGosub( const BYTE* ); // GOSUB-Element push @@ -392,39 +392,39 @@ class SbiRuntime void StepOR(), StepXOR(), StepEQV(), StepIMP(); void StepNOT(), StepCAT(), StepLIKE(), StepIS(); void StepCLONE(), StepOLDBASED(), StepARGC(); - void StepARGV(), StepINPUT(), StepLINPUT(), StepSTOP(); - void StepGET(), StepSET(), StepVBASET(), StepPUT(), StepPUTC(); + void StepARGV(), StepINPUT(), StepLINPUT(), StepSTOP(); + void StepGET(), StepSET(), StepVBASET(), StepPUT(), StepPUTC(); void StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bDefaultHandling = false ); - void StepDIM(), StepREDIM(), StepREDIMP(), StepERASE(); - void StepINITFOR(), StepNEXT(), StepERROR(), StepINITFOREACH(); - void StepCASE(), StepENDCASE(), StepSTDERROR(); - void StepNOERROR(), StepCHANNEL(), StepCHANNEL0(), StepPRINT(); - void StepPRINTF(), StepWRITE(), StepRENAME(), StepPROMPT(); + void StepDIM(), StepREDIM(), StepREDIMP(), StepERASE(); + void StepINITFOR(), StepNEXT(), StepERROR(), StepINITFOREACH(); + void StepCASE(), StepENDCASE(), StepSTDERROR(); + void StepNOERROR(), StepCHANNEL(), StepCHANNEL0(), StepPRINT(); + void StepPRINTF(), StepWRITE(), StepRENAME(), StepPROMPT(); void StepRESTART(), StepEMPTY(), StepLEAVE(); - void StepLSET(), StepRSET(), StepREDIMP_ERASE(), StepERASE_CLEAR(); + void StepLSET(), StepRSET(), StepREDIMP_ERASE(), StepERASE_CLEAR(); void StepARRAYACCESS(), StepBYVAL(); // Alle Opcodes mit einem Operanden void StepLOADNC( UINT32 ), StepLOADSC( UINT32 ), StepLOADI( UINT32 ); - void StepARGN( UINT32 ), StepBASED( UINT32 ), StepPAD( UINT32 ); + void StepARGN( UINT32 ), StepBASED( UINT32 ), StepPAD( UINT32 ); void StepJUMP( UINT32 ), StepJUMPT( UINT32 ); void StepJUMPF( UINT32 ), StepONJUMP( UINT32 ); void StepGOSUB( UINT32 ), StepRETURN( UINT32 ); void StepTESTFOR( UINT32 ), StepCASETO( UINT32 ), StepERRHDL( UINT32 ); - void StepRESUME( UINT32 ), StepSETCLASS( UINT32 ), StepVBASETCLASS( UINT32 ), StepTESTCLASS( UINT32 ), StepLIB( UINT32 ); + void StepRESUME( UINT32 ), StepSETCLASS( UINT32 ), StepVBASETCLASS( UINT32 ), StepTESTCLASS( UINT32 ), StepLIB( UINT32 ); bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true ); void StepCLOSE( UINT32 ), StepPRCHAR( UINT32 ), StepARGTYP( UINT32 ); // Alle Opcodes mit zwei Operanden - void StepRTL( UINT32, UINT32 ), StepPUBLIC( UINT32, UINT32 ), StepPUBLIC_P( UINT32, UINT32 ); + void StepRTL( UINT32, UINT32 ), StepPUBLIC( UINT32, UINT32 ), StepPUBLIC_P( UINT32, UINT32 ); void StepPUBLIC_Impl( UINT32, UINT32, bool bUsedForClassModule ); void StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE ); void StepFIND( UINT32, UINT32 ), StepELEM( UINT32, UINT32 ); void StepGLOBAL( UINT32, UINT32 ), StepLOCAL( UINT32, UINT32 ); - void StepPARAM( UINT32, UINT32), StepCREATE( UINT32, UINT32 ); + void StepPARAM( UINT32, UINT32), StepCREATE( UINT32, UINT32 ); void StepCALL( UINT32, UINT32 ), StepCALLC( UINT32, UINT32 ); void StepCASEIS( UINT32, UINT32 ), StepSTMNT( UINT32, UINT32 ); SbxVariable* StepSTATIC_Impl( String& aName, SbxDataType& t ); - void StepOPEN( UINT32, UINT32 ), StepSTATIC( UINT32, UINT32 ); - void StepTCREATE(UINT32,UINT32), StepDCREATE(UINT32,UINT32); + void StepOPEN( UINT32, UINT32 ), StepSTATIC( UINT32, UINT32 ); + void StepTCREATE(UINT32,UINT32), StepDCREATE(UINT32,UINT32); void StepGLOBAL_P( UINT32, UINT32 ),StepFIND_G( UINT32, UINT32 ); void StepDCREATE_REDIMP(UINT32,UINT32), StepDCREATE_IMPL(UINT32,UINT32); void StepFIND_CM( UINT32, UINT32 ); @@ -432,23 +432,23 @@ class SbiRuntime void implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 ); public: void SetVBAEnabled( bool bEnabled ); - USHORT GetImageFlag( USHORT n ) const; - USHORT GetBase(); - xub_StrLen nLine,nCol1,nCol2; // aktuelle Zeile, Spaltenbereich + USHORT GetImageFlag( USHORT n ) const; + USHORT GetBase(); + xub_StrLen nLine,nCol1,nCol2; // aktuelle Zeile, Spaltenbereich SbiRuntime* pNext; // Stack-Chain SbiRuntime( SbModule*, SbMethod*, UINT32 ); ~SbiRuntime(); - void Error( SbError, bool bVBATranslationAlreadyDone = false ); // Fehler setzen, falls != 0 + void Error( SbError, bool bVBATranslationAlreadyDone = false ); // Fehler setzen, falls != 0 void Error( SbError, const String& ); // Fehler setzen, falls != 0 - void FatalError( SbError ); // Fehlerbehandlung=Standard, Fehler setzen + void FatalError( SbError ); // Fehlerbehandlung=Standard, Fehler setzen void FatalError( SbError, const String& ); // Fehlerbehandlung=Standard, Fehler setzen static sal_Int32 translateErrorToVba( SbError nError, String& rMsg ); void DumpPCode(); BOOL Step(); // Einzelschritt (ein Opcode) - void Stop() { bRun = FALSE; } + void Stop() { bRun = FALSE; } BOOL IsRun() { return bRun; } - void block( void ) { bBlocked = TRUE; } + void block( void ) { bBlocked = TRUE; } void unblock( void ) { bBlocked = FALSE; } SbMethod* GetMethod() { return pMeth; } SbModule* GetModule() { return pMod; } diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx index 2918e67880f0..f1cb29a4bc03 100644 --- a/basic/source/inc/sbcomp.hxx +++ b/basic/source/inc/sbcomp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ // das folgende habe ich der neuen Datei von MD entnommen! (MT) #include "sbintern.hxx" -#include "token.hxx" // Tokenizer -#include "symtbl.hxx" // Symbolverwaltung -#include "parser.hxx" // Parser -#include "codegen.hxx" // Code-Generator +#include "token.hxx" // Tokenizer +#include "symtbl.hxx" // Symbolverwaltung +#include "parser.hxx" // Parser +#include "codegen.hxx" // Code-Generator #endif diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 7003b5a0a1bb..6c00a999c1c0 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include "sb.hxx" namespace utl -{ +{ class TransliterationWrapper; } class SbUnoFactory; @@ -55,11 +55,11 @@ typedef ::std::vector< String > StringVector; struct SbClassData { - SbxArrayRef mxIfaces; + SbxArrayRef mxIfaces; // types this module depends on because of use in Dim As New <type> // needed for initialization order of class modules - StringVector maRequiredTypes; + StringVector maRequiredTypes; SbClassData( void ); ~SbClassData( void ) @@ -71,7 +71,7 @@ struct SbClassData // Implementation: sb.cxx class SbClassFactory : public SbxFactory { - SbxObjectRef xClassModules; + SbxObjectRef xClassModules; public: SbClassFactory( void ); @@ -103,31 +103,31 @@ SV_DECL_PTRARR_DEL(SbErrorStack, SbErrorStackEntry*, 1, 1) struct SbiGlobals { - SbiInstance* pInst; // alle aktiven Runtime-Instanzen - SbiFactory* pSbFac; // StarBASIC-Factory - SbUnoFactory* pUnoFac; // Factory fuer Uno-Structs bei DIM AS NEW - SbTypeFactory* pTypeFac; // Factory for user defined types - SbClassFactory* pClassFac; // Factory for user defined classes (based on class modules) - SbOLEFactory* pOLEFac; // Factory for OLE types - SbFormFactory* pFormFac; // Factory for user forms - SbModule* pMod; // aktuell aktives Modul - SbModule* pCompMod; // aktuell compiliertes Modul - short nInst; // Anzahl BASICs - Link aErrHdl; // globaler Error-Handler - Link aBreakHdl; // globaler Break-Handler - SbError nCode; // aktueller Fehlercode - xub_StrLen nLine; // aktuelle Zeile - xub_StrLen nCol1,nCol2; // aktuelle Spalten (von,bis) - BOOL bCompiler; // Flag fuer Compiler-Error - BOOL bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf - BOOL bRunInit; // TRUE, wenn RunInit vom Basic aktiv ist - String aErrMsg; // Puffer fuer GetErrorText() - SbLanguageMode eLanguageMode; // Flag fuer Visual-Basic-Script-Modus - SbErrorStack* pErrStack; // Stack fuer die im Fehlerfall abgebaute SbiRuntime Kette + SbiInstance* pInst; // alle aktiven Runtime-Instanzen + SbiFactory* pSbFac; // StarBASIC-Factory + SbUnoFactory* pUnoFac; // Factory fuer Uno-Structs bei DIM AS NEW + SbTypeFactory* pTypeFac; // Factory for user defined types + SbClassFactory* pClassFac; // Factory for user defined classes (based on class modules) + SbOLEFactory* pOLEFac; // Factory for OLE types + SbFormFactory* pFormFac; // Factory for user forms + SbModule* pMod; // aktuell aktives Modul + SbModule* pCompMod; // aktuell compiliertes Modul + short nInst; // Anzahl BASICs + Link aErrHdl; // globaler Error-Handler + Link aBreakHdl; // globaler Break-Handler + SbError nCode; // aktueller Fehlercode + xub_StrLen nLine; // aktuelle Zeile + xub_StrLen nCol1,nCol2; // aktuelle Spalten (von,bis) + BOOL bCompiler; // Flag fuer Compiler-Error + BOOL bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf + BOOL bRunInit; // TRUE, wenn RunInit vom Basic aktiv ist + String aErrMsg; // Puffer fuer GetErrorText() + SbLanguageMode eLanguageMode; // Flag fuer Visual-Basic-Script-Modus + SbErrorStack* pErrStack; // Stack fuer die im Fehlerfall abgebaute SbiRuntime Kette ::utl::TransliterationWrapper* pTransliterationWrapper; // For StrComp - BOOL bBlockCompilerError; + BOOL bBlockCompilerError; BasicManager* pAppBasMgr; - StarBASIC* pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols + StarBASIC* pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols SbiGlobals(); ~SbiGlobals(); @@ -137,15 +137,15 @@ struct SbiGlobals SbiGlobals* GetSbData(); -#define pINST GetSbData()->pInst -#define pMOD GetSbData()->pMod -#define pCMOD GetSbData()->pCompMod -#define pSBFAC GetSbData()->pSbFac -#define pUNOFAC GetSbData()->pUnoFac -#define pTYPEFAC GetSbData()->pTypeFac -#define pCLASSFAC GetSbData()->pClassFac -#define pOLEFAC GetSbData()->pOLEFac -#define pFORMFAC GetSbData()->pFormFac +#define pINST GetSbData()->pInst +#define pMOD GetSbData()->pMod +#define pCMOD GetSbData()->pCompMod +#define pSBFAC GetSbData()->pSbFac +#define pUNOFAC GetSbData()->pUnoFac +#define pTYPEFAC GetSbData()->pTypeFac +#define pCLASSFAC GetSbData()->pClassFac +#define pOLEFAC GetSbData()->pOLEFac +#define pFORMFAC GetSbData()->pFormFac #endif diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx index f2cc8a3d3865..fe85699998dc 100644 --- a/basic/source/inc/sbjsmeth.hxx +++ b/basic/source/inc/sbjsmeth.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index b3aa275aec0d..b7a754b3147d 100644 --- a/basic/source/inc/sbjsmod.hxx +++ b/basic/source/inc/sbjsmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class SbJScriptModule : public SbModule public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1); TYPEINFO(); - SbJScriptModule( const String& ); // DURCHREICHEN + SbJScriptModule( const String& ); // DURCHREICHEN }; #endif diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx index daa10d7f9b57..50625c10de88 100644 --- a/basic/source/inc/sbtrace.hxx +++ b/basic/source/inc/sbtrace.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 011ffb9a7e02..54e2106842e2 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -53,7 +53,7 @@ class SbUnoObject: public SbxObject ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation; BOOL bNeedIntrospection; BOOL bIgnoreNativeCOMObjectMembers; - ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection! + ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection! // Hilfs-Methode zum Anlegen der dbg_-Properties void implCreateDbgProperties( void ); @@ -80,8 +80,8 @@ public: // Wert rausgeben ::com::sun::star::uno::Any getUnoAny( void ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess( void ) { return mxUnoAccess; } - ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void ) { return mxInvocation; } + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess( void ) { return mxUnoAccess; } + ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void ) { return mxInvocation; } void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); }; @@ -103,7 +103,7 @@ class SbUnoMethod : public SbxMethod SbUnoMethod* pPrev; SbUnoMethod* pNext; - bool mbInvocation; // Method is based on invocation + bool mbInvocation; // Method is based on invocation public: TYPEINFO(); @@ -128,7 +128,7 @@ class SbUnoProperty : public SbxProperty ::com::sun::star::beans::Property aUnoProp; INT32 nId; - bool mbInvocation; // Property is based on invocation + bool mbInvocation; // Property is based on invocation virtual ~SbUnoProperty(); public: @@ -151,7 +151,7 @@ public: // Wrapper fuer eine Uno-Klasse class SbUnoClass : public SbxObject { - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > m_xClass; + const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > m_xClass; public: TYPEINFO(); @@ -183,8 +183,8 @@ SbUnoClass* findUnoClass( const String& rName ); // Wrapper for UNO Service class SbUnoService : public SbxObject { - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc; - bool m_bNeedsInit; + const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc; + bool m_bNeedsInit; public: TYPEINFO(); @@ -231,7 +231,7 @@ public: // Wrapper for UNO Singleton class SbUnoSingleton : public SbxObject { - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc; + const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc; public: TYPEINFO(); @@ -268,7 +268,7 @@ public: class AutomationNamedArgsSbxArray : public SbxArray { - ::com::sun::star::uno::Sequence< ::rtl::OUString > maNameSeq; + ::com::sun::star::uno::Sequence< ::rtl::OUString > maNameSeq; public: TYPEINFO(); AutomationNamedArgsSbxArray( sal_Int32 nSeqSize ) diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx index 5a6a29c1a9c7..aa9aa8208667 100644 --- a/basic/source/inc/scanner.hxx +++ b/basic/source/inc/scanner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,69 +42,69 @@ class StarBASIC; class SbiScanner { - ::rtl::OUString aBuf; // Input-Puffer - ::rtl::OUString aLine; // aktuelle Zeile - const sal_Unicode* pLine; // Pointer - const sal_Unicode* pSaveLine; // Merker fuer Line + ::rtl::OUString aBuf; // Input-Puffer + ::rtl::OUString aLine; // aktuelle Zeile + const sal_Unicode* pLine; // Pointer + const sal_Unicode* pSaveLine; // Merker fuer Line protected: - String aSym; // Symbolpuffer - String aError; // Fehler-String - SbxDataType eScanType; // evtl. Datentyp - StarBASIC* pBasic; // Instanz fuer Fehler-Callbacks - double nVal; // numerischer Wert - short nCurCol1; // aktuelle Spalte 1 - short nSavedCol1; // gerettete Spalte 1 - short nCol; // aktuelle Spaltennummer - short nErrors; // Anzahl Fehler - short nColLock; // Lock-Zaehler fuer Col1 - INT32 nBufPos; // aktuelle Buffer-Pos - USHORT nLine; // aktuelle Zeile - USHORT nCol1, nCol2; // aktuelle 1. und 2. Spalte - BOOL bSymbol; // TRUE: Symbol gescannt - BOOL bNumber; // TRUE: Zahl gescannt - BOOL bSpaces; // TRUE: Whitespace vor Token - BOOL bErrors; // TRUE: Fehler generieren - BOOL bAbort; // TRUE: abbrechen - BOOL bHash; // TRUE: # eingelesen - BOOL bError; // TRUE: Fehler generieren - BOOL bUsedForHilite; // TRUE: Nutzung fuer Highlighting - BOOL bCompatible; // TRUE: OPTION Compatibl - BOOL bVBASupportOn; // TRUE: OPTION VBASupport 1 otherwise default False - BOOL bPrevLineExtentsComment; // TRUE: Previous line is comment and ends on "... _" + String aSym; // Symbolpuffer + String aError; // Fehler-String + SbxDataType eScanType; // evtl. Datentyp + StarBASIC* pBasic; // Instanz fuer Fehler-Callbacks + double nVal; // numerischer Wert + short nCurCol1; // aktuelle Spalte 1 + short nSavedCol1; // gerettete Spalte 1 + short nCol; // aktuelle Spaltennummer + short nErrors; // Anzahl Fehler + short nColLock; // Lock-Zaehler fuer Col1 + INT32 nBufPos; // aktuelle Buffer-Pos + USHORT nLine; // aktuelle Zeile + USHORT nCol1, nCol2; // aktuelle 1. und 2. Spalte + BOOL bSymbol; // TRUE: Symbol gescannt + BOOL bNumber; // TRUE: Zahl gescannt + BOOL bSpaces; // TRUE: Whitespace vor Token + BOOL bErrors; // TRUE: Fehler generieren + BOOL bAbort; // TRUE: abbrechen + BOOL bHash; // TRUE: # eingelesen + BOOL bError; // TRUE: Fehler generieren + BOOL bUsedForHilite; // TRUE: Nutzung fuer Highlighting + BOOL bCompatible; // TRUE: OPTION Compatibl + BOOL bVBASupportOn; // TRUE: OPTION VBASupport 1 otherwise default False + BOOL bPrevLineExtentsComment; // TRUE: Previous line is comment and ends on "... _" void GenError( SbError ); public: SbiScanner( const ::rtl::OUString&, StarBASIC* = NULL ); ~SbiScanner(); - void EnableErrors() { bError = FALSE; } - BOOL IsHash() { return bHash; } - BOOL IsCompatible() { return bCompatible; } - void SetCompatible( bool b ) { bCompatible = b; } // #118206 - BOOL IsVBASupportOn() { return bVBASupportOn; } - void SetVBASupportOn( bool b ) { bVBASupportOn = b; } - BOOL WhiteSpace() { return bSpaces; } - short GetErrors() { return nErrors; } - short GetLine() { return nLine; } - short GetCol1() { return nCol1; } - short GetCol2() { return nCol2; } - void SetCol1( short n ) { nCol1 = n; } - StarBASIC* GetBasic() { return pBasic; } - void SaveLine(void) { pSaveLine = pLine; } - void RestoreLine(void) { pLine = pSaveLine; } + void EnableErrors() { bError = FALSE; } + BOOL IsHash() { return bHash; } + BOOL IsCompatible() { return bCompatible; } + void SetCompatible( bool b ) { bCompatible = b; } // #118206 + BOOL IsVBASupportOn() { return bVBASupportOn; } + void SetVBASupportOn( bool b ) { bVBASupportOn = b; } + BOOL WhiteSpace() { return bSpaces; } + short GetErrors() { return nErrors; } + short GetLine() { return nLine; } + short GetCol1() { return nCol1; } + short GetCol2() { return nCol2; } + void SetCol1( short n ) { nCol1 = n; } + StarBASIC* GetBasic() { return pBasic; } + void SaveLine(void) { pSaveLine = pLine; } + void RestoreLine(void) { pLine = pSaveLine; } void LockColumn(); void UnlockColumn(); BOOL DoesColonFollow(); - BOOL NextSym(); // naechstes Symbol lesen - const String& GetSym() { return aSym; } - SbxDataType GetType() { return eScanType; } - double GetDbl() { return nVal; } + BOOL NextSym(); // naechstes Symbol lesen + const String& GetSym() { return aSym; } + SbxDataType GetType() { return eScanType; } + double GetDbl() { return nVal; } }; class LetterTable { - bool IsLetterTab[256]; + bool IsLetterTab[256]; public: LetterTable( void ); @@ -124,7 +124,7 @@ class BasicSimpleCharClass public: static BOOL isAlpha( sal_Unicode c, bool bCompatible ) { - BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') + BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (bCompatible && aLetterTable.isLetter( c )); return bRet; } diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 1b68e089c451..657c8c68604f 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,22 +48,22 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas // Methods to distinguish between deffirent library types virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName ); virtual SfxLibrary* SAL_CALL implCreateLibraryLink - ( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL, + ( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& StorageURL, sal_Bool ReadOnly ); virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ); virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const; virtual void SAL_CALL writeLibraryElement - ( + ( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary, - const ::rtl::OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput + const ::rtl::OUString& aElementName, + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(::com::sun::star::uno::Exception); virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement - ( + ( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary, - const ::rtl::OUString& aElementName, + const ::rtl::OUString& aElementName, const ::rtl::OUString& aFile, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xElementStream ); @@ -73,18 +73,18 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas // Password encryption - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, + virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); // New variant for library export - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, + virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& aTargetURL, + const ::rtl::OUString& aTargetURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& Name, - sal_Bool bVerifyPasswordOnly=false ) - throw(::com::sun::star::lang::WrappedTargetException, + sal_Bool bVerifyPasswordOnly=false ) + throw(::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void onNewRootStorage(); @@ -95,7 +95,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual String getLibraryPassword( const String& rLibraryName ); virtual void clearLibraryPassword( const String& rLibraryName ); virtual sal_Bool hasLibraryPassword( const String& rLibraryName ); - + virtual const sal_Char* SAL_CALL getInfoFileName() const; virtual const sal_Char* SAL_CALL getOldInfoFileName() const; virtual const sal_Char* SAL_CALL getLibElementFileExtension() const; @@ -107,21 +107,21 @@ public: // Methods XLibraryContainerPassword - virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const ::rtl::OUString& Name ) - throw (::com::sun::star::container::NoSuchElementException, + virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const ::rtl::OUString& Name ) + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const ::rtl::OUString& Name ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, + virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const ::rtl::OUString& Name ) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL verifyLibraryPassword( const ::rtl::OUString& Name, const ::rtl::OUString& Password ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, + virtual sal_Bool SAL_CALL verifyLibraryPassword( const ::rtl::OUString& Name, const ::rtl::OUString& Password ) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL changeLibraryPassword( const ::rtl::OUString& Name, - const ::rtl::OUString& OldPassword, const ::rtl::OUString& NewPassword ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, + virtual void SAL_CALL changeLibraryPassword( const ::rtl::OUString& Name, + const ::rtl::OUString& OldPassword, const ::rtl::OUString& NewPassword ) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const rtl::OUString&) @@ -136,7 +136,7 @@ public: static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(); static ::rtl::OUString getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create - ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager ) + ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); }; diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx index 9087b81e3028..3dd28c4e3540 100644 --- a/basic/source/inc/stdobj.hxx +++ b/basic/source/inc/stdobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index b8457b3c811b..a36fcfafb591 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ #include <basic/sbxdef.hxx> #include <basic/sbdef.hxx> -class SbiSymDef; // Basisklasse -class SbiProcDef; // Prozedur -class SbiConstDef; // Konstante -class SbiSymPool; // Symbol-Pool -class SbiStringPool; // gepoolte Strings +class SbiSymDef; // Basisklasse +class SbiProcDef; // Prozedur +class SbiConstDef; // Konstante +class SbiSymPool; // Symbol-Pool +class SbiStringPool; // gepoolte Strings class SvStream; class SbiParser; @@ -52,10 +52,10 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, SbRTL }; SV_DECL_PTRARR_DEL(SbiStrings,String*,5,5) -class SbiStringPool { // String-Pool - SbiStrings aData; // Daten - String aEmpty; // for convenience - SbiParser* pParser; // der Parser +class SbiStringPool { // String-Pool + SbiStrings aData; // Daten + String aEmpty; // for convenience + SbiParser* pParser; // der Parser public: SbiStringPool( SbiParser* ); ~SbiStringPool(); @@ -72,69 +72,69 @@ public: SV_DECL_PTRARR_DEL(SbiSymbols,SbiSymDef*,5,5) -class SbiSymPool { // Symbol-Pool +class SbiSymPool { // Symbol-Pool friend class SbiSymDef; friend class SbiProcDef; protected: - SbiStringPool& rStrings; // verwendeter Stringpool - SbiSymbols aData; // Daten - SbiSymPool* pParent; // uebergeordneter Symbol-Pool - SbiParser* pParser; // der Parser - SbiSymScope eScope; // Scope des Pools - USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable - USHORT nCur; // Iterator + SbiStringPool& rStrings; // verwendeter Stringpool + SbiSymbols aData; // Daten + SbiSymPool* pParent; // uebergeordneter Symbol-Pool + SbiParser* pParser; // der Parser + SbiSymScope eScope; // Scope des Pools + USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable + USHORT nCur; // Iterator public: SbiSymPool( SbiStringPool&, SbiSymScope ); ~SbiSymPool(); void Clear(); - void SetParent( SbiSymPool* p ) { pParent = p; } - void SetProcId( short n ) { nProcId = n; } - USHORT GetSize() const { return aData.Count(); } - SbiSymScope GetScope() const { return eScope; } - void SetScope( SbiSymScope s ) { eScope = s; } - SbiParser* GetParser() { return pParser; } + void SetParent( SbiSymPool* p ) { pParent = p; } + void SetProcId( short n ) { nProcId = n; } + USHORT GetSize() const { return aData.Count(); } + SbiSymScope GetScope() const { return eScope; } + void SetScope( SbiSymScope s ) { eScope = s; } + SbiParser* GetParser() { return pParser; } - SbiSymDef* AddSym( const String& ); // Symbol hinzufuegen + SbiSymDef* AddSym( const String& ); // Symbol hinzufuegen SbiProcDef* AddProc( const String& );// Prozedur hinzufuegen - void Add( SbiSymDef* ); // Symbol uebernehmen + void Add( SbiSymDef* ); // Symbol uebernehmen SbiSymDef* Find( const String& ) const;// Variablenname - SbiSymDef* FindId( USHORT ) const; // Variable per ID suchen - SbiSymDef* Get( USHORT ) const; // Variable per Position suchen - SbiSymDef* First(), *Next(); // Iteratoren + SbiSymDef* FindId( USHORT ) const; // Variable per ID suchen + SbiSymDef* Get( USHORT ) const; // Variable per Position suchen + SbiSymDef* First(), *Next(); // Iteratoren - UINT32 Define( const String& ); // Label definieren + UINT32 Define( const String& ); // Label definieren UINT32 Reference( const String& ); // Label referenzieren - void CheckRefs(); // offene Referenzen suchen + void CheckRefs(); // offene Referenzen suchen }; /////////////////////////////////////////////////////////////////////////// -class SbiSymDef { // Allgemeiner Symboleintrag +class SbiSymDef { // Allgemeiner Symboleintrag friend class SbiSymPool; protected: - String aName; // Name des Eintrags - SbxDataType eType; // Typ des Eintrags - SbiSymPool* pIn; // Parent-Pool - SbiSymPool* pPool; // Pool fuer Unterelemente - short nLen; // Stringlaenge bei STRING*n - short nDims; // Array-Dimensionen - USHORT nId; // Symbol-Nummer - USHORT nTypeId; // String-ID des Datentyps (Dim X AS Dytentyp) - USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable - USHORT nPos; // Positions-Nummer - UINT32 nChain; // Backchain-Kette - BOOL bNew : 1; // TRUE: Dim As New... - BOOL bChained : 1; // TRUE: Symbol ist in Code definiert - BOOL bByVal : 1; // TRUE: ByVal-Parameter - BOOL bOpt : 1; // TRUE: optionaler Parameter - BOOL bStatic : 1; // TRUE: STATIC-Variable - BOOL bAs : 1; // TRUE: Datentyp per AS XXX definiert - BOOL bGlobal : 1; // TRUE: Global-Variable - BOOL bParamArray : 1; // TRUE: ParamArray parameter - BOOL bWithEvents : 1; // TRUE: Declared WithEvents - USHORT nDefaultId; // Symbol number of default value + String aName; // Name des Eintrags + SbxDataType eType; // Typ des Eintrags + SbiSymPool* pIn; // Parent-Pool + SbiSymPool* pPool; // Pool fuer Unterelemente + short nLen; // Stringlaenge bei STRING*n + short nDims; // Array-Dimensionen + USHORT nId; // Symbol-Nummer + USHORT nTypeId; // String-ID des Datentyps (Dim X AS Dytentyp) + USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable + USHORT nPos; // Positions-Nummer + UINT32 nChain; // Backchain-Kette + BOOL bNew : 1; // TRUE: Dim As New... + BOOL bChained : 1; // TRUE: Symbol ist in Code definiert + BOOL bByVal : 1; // TRUE: ByVal-Parameter + BOOL bOpt : 1; // TRUE: optionaler Parameter + BOOL bStatic : 1; // TRUE: STATIC-Variable + BOOL bAs : 1; // TRUE: Datentyp per AS XXX definiert + BOOL bGlobal : 1; // TRUE: Global-Variable + BOOL bParamArray : 1; // TRUE: ParamArray parameter + BOOL bWithEvents : 1; // TRUE: Declared WithEvents + USHORT nDefaultId; // Symbol number of default value short nFixedStringLength; // String length in: Dim foo As String*Length public: SbiSymDef( const String& ); @@ -142,85 +142,85 @@ public: virtual SbiProcDef* GetProcDef(); virtual SbiConstDef* GetConstDef(); - SbxDataType GetType() const { return eType; } + SbxDataType GetType() const { return eType; } virtual void SetType( SbxDataType ); const String& GetName(); SbiSymScope GetScope() const; - USHORT GetProcId() const{ return nProcId; } - UINT32 GetAddr() const { return nChain; } - USHORT GetId() const { return nId; } - USHORT GetTypeId() const{ return nTypeId; } - void SetTypeId( USHORT n ) { nTypeId = n; eType = SbxOBJECT; } - USHORT GetPos() const { return nPos; } - void SetLen( short n ){ nLen = n; } - short GetLen() const { return nLen; } - void SetDims( short n ) { nDims = n; } - short GetDims() const { return nDims; } - BOOL IsDefined() const{ return bChained; } - void SetOptional() { bOpt = TRUE; } - void SetParamArray() { bParamArray = TRUE; } - void SetWithEvents() { bWithEvents = TRUE; } - void SetByVal( BOOL bByVal_ = TRUE ) + USHORT GetProcId() const{ return nProcId; } + UINT32 GetAddr() const { return nChain; } + USHORT GetId() const { return nId; } + USHORT GetTypeId() const{ return nTypeId; } + void SetTypeId( USHORT n ) { nTypeId = n; eType = SbxOBJECT; } + USHORT GetPos() const { return nPos; } + void SetLen( short n ){ nLen = n; } + short GetLen() const { return nLen; } + void SetDims( short n ) { nDims = n; } + short GetDims() const { return nDims; } + BOOL IsDefined() const{ return bChained; } + void SetOptional() { bOpt = TRUE; } + void SetParamArray() { bParamArray = TRUE; } + void SetWithEvents() { bWithEvents = TRUE; } + void SetByVal( BOOL bByVal_ = TRUE ) { bByVal = bByVal_; } - void SetStatic( BOOL bAsStatic = TRUE ) { bStatic = bAsStatic; } - void SetNew() { bNew = TRUE; } - void SetDefinedAs() { bAs = TRUE; } - void SetGlobal(BOOL b){ bGlobal = b; } - void SetDefaultId( USHORT n ) { nDefaultId = n; } - USHORT GetDefaultId( void ) { return nDefaultId; } - BOOL IsOptional() const{ return bOpt; } - BOOL IsParamArray() const{ return bParamArray; } - BOOL IsWithEvents() const{ return bWithEvents; } - BOOL IsByVal() const { return bByVal; } - BOOL IsStatic() const { return bStatic; } - BOOL IsNew() const { return bNew; } - BOOL IsDefinedAs() const { return bAs; } - BOOL IsGlobal() const { return bGlobal; } + void SetStatic( BOOL bAsStatic = TRUE ) { bStatic = bAsStatic; } + void SetNew() { bNew = TRUE; } + void SetDefinedAs() { bAs = TRUE; } + void SetGlobal(BOOL b){ bGlobal = b; } + void SetDefaultId( USHORT n ) { nDefaultId = n; } + USHORT GetDefaultId( void ) { return nDefaultId; } + BOOL IsOptional() const{ return bOpt; } + BOOL IsParamArray() const{ return bParamArray; } + BOOL IsWithEvents() const{ return bWithEvents; } + BOOL IsByVal() const { return bByVal; } + BOOL IsStatic() const { return bStatic; } + BOOL IsNew() const { return bNew; } + BOOL IsDefinedAs() const { return bAs; } + BOOL IsGlobal() const { return bGlobal; } short GetFixedStringLength( void ) const { return nFixedStringLength; } - void SetFixedStringLength( short n ) { nFixedStringLength = n; } + void SetFixedStringLength( short n ) { nFixedStringLength = n; } SbiSymPool& GetPool(); - UINT32 Define(); // Symbol in Code definieren - UINT32 Reference(); // Symbol in Code referenzieren + UINT32 Define(); // Symbol in Code definieren + UINT32 Reference(); // Symbol in Code referenzieren private: SbiSymDef( const SbiSymDef& ); }; -class SbiProcDef : public SbiSymDef { // Prozedur-Definition (aus Basic): - SbiSymPool aParams; // Parameter - SbiSymPool aLabels; // lokale Sprungziele - String aLibName; // LIB "name" - String aAlias; // ALIAS "name" - USHORT nLine1, nLine2; // Zeilenbereich - PropertyMode mePropMode; // Marks if this is a property procedure and which - String maPropName; // Property name if property procedure (!= proc name) - BOOL bCdecl : 1; // TRUE: CDECL angegeben - BOOL bPublic : 1; // TRUE: proc ist PUBLIC - BOOL mbProcDecl : 1; // TRUE: instanciated by SbiParser::ProcDecl +class SbiProcDef : public SbiSymDef { // Prozedur-Definition (aus Basic): + SbiSymPool aParams; // Parameter + SbiSymPool aLabels; // lokale Sprungziele + String aLibName; // LIB "name" + String aAlias; // ALIAS "name" + USHORT nLine1, nLine2; // Zeilenbereich + PropertyMode mePropMode; // Marks if this is a property procedure and which + String maPropName; // Property name if property procedure (!= proc name) + BOOL bCdecl : 1; // TRUE: CDECL angegeben + BOOL bPublic : 1; // TRUE: proc ist PUBLIC + BOOL mbProcDecl : 1; // TRUE: instanciated by SbiParser::ProcDecl public: SbiProcDef( SbiParser*, const String&, BOOL bProcDecl=false ); virtual ~SbiProcDef(); virtual SbiProcDef* GetProcDef(); virtual void SetType( SbxDataType ); - SbiSymPool& GetParams() { return aParams; } - SbiSymPool& GetLabels() { return aLabels; } - SbiSymPool& GetLocals() { return GetPool();} - String& GetLib() { return aLibName; } - String& GetAlias() { return aAlias; } - void SetPublic( BOOL b ) { bPublic = b; } - BOOL IsPublic() const { return bPublic; } - void SetCdecl( BOOL b = TRUE) { bCdecl = b; } - BOOL IsCdecl() const { return bCdecl; } - BOOL IsUsedForProcDecl() const { return mbProcDecl; } - void SetLine1( USHORT n ) { nLine1 = n; } - USHORT GetLine1() const { return nLine1; } - void SetLine2( USHORT n ) { nLine2 = n; } - USHORT GetLine2() const { return nLine2; } - PropertyMode getPropertyMode() { return mePropMode; } + SbiSymPool& GetParams() { return aParams; } + SbiSymPool& GetLabels() { return aLabels; } + SbiSymPool& GetLocals() { return GetPool();} + String& GetLib() { return aLibName; } + String& GetAlias() { return aAlias; } + void SetPublic( BOOL b ) { bPublic = b; } + BOOL IsPublic() const { return bPublic; } + void SetCdecl( BOOL b = TRUE) { bCdecl = b; } + BOOL IsCdecl() const { return bCdecl; } + BOOL IsUsedForProcDecl() const { return mbProcDecl; } + void SetLine1( USHORT n ) { nLine1 = n; } + USHORT GetLine1() const { return nLine1; } + void SetLine2( USHORT n ) { nLine2 = n; } + USHORT GetLine2() const { return nLine2; } + PropertyMode getPropertyMode() { return mePropMode; } void setPropertyMode( PropertyMode ePropMode ); - const String& GetPropName() { return maPropName; } + const String& GetPropName() { return maPropName; } // Match mit einer Forward-Deklaration. Die Parameternamen // werden abgeglichen und die Forward-Deklaration wird @@ -242,8 +242,8 @@ public: virtual SbiConstDef* GetConstDef(); void Set( double, SbxDataType ); void Set( const String& ); - double GetValue() { return nVal; } - const String& GetString() { return aVal; } + double GetValue() { return nVal; } + const String& GetString() { return aVal; } }; diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index 544eef119e01..333a20e10ee2 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ enum SbiToken { _ERROR_, TBOOLEAN, TVARIANT, TBYTE, DATATYPE2 = TBYTE, - EACH, ELSE, ELSEIF, END, ERASE, EXIT, + EACH, ELSE, ELSEIF, END, ERASE, EXIT, FOR, FUNCTION, GET, GLOBAL, GOSUB, GOTO, IF, _IN_, INPUT, @@ -107,7 +107,7 @@ enum SbiToken { JS_ASS_DIV, JS_ASS_MOD, JS_ASS_LSHIFT, JS_ASS_RSHIFT, JS_ASS_RSHIFT_Z, JS_ASS_AND, JS_ASS_XOR, JS_ASS_OR, JS_COND_QUEST, JS_COND_SEL, JS_LOG_OR, JS_LOG_AND, JS_BIT_OR, - JS_BIT_XOR, JS_BIT_AND, JS_EQ, JS_NE, JS_LT, JS_LE, + JS_BIT_XOR, JS_BIT_AND, JS_EQ, JS_NE, JS_LT, JS_LE, JS_GT, JS_GE, JS_LSHIFT, JS_RSHIFT, JS_RSHIFT_Z, JS_PLUS, JS_MINUS, JS_MUL, JS_DIV, JS_MOD, JS_LOG_NOT, JS_BIT_NOT, JS_INC, JS_DEC, JS_LPAREN, JS_RPAREN, JS_LINDEX, JS_RINDEX @@ -136,32 +136,32 @@ public: }; class SbiTokenizer : public SbiScanner { - TokenLabelInfo m_aTokenLabelInfo; + TokenLabelInfo m_aTokenLabelInfo; protected: - SbiToken eCurTok; // aktuelles Token - SbiToken ePush; // Pushback-Token + SbiToken eCurTok; // aktuelles Token + SbiToken ePush; // Pushback-Token USHORT nPLine, nPCol1, nPCol2; // Pushback-Location - BOOL bEof; // TRUE bei Dateiende - BOOL bEos; // TRUE bei Statement-Ende - BOOL bKeywords; // TRUE, falls Keywords geparst werden - BOOL bAs; // letztes Keyword war AS - BOOL bErrorIsSymbol; // Handle Error token as Symbol, not keyword + BOOL bEof; // TRUE bei Dateiende + BOOL bEos; // TRUE bei Statement-Ende + BOOL bKeywords; // TRUE, falls Keywords geparst werden + BOOL bAs; // letztes Keyword war AS + BOOL bErrorIsSymbol; // Handle Error token as Symbol, not keyword public: SbiTokenizer( const ::rtl::OUString&, StarBASIC* = NULL ); ~SbiTokenizer(); - inline BOOL IsEof() { return bEof; } - inline BOOL IsEos() { return bEos; } + inline BOOL IsEof() { return bEof; } + inline BOOL IsEos() { return bEos; } - void Push( SbiToken ); // Pushback eines Tokens + void Push( SbiToken ); // Pushback eines Tokens const String& Symbol( SbiToken );// Rueckumwandlung - SbiToken Peek(); // das naechste Token lesen - SbiToken Next(); // Ein Token lesen - BOOL MayBeLabel( BOOL= FALSE ); // Kann es ein Label sein? + SbiToken Peek(); // das naechste Token lesen + SbiToken Next(); // Ein Token lesen + BOOL MayBeLabel( BOOL= FALSE ); // Kann es ein Label sein? - void Hilite( SbTextPortions& ); // Syntax-Highlighting + void Hilite( SbTextPortions& ); // Syntax-Highlighting void Error( SbError c ) { GenError( c ); } void Error( SbError, SbiToken ); diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index a705aa24aa00..affad8d49917 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index a2536bfab045..38f7fbee5c04 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,16 +33,16 @@ #include "ddectrl.hxx" #include <basic/sberrors.hxx> -#define DDE_FREECHANNEL ((DdeConnection*)0xffffffff) +#define DDE_FREECHANNEL ((DdeConnection*)0xffffffff) -#define DDE_FIRSTERR 0x4000 -#define DDE_LASTERR 0x4011 +#define DDE_FIRSTERR 0x4000 +#define DDE_LASTERR 0x4011 static const SbError nDdeErrMap[] = { - /* DMLERR_ADVACKTIMEOUT */ 0x4000, SbERR_DDE_TIMEOUT, - /* DMLERR_BUSY */ 0x4001, SbERR_DDE_BUSY, - /* DMLERR_DATAACKTIMEOUT */ 0x4002, SbERR_DDE_TIMEOUT, + /* DMLERR_ADVACKTIMEOUT */ 0x4000, SbERR_DDE_TIMEOUT, + /* DMLERR_BUSY */ 0x4001, SbERR_DDE_BUSY, + /* DMLERR_DATAACKTIMEOUT */ 0x4002, SbERR_DDE_TIMEOUT, /* DMLERR_DLL_NOT_INITIALIZED */ 0x4003, SbERR_DDE_ERROR, /* DMLERR_DLL_USAGE */ 0x4004, SbERR_DDE_ERROR, /* DMLERR_EXECACKTIMEOUT */ 0x4005, SbERR_DDE_TIMEOUT, diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index 65be2e76ecff..e8dd108854b4 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ private: DECL_LINK( Data, DdeData* ); SbError GetLastErr( DdeConnection* ); INT16 GetFreeChannel(); - DdeConnections* pConvList; + DdeConnections* pConvList; String aData; public: diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index cc385ce4a199..389e5835d1e1 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ void SvRTLInputBox::PositionPrompt(const String& rPrompt,const Size& rDlgSize) IMPL_LINK_INLINE_START( SvRTLInputBox, OkHdl, Button *, pButton ) { (void)pButton; - + aText = aEdit.GetText(); EndDialog( 1 ); return 0; @@ -142,7 +142,7 @@ IMPL_LINK_INLINE_END( SvRTLInputBox, OkHdl, Button *, pButton ) IMPL_LINK_INLINE_START( SvRTLInputBox, CancelHdl, Button *, pButton ) { (void)pButton; - + aText.Erase(); EndDialog( 0 ); return 0; @@ -160,7 +160,7 @@ RTLFUNC(InputBox) { (void)pBasic; (void)bWrite; - + ULONG nArgCount = rPar.Count(); if ( nArgCount < 2 ) StarBASIC::Error( SbERR_BAD_ARGUMENT ); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 40cf7f2f3ece..97498a8a291a 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -269,7 +269,7 @@ BOOL needSecurityRestrictions( void ) // Iterate through all bridges to find (portal) user property const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray(); - bRetVal = FALSE; // Now only TRUE if user different from portal user is found + bRetVal = FALSE; // Now only TRUE if user different from portal user is found sal_Int32 i; for( i = 0 ; i < nBridgeCount ; i++ ) { @@ -349,11 +349,11 @@ class OslStream : public SvStream public: OslStream( const String& rName, short nStrmMode ); ~OslStream(); - virtual ULONG GetData( void* pData, ULONG nSize ); - virtual ULONG PutData( const void* pData, ULONG nSize ); - virtual ULONG SeekPos( ULONG nPos ); - virtual void FlushData(); - virtual void SetSize( ULONG nSize ); + virtual ULONG GetData( void* pData, ULONG nSize ); + virtual ULONG PutData( const void* pData, ULONG nSize ); + virtual ULONG SeekPos( ULONG nPos ); + virtual void FlushData(); + virtual void SetSize( ULONG nSize ); }; OslStream::OslStream( const String& rName, short nStrmMode ) @@ -443,20 +443,20 @@ void OslStream::SetSize( ULONG nSize ) class UCBStream : public SvStream { - Reference< XInputStream > xIS; - Reference< XOutputStream > xOS; - Reference< XStream > xS; - Reference< XSeekable > xSeek; + Reference< XInputStream > xIS; + Reference< XOutputStream > xOS; + Reference< XStream > xS; + Reference< XSeekable > xSeek; public: UCBStream( Reference< XInputStream > & xIS ); UCBStream( Reference< XOutputStream > & xOS ); UCBStream( Reference< XStream > & xS ); ~UCBStream(); - virtual ULONG GetData( void* pData, ULONG nSize ); - virtual ULONG PutData( const void* pData, ULONG nSize ); - virtual ULONG SeekPos( ULONG nPos ); - virtual void FlushData(); - virtual void SetSize( ULONG nSize ); + virtual ULONG GetData( void* pData, ULONG nSize ); + virtual ULONG PutData( const void* pData, ULONG nSize ); + virtual ULONG SeekPos( ULONG nPos ); + virtual void FlushData(); + virtual void SetSize( ULONG nSize ); }; /* @@ -465,29 +465,29 @@ ULONG UCBErrorToSvStramError( ucb::IOErrorCode nError ) ULONG eReturn = ERRCODE_IO_GENERAL; switch( nError ) { - case ucb::IOErrorCode_ABORT: eReturn = SVSTREAM_GENERALERROR; break; - case ucb::IOErrorCode_NOT_EXISTING: eReturn = SVSTREAM_FILE_NOT_FOUND; break; - case ucb::IOErrorCode_NOT_EXISTING_PATH: eReturn = SVSTREAM_PATH_NOT_FOUND; break; - case ucb::IOErrorCode_OUT_OF_FILE_HANDLES: eReturn = SVSTREAM_TOO_MANY_OPEN_FILES; break; - case ucb::IOErrorCode_ACCESS_DENIED: eReturn = SVSTREAM_ACCESS_DENIED; break; - case ucb::IOErrorCode_LOCKING_VIOLATION: eReturn = SVSTREAM_SHARING_VIOLATION; break; + case ucb::IOErrorCode_ABORT: eReturn = SVSTREAM_GENERALERROR; break; + case ucb::IOErrorCode_NOT_EXISTING: eReturn = SVSTREAM_FILE_NOT_FOUND; break; + case ucb::IOErrorCode_NOT_EXISTING_PATH: eReturn = SVSTREAM_PATH_NOT_FOUND; break; + case ucb::IOErrorCode_OUT_OF_FILE_HANDLES: eReturn = SVSTREAM_TOO_MANY_OPEN_FILES; break; + case ucb::IOErrorCode_ACCESS_DENIED: eReturn = SVSTREAM_ACCESS_DENIED; break; + case ucb::IOErrorCode_LOCKING_VIOLATION: eReturn = SVSTREAM_SHARING_VIOLATION; break; - case ucb::IOErrorCode_INVALID_ACCESS: eReturn = SVSTREAM_INVALID_ACCESS; break; - case ucb::IOErrorCode_CANT_CREATE: eReturn = SVSTREAM_CANNOT_MAKE; break; - case ucb::IOErrorCode_INVALID_PARAMETER: eReturn = SVSTREAM_INVALID_PARAMETER; break; + case ucb::IOErrorCode_INVALID_ACCESS: eReturn = SVSTREAM_INVALID_ACCESS; break; + case ucb::IOErrorCode_CANT_CREATE: eReturn = SVSTREAM_CANNOT_MAKE; break; + case ucb::IOErrorCode_INVALID_PARAMETER: eReturn = SVSTREAM_INVALID_PARAMETER; break; - case ucb::IOErrorCode_CANT_READ: eReturn = SVSTREAM_READ_ERROR; break; - case ucb::IOErrorCode_CANT_WRITE: eReturn = SVSTREAM_WRITE_ERROR; break; - case ucb::IOErrorCode_CANT_SEEK: eReturn = SVSTREAM_SEEK_ERROR; break; - case ucb::IOErrorCode_CANT_TELL: eReturn = SVSTREAM_TELL_ERROR; break; + case ucb::IOErrorCode_CANT_READ: eReturn = SVSTREAM_READ_ERROR; break; + case ucb::IOErrorCode_CANT_WRITE: eReturn = SVSTREAM_WRITE_ERROR; break; + case ucb::IOErrorCode_CANT_SEEK: eReturn = SVSTREAM_SEEK_ERROR; break; + case ucb::IOErrorCode_CANT_TELL: eReturn = SVSTREAM_TELL_ERROR; break; - case ucb::IOErrorCode_OUT_OF_MEMORY: eReturn = SVSTREAM_OUTOFMEMORY; break; + case ucb::IOErrorCode_OUT_OF_MEMORY: eReturn = SVSTREAM_OUTOFMEMORY; break; - case SVSTREAM_FILEFORMAT_ERROR: eReturn = SVSTREAM_FILEFORMAT_ERROR; break; - case ucb::IOErrorCode_WRONG_VERSION: eReturn = SVSTREAM_WRONGVERSION; - case ucb::IOErrorCode_OUT_OF_DISK_SPACE: eReturn = SVSTREAM_DISK_FULL; break; + case SVSTREAM_FILEFORMAT_ERROR: eReturn = SVSTREAM_FILEFORMAT_ERROR; break; + case ucb::IOErrorCode_WRONG_VERSION: eReturn = SVSTREAM_WRONGVERSION; + case ucb::IOErrorCode_OUT_OF_DISK_SPACE: eReturn = SVSTREAM_DISK_FULL; break; - case ucb::IOErrorCode_BAD_CRC: eReturn = ERRCODE_IO_BADCRC; break; + case ucb::IOErrorCode_BAD_CRC: eReturn = ERRCODE_IO_BADCRC; break; } return eReturn; } @@ -533,7 +533,7 @@ UCBStream::~UCBStream() } } -ULONG UCBStream::GetData( void* pData, ULONG nSize ) +ULONG UCBStream::GetData( void* pData, ULONG nSize ) { try { @@ -562,7 +562,7 @@ ULONG UCBStream::GetData( void* pData, ULONG nSize ) return 0; } -ULONG UCBStream::PutData( const void* pData, ULONG nSize ) +ULONG UCBStream::PutData( const void* pData, ULONG nSize ) { try { @@ -589,7 +589,7 @@ ULONG UCBStream::PutData( const void* pData, ULONG nSize ) return 0; } -ULONG UCBStream::SeekPos( ULONG nPos ) +ULONG UCBStream::SeekPos( ULONG nPos ) { try { @@ -611,7 +611,7 @@ ULONG UCBStream::SeekPos( ULONG nPos ) return 0; } -void UCBStream::FlushData() +void UCBStream::FlushData() { try { @@ -629,7 +629,7 @@ void UCBStream::FlushData() } } -void UCBStream::SetSize( ULONG nSize ) +void UCBStream::SetSize( ULONG nSize ) { (void)nSize; @@ -720,7 +720,7 @@ SbError SbiStream::Open SbError SbiStream::Close() { - if( pStrm ) + if( pStrm ) { if( !hasUno() ) { @@ -999,7 +999,7 @@ void SbiIoSystem::CloseAll(void) /*************************************************************************** * -* Console Support +* Console Support * ***************************************************************************/ diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1e06e74d48ff..525d0012ab85 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -111,7 +111,7 @@ SbxVariable* getDefaultProp( SbxVariable* pRef ); #endif #ifdef WIN -#include <dos.h> // _dos_getfileattr +#include <dos.h> // _dos_getfileattr #include <errno.h> #endif @@ -425,7 +425,7 @@ RTLFUNC(CurDir) // DirEntry-Funktionalitaet keine Moeglichkeit besteht, das aktuelle so // zu ermitteln, dass eine virtuelle URL geliefert werden koennte. -// rPar.Get(0)->PutEmpty(); +// rPar.Get(0)->PutEmpty(); #if defined (WIN) || defined (WNT) || defined (OS2) int nCurDir = 0; // Current dir // JSM if ( rPar.Count() == 2 ) @@ -1165,9 +1165,9 @@ RTLFUNC(InStrRev) /* - Int( 2.8 ) = 2.0 + Int( 2.8 ) = 2.0 Int( -2.8 ) = -3.0 - Fix( 2.8 ) = 2.0 + Fix( 2.8 ) = 2.0 Fix( -2.8 ) = -2.0 <- !! */ @@ -1789,8 +1789,8 @@ RTLFUNC(Val) String aStr( rPar.Get(1)->GetString() ); // lt. Mikkysoft bei Kommas abbrechen! -// for( USHORT n=0; n < aStr.Len(); n++ ) -// if( aStr[n] == ',' ) aStr[n] = '.'; +// for( USHORT n=0; n < aStr.Len(); n++ ) +// if( aStr[n] == ',' ) aStr[n] = '.'; FilterWhiteSpace( aStr ); if ( aStr.GetBuffer()[0] == '&' && aStr.Len() > 1 ) @@ -1889,7 +1889,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet ) // adjust year based on month value // e.g. 2000, 0, xx = 1999, 12, xx ( or December of the previous year ) - // 2000, 13, xx = 2001, 1, xx ( or January of the following year ) + // 2000, 13, xx = 2001, 1, xx ( or January of the following year ) if( ( nMonth < 1 ) || ( nMonth > 12 ) ) { // inacurrate around leap year, don't use days to calculate, @@ -1902,7 +1902,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet ) // adjust day value, // e.g. 2000, 2, 0 = 2000, 1, 31 or the last day of the previous month - // 2000, 1, 32 = 2000, 2, 1 or the first day of the following month + // 2000, 1, 32 = 2000, 2, 1 or the first day of the following month if( ( nDay < 1 ) || ( nDay > aCurDate.GetDaysInMonth() ) ) aCurDate += nDay - 1; else @@ -1996,7 +1996,7 @@ RTLFUNC(TimeSerial) INT16 nMinute = rPar.Get(2)->GetInteger(); INT16 nSecond = rPar.Get(3)->GetInteger(); if ((nHour < 0 || nHour > 23) || - (nMinute < 0 || nMinute > 59 ) || + (nMinute < 0 || nMinute > 59 ) || (nSecond < 0 || nSecond > 59 )) { StarBASIC::Error( SbERR_BAD_ARGUMENT ); @@ -2026,7 +2026,7 @@ RTLFUNC(DateValue) pFormatter = pINST->GetNumberFormatter(); else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n ); } @@ -2088,7 +2088,7 @@ RTLFUNC(TimeValue) pFormatter = pINST->GetNumberFormatter(); else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n ); } @@ -2304,7 +2304,7 @@ RTLFUNC(Time) } else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n ); } @@ -2361,7 +2361,7 @@ RTLFUNC(Date) } else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n ); } @@ -2725,7 +2725,7 @@ RTLFUNC(Dir) if( pRTLData->sFullNameToBeChecked.Len() > 0 ) { sal_Bool bExists = sal_False; - try { bExists = xSFI->exists( aFileURLStr ); } + try { bExists = xSFI->exists( aFileURLStr ); } catch( Exception & ) {} String aNameOnlyStr; @@ -3204,7 +3204,7 @@ RTLFUNC(FileDateTime) } else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex ); } @@ -3243,7 +3243,7 @@ RTLFUNC(EOF) if ( pSbStrm->IsText() ) { char cBla; - (*pSvStrm) >> cBla; // koennen wir noch ein Zeichen lesen + (*pSvStrm) >> cBla; // koennen wir noch ein Zeichen lesen bIsEof = pSvStrm->IsEof(); if ( !bIsEof ) pSvStrm->SeekRel( -1 ); @@ -3270,7 +3270,7 @@ RTLFUNC(FileAttr) else { INT16 nChannel = rPar.Get(1)->GetInteger(); -// nChannel--; +// nChannel--; SbiIoSystem* pIO = pINST->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) @@ -3365,7 +3365,7 @@ RTLFUNC(Seek) return; } INT16 nChannel = rPar.Get(1)->GetInteger(); -// nChannel--; +// nChannel--; SbiIoSystem* pIO = pINST->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) @@ -3380,7 +3380,7 @@ RTLFUNC(Seek) ULONG nPos = pStrm->Tell(); if( pSbStrm->IsRandom() ) nPos = nPos / pSbStrm->GetBlockLen(); - nPos++; // Basic zaehlt ab 1 + nPos++; // Basic zaehlt ab 1 rPar.Get(0)->PutLong( (INT32)nPos ); } else // Seek-Statement @@ -3458,7 +3458,7 @@ RTLFUNC(Rnd) // // WindowStyles (VBA-kompatibel): // 2 == Minimized -// 3 == Maximized +// 3 == Maximized // 10 == Full-Screen (Textmodus-Anwendungen OS/2, WIN95, WNT) // // !!!HACK der WindowStyle wird im Creator an Application::StartApp @@ -4060,7 +4060,7 @@ RTLFUNC(RGB) return; } - ULONG nRed = rPar.Get(1)->GetInteger() & 0xFF; + ULONG nRed = rPar.Get(1)->GetInteger() & 0xFF; ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF; ULONG nBlue = rPar.Get(3)->GetInteger() & 0xFF; ULONG nRGB; @@ -4223,7 +4223,7 @@ RTLFUNC(StrConv) pArray->unoAddDim( 0, -1 ); } - for( USHORT i=0; i< nArraySize; i++) + for( USHORT i=0; i< nArraySize; i++) { SbxVariable* pNew = new SbxVariable( SbxBYTE ); pNew->PutByte(*pChar); @@ -4385,7 +4385,7 @@ RTLFUNC(MsgBox) static const WinBits nStyleMap[] = { - WB_OK, // MB_OK + WB_OK, // MB_OK WB_OK_CANCEL, // MB_OKCANCEL WB_ABORT_RETRY_IGNORE, // MB_ABORTRETRYIGNORE WB_YES_NO_CANCEL, // MB_YESNOCANCEL @@ -4478,7 +4478,7 @@ RTLFUNC(MsgBox) { nMappedRet = nRet; if( nMappedRet == 0 ) - nMappedRet = 3; // Abort + nMappedRet = 3; // Abort } else nMappedRet = nButtonMap[ nRet ]; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 73c40c0cbeb6..e03833ea1895 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1183,7 +1183,7 @@ RTLFUNC(Environ) rPar.Get(0)->PutString( aResult ); return; } - lpszEnv += lstrlen( lpszEnv ) + 1; // Next Enviroment-String + lpszEnv += lstrlen( lpszEnv ) + 1; // Next Enviroment-String } #else ByteString aByteStr( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() ); @@ -1564,7 +1564,7 @@ RTLFUNC(Join) if( pArr ) { if( pArr->GetDims() != 1 ) - StarBASIC::Error( SbERR_WRONG_DIMS ); // Syntax Error?! + StarBASIC::Error( SbERR_WRONG_DIMS ); // Syntax Error?! String aDelim; if( nParCount == 3 ) @@ -1775,14 +1775,14 @@ INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay { Date aRefDate( 1,1,1900 ); long nDays = (long) aDate; - nDays -= 2; // normieren: 1.1.1900 => 0 + nDays -= 2; // normieren: 1.1.1900 => 0 aRefDate += nDays; DayOfWeek aDay = aRefDate.GetDayOfWeek(); INT16 nDay; if ( aDay != SUNDAY ) nDay = (INT16)aDay + 2; else - nDay = 1; // 1==Sonntag + nDay = 1; // 1==Sonntag // #117253 Optional 2. parameter "firstdayofweek" if( bFirstDayParam ) @@ -1849,10 +1849,10 @@ enum Interval struct IntervalInfo { - Interval meInterval; + Interval meInterval; const char* mpStringCode; - double mdValue; - bool mbSimple; + double mdValue; + bool mbSimple; IntervalInfo( Interval eInterval, const char* pStringCode, double dValue, bool bSimple ) : meInterval( eInterval ) @@ -1864,16 +1864,16 @@ struct IntervalInfo static IntervalInfo pIntervalTable[] = { - IntervalInfo( INTERVAL_YYYY, "yyyy", 0.0, false ), // Year - IntervalInfo( INTERVAL_Q, "q", 0.0, false ), // Quarter - IntervalInfo( INTERVAL_M, "m", 0.0, false ), // Month - IntervalInfo( INTERVAL_Y, "y", 1.0, true ), // Day of year - IntervalInfo( INTERVAL_D, "d", 1.0, true ), // Day - IntervalInfo( INTERVAL_W, "w", 1.0, true ), // Weekday - IntervalInfo( INTERVAL_WW, "ww", 7.0, true ), // Week - IntervalInfo( INTERVAL_H, "h", (1.0 / 24.0), true ), // Hour - IntervalInfo( INTERVAL_N, "n", (1.0 / 1440.0), true), // Minute - IntervalInfo( INTERVAL_S, "s", (1.0 / 86400.0), true ), // Second + IntervalInfo( INTERVAL_YYYY, "yyyy", 0.0, false ), // Year + IntervalInfo( INTERVAL_Q, "q", 0.0, false ), // Quarter + IntervalInfo( INTERVAL_M, "m", 0.0, false ), // Month + IntervalInfo( INTERVAL_Y, "y", 1.0, true ), // Day of year + IntervalInfo( INTERVAL_D, "d", 1.0, true ), // Day + IntervalInfo( INTERVAL_W, "w", 1.0, true ), // Weekday + IntervalInfo( INTERVAL_WW, "ww", 7.0, true ), // Week + IntervalInfo( INTERVAL_H, "h", (1.0 / 24.0), true ), // Hour + IntervalInfo( INTERVAL_N, "n", (1.0 / 1440.0), true), // Minute + IntervalInfo( INTERVAL_S, "s", (1.0 / 86400.0), true ), // Second IntervalInfo( INTERVAL_NONE, NULL, 0.0, false ) }; @@ -2112,7 +2112,7 @@ RTLFUNC(DateDiff) double dDays2 = floor( dDate2 ); if( pInfo->meInterval == INTERVAL_WW ) { - INT16 nFirstDay = 1; // Default + INT16 nFirstDay = 1; // Default if( nParCount >= 5 ) { nFirstDay = rPar.Get(4)->GetInteger(); @@ -2202,10 +2202,10 @@ double implGetDateOfFirstDayInFirstWeek if( nFirstDay == 0 ) nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 ); - INT16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default + INT16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default if( nFirstWeek == 0 ) { - nFirstWeekMinDays = xCalendar->getMinimumNumberOfDaysForFirstWeek(); + nFirstWeekMinDays = xCalendar->getMinimumNumberOfDaysForFirstWeek(); if( nFirstWeekMinDays == 1 ) { nFirstWeekMinDays = 0; @@ -2217,9 +2217,9 @@ double implGetDateOfFirstDayInFirstWeek nFirstWeek = 3; } else if( nFirstWeek == 2 ) - nFirstWeekMinDays = 4; // vbFirstFourDays + nFirstWeekMinDays = 4; // vbFirstFourDays else if( nFirstWeek == 3 ) - nFirstWeekMinDays = 7; // vbFirstFourDays + nFirstWeekMinDays = 7; // vbFirstFourDays double dBaseDate; implDateSerial( nYear, 1, 1, dBaseDate ); @@ -2298,7 +2298,7 @@ RTLFUNC(DatePart) case INTERVAL_W: { bool bFirstDay = false; - INT16 nFirstDay = 1; // Default + INT16 nFirstDay = 1; // Default if( nParCount >= 4 ) { nFirstDay = rPar.Get(3)->GetInteger(); @@ -2309,11 +2309,11 @@ RTLFUNC(DatePart) } case INTERVAL_WW: { - INT16 nFirstDay = 1; // Default + INT16 nFirstDay = 1; // Default if( nParCount >= 4 ) nFirstDay = rPar.Get(3)->GetInteger(); - INT16 nFirstWeek = 1; // Default + INT16 nFirstWeek = 1; // Default if( nParCount == 5 ) nFirstWeek = rPar.Get(4)->GetInteger(); @@ -2421,7 +2421,7 @@ RTLFUNC(FormatDateTime) pFormatter = pINST->GetNumberFormatter(); else { - sal_uInt32 n; // Dummy + sal_uInt32 n; // Dummy SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n ); } diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx index 42b0dd0dddca..44f87c16fb6d 100644 --- a/basic/source/runtime/props.cxx +++ b/basic/source/runtime/props.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ RTLFUNC(Erl) { (void)pBasic; (void)bWrite; - + rPar.Get( 0 )->PutLong( StarBASIC::GetErl() ); } @@ -51,7 +51,7 @@ RTLFUNC(Err) { (void)pBasic; (void)bWrite; - + if( SbiRuntime::isVBAEnabled() ) { rPar.Get( 0 )->PutObject( SbxErrObject::getErrObject() ); @@ -73,7 +73,7 @@ RTLFUNC(False) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutBool( FALSE ); } @@ -81,14 +81,14 @@ RTLFUNC(Empty) { (void)pBasic; (void)bWrite; - (void)rPar; + (void)rPar; } RTLFUNC(Nothing) { (void)pBasic; (void)bWrite; - + // liefert eine leere Objekt-Variable. rPar.Get( 0 )->PutObject( NULL ); } @@ -97,7 +97,7 @@ RTLFUNC(Null) { (void)pBasic; (void)bWrite; - + // liefert eine leere Objekt-Variable. rPar.Get( 0 )->PutNull(); } @@ -106,7 +106,7 @@ RTLFUNC(PI) { (void)pBasic; (void)bWrite; - + rPar.Get( 0 )->PutDouble( F_PI ); } @@ -114,7 +114,7 @@ RTLFUNC(True) { (void)pBasic; (void)bWrite; - + rPar.Get( 0 )->PutBool( TRUE ); } @@ -122,49 +122,49 @@ RTLFUNC(ATTR_NORMAL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(ATTR_READONLY) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(ATTR_HIDDEN) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(ATTR_SYSTEM) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4); } RTLFUNC(ATTR_VOLUME) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(8); } RTLFUNC(ATTR_DIRECTORY) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(16); } RTLFUNC(ATTR_ARCHIVE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(32); } @@ -172,63 +172,63 @@ RTLFUNC(V_EMPTY) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(V_NULL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(V_INTEGER) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(V_LONG) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } RTLFUNC(V_SINGLE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4); } RTLFUNC(V_DOUBLE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(5); } RTLFUNC(V_CURRENCY) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(6); } RTLFUNC(V_DATE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(7); } RTLFUNC(V_STRING) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(8); } @@ -236,105 +236,105 @@ RTLFUNC(MB_OK) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(MB_OKCANCEL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(MB_ABORTRETRYIGNORE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(MB_YESNOCANCEL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } RTLFUNC(MB_YESNO) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4); } RTLFUNC(MB_RETRYCANCEL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(5); } RTLFUNC(MB_ICONSTOP) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(16); } RTLFUNC(MB_ICONQUESTION) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(32); } RTLFUNC(MB_ICONEXCLAMATION) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(48); } RTLFUNC(MB_ICONINFORMATION) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(64); } RTLFUNC(MB_DEFBUTTON1) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(MB_DEFBUTTON2) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(256); } RTLFUNC(MB_DEFBUTTON3) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(512); } RTLFUNC(MB_APPLMODAL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(MB_SYSTEMMODAL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4096); } @@ -342,7 +342,7 @@ RTLFUNC(IDOK) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } @@ -350,35 +350,35 @@ RTLFUNC(IDCANCEL) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(IDABORT) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } RTLFUNC(IDRETRY) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4); } RTLFUNC(IDYES) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(6); } RTLFUNC(IDNO) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(7); } @@ -386,21 +386,21 @@ RTLFUNC(CF_TEXT) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(CF_BITMAP) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(CF_METAFILEPICT) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } @@ -408,266 +408,266 @@ RTLFUNC(TYP_AUTHORFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(7); } RTLFUNC(TYP_CHAPTERFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(4); } RTLFUNC(TYP_CONDTXTFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(27); } RTLFUNC(TYP_DATEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(TYP_DBFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(19); } RTLFUNC(TYP_DBNAMEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } RTLFUNC(TYP_DBNEXTSETFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(24); } RTLFUNC(TYP_DBNUMSETFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(25); } RTLFUNC(TYP_DBSETNUMBERFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(26); } RTLFUNC(TYP_DDEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(14); } RTLFUNC(TYP_DOCINFOFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(18); } RTLFUNC(TYP_DOCSTATFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(6); } RTLFUNC(TYP_EXTUSERFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(30); } RTLFUNC(TYP_FILENAMEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(TYP_FIXDATEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(31); } RTLFUNC(TYP_FIXTIMEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(32); } RTLFUNC(TYP_FORMELFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(10); } RTLFUNC(TYP_GETFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(9); } RTLFUNC(TYP_GETREFFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(13); } RTLFUNC(TYP_HIDDENPARAFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(17); } RTLFUNC(TYP_HIDDENTXTFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(11); } RTLFUNC(TYP_INPUTFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(16); } RTLFUNC(TYP_MACROFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(15); } RTLFUNC(TYP_NEXTPAGEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(28); } RTLFUNC(TYP_PAGENUMBERFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(5); } RTLFUNC(TYP_POSTITFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(21); } RTLFUNC(TYP_PREVPAGEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(29); } RTLFUNC(TYP_SEQFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(23); } RTLFUNC(TYP_SETFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(8); } RTLFUNC(TYP_SETINPFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(33); } RTLFUNC(TYP_SETREFFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(12); } RTLFUNC(TYP_TEMPLNAMEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(22); } RTLFUNC(TYP_TIMEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(TYP_USERFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(20); } RTLFUNC(TYP_USRINPFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(34); } RTLFUNC(TYP_SETREFPAGEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(35); } RTLFUNC(TYP_GETREFPAGEFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(36); } RTLFUNC(TYP_INTERNETFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(37); } @@ -675,21 +675,21 @@ RTLFUNC(SET_ON) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(SET_OFF) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(TOGGLE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } @@ -697,21 +697,21 @@ RTLFUNC(FRAMEANCHORPAGE) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(FRAMEANCHORPARA) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(14); } RTLFUNC(FRAMEANCHORCHAR) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(15); } @@ -719,21 +719,21 @@ RTLFUNC(CLEAR_ALLTABS) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(CLEAR_TAB) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(SET_TAB) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } @@ -741,28 +741,28 @@ RTLFUNC(LINEPROP) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(0); } RTLFUNC(LINE_1) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(1); } RTLFUNC(LINE_15) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(2); } RTLFUNC(LINE_2) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(3); } @@ -770,7 +770,7 @@ RTLFUNC(TYP_JUMPEDITFLD) { (void)pBasic; (void)bWrite; - + rPar.Get(0)->PutInteger(38); } diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx index 9eb6f495f433..10b866c827da 100644 --- a/basic/source/runtime/rtlproto.hxx +++ b/basic/source/runtime/rtlproto.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,8 +28,8 @@ #include <basic/sbstar.hxx> -#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) -#define RTLNAME( name ) &SbRtl_##name +#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) +#define RTLNAME( name ) &SbRtl_##name typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, BOOL bWrite ); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index f09aadfe3f70..450388b7e856 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -87,13 +87,13 @@ BOOL StarBASIC::isVBAEnabled() } -struct SbiArgvStack { // Argv stack: - SbiArgvStack* pNext; // Stack Chain - SbxArrayRef refArgv; // Argv - short nArgc; // Argc +struct SbiArgvStack { // Argv stack: + SbiArgvStack* pNext; // Stack Chain + SbxArrayRef refArgv; // Argv + short nArgc; // Argc }; -SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // Alle Opcodes ohne Operanden +SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // Alle Opcodes ohne Operanden &SbiRuntime::StepNOP, &SbiRuntime::StepEXP, &SbiRuntime::StepMUL, @@ -120,40 +120,40 @@ SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // Alle Opcodes ohne Operanden &SbiRuntime::StepLIKE, &SbiRuntime::StepIS, // Laden/speichern - &SbiRuntime::StepARGC, // neuen Argv einrichten - &SbiRuntime::StepARGV, // TOS ==> aktueller Argv - &SbiRuntime::StepINPUT, // Input ==> TOS - &SbiRuntime::StepLINPUT, // Line Input ==> TOS + &SbiRuntime::StepARGC, // neuen Argv einrichten + &SbiRuntime::StepARGV, // TOS ==> aktueller Argv + &SbiRuntime::StepINPUT, // Input ==> TOS + &SbiRuntime::StepLINPUT, // Line Input ==> TOS &SbiRuntime::StepGET, // TOS anfassen &SbiRuntime::StepSET, // Speichern Objekt TOS ==> TOS-1 - &SbiRuntime::StepPUT, // TOS ==> TOS-1 - &SbiRuntime::StepPUTC, // TOS ==> TOS-1, dann ReadOnly - &SbiRuntime::StepDIM, // DIM - &SbiRuntime::StepREDIM, // REDIM - &SbiRuntime::StepREDIMP, // REDIM PRESERVE - &SbiRuntime::StepERASE, // TOS loeschen + &SbiRuntime::StepPUT, // TOS ==> TOS-1 + &SbiRuntime::StepPUTC, // TOS ==> TOS-1, dann ReadOnly + &SbiRuntime::StepDIM, // DIM + &SbiRuntime::StepREDIM, // REDIM + &SbiRuntime::StepREDIMP, // REDIM PRESERVE + &SbiRuntime::StepERASE, // TOS loeschen // Verzweigen - &SbiRuntime::StepSTOP, // Programmende - &SbiRuntime::StepINITFOR, // FOR-Variable initialisieren - &SbiRuntime::StepNEXT, // FOR-Variable inkrementieren - &SbiRuntime::StepCASE, // Anfang CASE - &SbiRuntime::StepENDCASE, // Ende CASE - &SbiRuntime::StepSTDERROR, // Standard-Fehlerbehandlung - &SbiRuntime::StepNOERROR, // keine Fehlerbehandlung - &SbiRuntime::StepLEAVE, // UP verlassen + &SbiRuntime::StepSTOP, // Programmende + &SbiRuntime::StepINITFOR, // FOR-Variable initialisieren + &SbiRuntime::StepNEXT, // FOR-Variable inkrementieren + &SbiRuntime::StepCASE, // Anfang CASE + &SbiRuntime::StepENDCASE, // Ende CASE + &SbiRuntime::StepSTDERROR, // Standard-Fehlerbehandlung + &SbiRuntime::StepNOERROR, // keine Fehlerbehandlung + &SbiRuntime::StepLEAVE, // UP verlassen // E/A - &SbiRuntime::StepCHANNEL, // TOS = Kanalnummer - &SbiRuntime::StepPRINT, // print TOS - &SbiRuntime::StepPRINTF, // print TOS in field - &SbiRuntime::StepWRITE, // write TOS - &SbiRuntime::StepRENAME, // Rename Tos+1 to Tos - &SbiRuntime::StepPROMPT, // Input Prompt aus TOS definieren - &SbiRuntime::StepRESTART, // Set restart point - &SbiRuntime::StepCHANNEL0, // E/A-Kanal 0 einstellen - &SbiRuntime::StepEMPTY, // Leeren Ausdruck auf Stack - &SbiRuntime::StepERROR, // TOS = Fehlercode - &SbiRuntime::StepLSET, // Speichern Objekt TOS ==> TOS-1 - &SbiRuntime::StepRSET, // Speichern Objekt TOS ==> TOS-1 + &SbiRuntime::StepCHANNEL, // TOS = Kanalnummer + &SbiRuntime::StepPRINT, // print TOS + &SbiRuntime::StepPRINTF, // print TOS in field + &SbiRuntime::StepWRITE, // write TOS + &SbiRuntime::StepRENAME, // Rename Tos+1 to Tos + &SbiRuntime::StepPROMPT, // Input Prompt aus TOS definieren + &SbiRuntime::StepRESTART, // Set restart point + &SbiRuntime::StepCHANNEL0, // E/A-Kanal 0 einstellen + &SbiRuntime::StepEMPTY, // Leeren Ausdruck auf Stack + &SbiRuntime::StepERROR, // TOS = Fehlercode + &SbiRuntime::StepLSET, // Speichern Objekt TOS ==> TOS-1 + &SbiRuntime::StepRSET, // Speichern Objekt TOS ==> TOS-1 &SbiRuntime::StepREDIMP_ERASE,// Copy array object for REDIMP &SbiRuntime::StepINITFOREACH,// Init for each loop &SbiRuntime::StepVBASET,// vba-like set statement @@ -162,59 +162,59 @@ SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // Alle Opcodes ohne Operanden &SbiRuntime::StepBYVAL, // access TOS as array }; -SbiRuntime::pStep1 SbiRuntime::aStep1[] = { // Alle Opcodes mit einem Operanden - &SbiRuntime::StepLOADNC, // Laden einer numerischen Konstanten (+ID) - &SbiRuntime::StepLOADSC, // Laden einer Stringkonstanten (+ID) - &SbiRuntime::StepLOADI, // Immediate Load (+Wert) - &SbiRuntime::StepARGN, // Speichern eines named Args in Argv (+StringID) - &SbiRuntime::StepPAD, // String auf feste Laenge bringen (+Laenge) +SbiRuntime::pStep1 SbiRuntime::aStep1[] = { // Alle Opcodes mit einem Operanden + &SbiRuntime::StepLOADNC, // Laden einer numerischen Konstanten (+ID) + &SbiRuntime::StepLOADSC, // Laden einer Stringkonstanten (+ID) + &SbiRuntime::StepLOADI, // Immediate Load (+Wert) + &SbiRuntime::StepARGN, // Speichern eines named Args in Argv (+StringID) + &SbiRuntime::StepPAD, // String auf feste Laenge bringen (+Laenge) // Verzweigungen - &SbiRuntime::StepJUMP, // Sprung (+Target) - &SbiRuntime::StepJUMPT, // TOS auswerten), bedingter Sprung (+Target) - &SbiRuntime::StepJUMPF, // TOS auswerten), bedingter Sprung (+Target) - &SbiRuntime::StepONJUMP, // TOS auswerten), Sprung in JUMP-Tabelle (+MaxVal) - &SbiRuntime::StepGOSUB, // UP-Aufruf (+Target) - &SbiRuntime::StepRETURN, // UP-Return (+0 oder Target) - &SbiRuntime::StepTESTFOR, // FOR-Variable testen), inkrementieren (+Endlabel) - &SbiRuntime::StepCASETO, // Tos+1 <= Case <= Tos), 2xremove (+Target) - &SbiRuntime::StepERRHDL, // Fehler-Handler (+Offset) - &SbiRuntime::StepRESUME, // Resume nach Fehlern (+0 or 1 or Label) + &SbiRuntime::StepJUMP, // Sprung (+Target) + &SbiRuntime::StepJUMPT, // TOS auswerten), bedingter Sprung (+Target) + &SbiRuntime::StepJUMPF, // TOS auswerten), bedingter Sprung (+Target) + &SbiRuntime::StepONJUMP, // TOS auswerten), Sprung in JUMP-Tabelle (+MaxVal) + &SbiRuntime::StepGOSUB, // UP-Aufruf (+Target) + &SbiRuntime::StepRETURN, // UP-Return (+0 oder Target) + &SbiRuntime::StepTESTFOR, // FOR-Variable testen), inkrementieren (+Endlabel) + &SbiRuntime::StepCASETO, // Tos+1 <= Case <= Tos), 2xremove (+Target) + &SbiRuntime::StepERRHDL, // Fehler-Handler (+Offset) + &SbiRuntime::StepRESUME, // Resume nach Fehlern (+0 or 1 or Label) // E/A - &SbiRuntime::StepCLOSE, // (+Kanal/0) - &SbiRuntime::StepPRCHAR, // (+char) + &SbiRuntime::StepCLOSE, // (+Kanal/0) + &SbiRuntime::StepPRCHAR, // (+char) // Verwaltung - &SbiRuntime::StepSETCLASS, // Set + Klassennamen testen (+StringId) - &SbiRuntime::StepTESTCLASS, // Check TOS class (+StringId) - &SbiRuntime::StepLIB, // Lib fuer Declare-Call (+StringId) - &SbiRuntime::StepBASED, // TOS wird um BASE erhoeht, BASE davor gepusht - &SbiRuntime::StepARGTYP, // Letzten Parameter in Argv konvertieren (+Typ) + &SbiRuntime::StepSETCLASS, // Set + Klassennamen testen (+StringId) + &SbiRuntime::StepTESTCLASS, // Check TOS class (+StringId) + &SbiRuntime::StepLIB, // Lib fuer Declare-Call (+StringId) + &SbiRuntime::StepBASED, // TOS wird um BASE erhoeht, BASE davor gepusht + &SbiRuntime::StepARGTYP, // Letzten Parameter in Argv konvertieren (+Typ) &SbiRuntime::StepVBASETCLASS,// vba-like set statement }; SbiRuntime::pStep2 SbiRuntime::aStep2[] = {// Alle Opcodes mit zwei Operanden - &SbiRuntime::StepRTL, // Laden aus RTL (+StringID+Typ) - &SbiRuntime::StepFIND, // Laden (+StringID+Typ) - &SbiRuntime::StepELEM, // Laden Element (+StringID+Typ) - &SbiRuntime::StepPARAM, // Parameter (+Offset+Typ) + &SbiRuntime::StepRTL, // Laden aus RTL (+StringID+Typ) + &SbiRuntime::StepFIND, // Laden (+StringID+Typ) + &SbiRuntime::StepELEM, // Laden Element (+StringID+Typ) + &SbiRuntime::StepPARAM, // Parameter (+Offset+Typ) // Verzweigen - &SbiRuntime::StepCALL, // Declare-Call (+StringID+Typ) - &SbiRuntime::StepCALLC, // CDecl-Declare-Call (+StringID+Typ) - &SbiRuntime::StepCASEIS, // Case-Test (+Test-Opcode+False-Target) + &SbiRuntime::StepCALL, // Declare-Call (+StringID+Typ) + &SbiRuntime::StepCALLC, // CDecl-Declare-Call (+StringID+Typ) + &SbiRuntime::StepCASEIS, // Case-Test (+Test-Opcode+False-Target) // Verwaltung - &SbiRuntime::StepSTMNT, // Beginn eines Statements (+Line+Col) + &SbiRuntime::StepSTMNT, // Beginn eines Statements (+Line+Col) // E/A - &SbiRuntime::StepOPEN, // (+SvStreamFlags+Flags) + &SbiRuntime::StepOPEN, // (+SvStreamFlags+Flags) // Objekte - &SbiRuntime::StepLOCAL, // Lokale Variable definieren (+StringId+Typ) - &SbiRuntime::StepPUBLIC, // Modulglobale Variable (+StringID+Typ) - &SbiRuntime::StepGLOBAL, // Globale Variable definieren (+StringID+Typ) - &SbiRuntime::StepCREATE, // Objekt kreieren (+StringId+StringId) + &SbiRuntime::StepLOCAL, // Lokale Variable definieren (+StringId+Typ) + &SbiRuntime::StepPUBLIC, // Modulglobale Variable (+StringID+Typ) + &SbiRuntime::StepGLOBAL, // Globale Variable definieren (+StringID+Typ) + &SbiRuntime::StepCREATE, // Objekt kreieren (+StringId+StringId) &SbiRuntime::StepSTATIC, // Statische Variable (+StringId+StringId) &SbiRuntime::StepTCREATE, // User Defined Objekte (+StringId+StringId) &SbiRuntime::StepDCREATE, // Objekt-Array kreieren (+StringID+StringID) &SbiRuntime::StepGLOBAL_P, // Globale Variable definieren, die beim Neustart // von Basic nicht ueberschrieben wird (+StringID+Typ) - &SbiRuntime::StepFIND_G, // Sucht globale Variable mit Spezialbehandlung wegen _GLOBAL_P + &SbiRuntime::StepFIND_G, // Sucht globale Variable mit Spezialbehandlung wegen _GLOBAL_P &SbiRuntime::StepDCREATE_REDIMP, // Objekt-Array redimensionieren (+StringID+StringID) &SbiRuntime::StepFIND_CM, // Search inside a class module (CM) to enable global search in time &SbiRuntime::StepPUBLIC_P, // Search inside a class module (CM) to enable global search in time @@ -223,15 +223,15 @@ SbiRuntime::pStep2 SbiRuntime::aStep2[] = {// Alle Opcodes mit zwei Operanden ////////////////////////////////////////////////////////////////////////// -// SbiRTLData // +// SbiRTLData // ////////////////////////////////////////////////////////////////////////// SbiRTLData::SbiRTLData() { - pDir = 0; - nDirFlags = 0; - nCurDirPos = 0; - pWildCard = NULL; + pDir = 0; + nDirFlags = 0; + nCurDirPos = 0; + pWildCard = NULL; } SbiRTLData::~SbiRTLData() @@ -242,7 +242,7 @@ SbiRTLData::~SbiRTLData() } ////////////////////////////////////////////////////////////////////////// -// SbiInstance // +// SbiInstance // ////////////////////////////////////////////////////////////////////////// // 16.10.96: #31460 Neues Konzept fuer StepInto/Over/Out @@ -264,20 +264,20 @@ void SbiInstance::CalcBreakCallLevel( USHORT nFlags ) switch( nFlags ) { case SbDEBUG_STEPINTO: - nRet = nCallLvl + 1; // CallLevel+1 wird auch angehalten + nRet = nCallLvl + 1; // CallLevel+1 wird auch angehalten break; case SbDEBUG_STEPOVER | SbDEBUG_STEPINTO: - nRet = nCallLvl; // Aktueller CallLevel wird angehalten + nRet = nCallLvl; // Aktueller CallLevel wird angehalten break; case SbDEBUG_STEPOUT: - nRet = nCallLvl - 1; // Kleinerer CallLevel wird angehalten + nRet = nCallLvl - 1; // Kleinerer CallLevel wird angehalten break; case SbDEBUG_CONTINUE: // Basic-IDE liefert 0 statt SbDEBUG_CONTINUE, also auch default=continue default: - nRet = 0; // CallLevel ist immer >0 -> kein StepPoint + nRet = 0; // CallLevel ist immer >0 -> kein StepPoint } - nBreakCallLvl = nRet; // Ergebnis uebernehmen + nBreakCallLvl = nRet; // Ergebnis uebernehmen } SbiInstance::SbiInstance( StarBASIC* p ) @@ -287,12 +287,12 @@ SbiInstance::SbiInstance( StarBASIC* p ) pRun = NULL; pIosys = new SbiIoSystem; pDdeCtrl = new SbiDdeControl; - pDllMgr = 0; // on demand + pDllMgr = 0; // on demand pNumberFormatter = 0; // on demand nCallLvl = 0; nBreakCallLvl = 0; - nErr = - nErl = 0; + nErr = + nErl = 0; bReschedule = TRUE; bCompatibility = FALSE; } @@ -540,7 +540,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth ) } ////////////////////////////////////////////////////////////////////////// -// SbiInstance // +// SbiInstance // ////////////////////////////////////////////////////////////////////////// // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes) @@ -549,8 +549,8 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), mpExtCaller(0), m_nLastTime(0) { - nFlags = pe ? pe->GetDebugFlags() : 0; - pIosys = pInst->pIosys; + nFlags = pe ? pe->GetDebugFlags() : 0; + pIosys = pInst->pIosys; pArgvStk = NULL; pGosubStk = NULL; pForStk = NULL; @@ -565,15 +565,15 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) bError = TRUE; bInError = FALSE; bBlocked = FALSE; - nLine = 0; - nCol1 = 0; - nCol2 = 0; + nLine = 0; + nCol1 = 0; + nCol2 = 0; nExprLvl = 0; nArgc = 0; - nError = 0; + nError = 0; nGosubLvl = 0; nForLvl = 0; - nOps = 0; + nOps = 0; refExprStk = new SbxArray; SetVBAEnabled( pMod->IsVBACompat() ); #if defined GCC @@ -760,7 +760,7 @@ BOOL SbiRuntime::Step() // SBX-Fehler aufgetreten? SbError nSbError = SbxBase::GetError(); - Error( ERRCODE_TOERROR(nSbError) ); // Warnings rausfiltern + Error( ERRCODE_TOERROR(nSbError) ); // Warnings rausfiltern // AB 13.2.1997, neues Error-Handling: // ACHTUNG: Hier kann nError auch dann gesetzt sein, wenn !nSbError, @@ -795,9 +795,9 @@ BOOL SbiRuntime::Step() { bInError = TRUE; - if( !bError ) // On Error Resume Next + if( !bError ) // On Error Resume Next StepRESUME( 1 ); - else if( pError ) // On Error Goto ... + else if( pError ) // On Error Goto ... pCode = pError; else bLetParentHandleThis = true; @@ -953,7 +953,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg ) ////////////////////////////////////////////////////////////////////////// // -// Parameter, Locals, Caller +// Parameter, Locals, Caller // ////////////////////////////////////////////////////////////////////////// @@ -974,7 +974,7 @@ SbxArray* SbiRuntime::GetParams() ////////////////////////////////////////////////////////////////////////// // -// Stacks +// Stacks // ////////////////////////////////////////////////////////////////////////// @@ -1054,7 +1054,7 @@ void SbiRuntime::TOSMakeTemp() p = new SbxVariable( *pDflt ); p->SetFlag( SBX_READWRITE ); refExprStk->Put( p, nExprLvl - 1 ); -// return; +// return; } else if( p->GetRefCount() != 1 ) @@ -1247,16 +1247,16 @@ void SbiRuntime::ClearForStack() ////////////////////////////////////////////////////////////////////////// // -// DLL-Aufrufe +// DLL-Aufrufe // ////////////////////////////////////////////////////////////////////////// void SbiRuntime::DllCall - ( const String& aFuncName, // Funktionsname - const String& aDLLName, // Name der DLL - SbxArray* pArgs, // Parameter (ab Index 1, kann NULL sein) - SbxDataType eResType, // Returnwert - BOOL bCDecl ) // TRUE: nach C-Konventionen + ( const String& aFuncName, // Funktionsname + const String& aDLLName, // Name der DLL + SbxArray* pArgs, // Parameter (ab Index 1, kann NULL sein) + SbxDataType eResType, // Returnwert + BOOL bCDecl ) // TRUE: nach C-Konventionen { // No DllCall for "virtual" portal users if( needSecurityRestrictions() ) diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index f5f54dad8515..4cf212031d5a 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -50,7 +50,7 @@ #define _LVALUE _BWRITE // kann as Lvalue verwendet werden #define _READWRITE 0x0300 // beides #define _OPT 0x0400 // Parameter ist optional -#define _CONST 0x0800 // Property ist const +#define _CONST 0x0800 // Property ist const #define _METHOD 0x3000 // Masken-Bits fuer eine Methode #define _PROPERTY 0x4000 // Masken-Bit fuer eine Property #define _OBJECT 0x8000 // Masken-Bit fuer ein Objekt @@ -61,14 +61,14 @@ #define _ROPROP 0x4100 // Maske Read Only-Property #define _WOPROP 0x4200 // Maske Write Only-Property #define _RWPROP 0x4300 // Maske Read/Write-Property -#define _CPROP 0x4900 // Maske fuer Konstante +#define _CPROP 0x4900 // Maske fuer Konstante struct Methods { const char* pName; // Name des Eintrags SbxDataType eType; // Datentyp short nArgs; // Argumente und Flags RtlCall pFunc; // Function Pointer - USHORT nHash; // Hashcode + USHORT nHash; // Hashcode }; struct StringHashCode @@ -113,10 +113,10 @@ public: static Methods aMethods[] = { { "AboutStarBasic", SbxNULL, 1 | _FUNCTION, RTLNAME(AboutStarBasic),0 }, - { "Name", SbxSTRING, 0,NULL,0 }, + { "Name", SbxSTRING, 0,NULL,0 }, { "Abs", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Abs),0 }, { "number", SbxDOUBLE, 0,NULL,0 }, -{ "Array", SbxOBJECT, _FUNCTION, RTLNAME(Array),0 }, +{ "Array", SbxOBJECT, _FUNCTION, RTLNAME(Array),0 }, { "Asc", SbxLONG, 1 | _FUNCTION, RTLNAME(Asc),0 }, { "string", SbxSTRING, 0,NULL,0 }, { "AscW", SbxLONG, 1 | _FUNCTION | _COMPTMASK, RTLNAME(Asc),0}, @@ -153,14 +153,14 @@ static Methods aMethods[] = { { "expression", SbxVARIANT, 0,NULL,0 }, { "CF_BITMAP", SbxINTEGER, _CPROP, RTLNAME(CF_BITMAP),0 }, { "CF_METAFILEPICT",SbxINTEGER, _CPROP, RTLNAME(CF_METAFILEPICT),0 }, -{ "CF_TEXT", SbxINTEGER, _CPROP, RTLNAME(CF_TEXT),0 }, +{ "CF_TEXT", SbxINTEGER, _CPROP, RTLNAME(CF_TEXT),0 }, { "ChDir", SbxNULL, 1 | _FUNCTION, RTLNAME(ChDir),0 }, { "string", SbxSTRING, 0,NULL,0 }, { "ChDrive", SbxNULL, 1 | _FUNCTION, RTLNAME(ChDrive),0 }, { "string", SbxSTRING, 0,NULL,0 }, -{ "Choose", SbxVARIANT, 2 | _FUNCTION, RTLNAME(Choose),0 }, - { "Index", SbxINTEGER, 0,NULL,0 }, +{ "Choose", SbxVARIANT, 2 | _FUNCTION, RTLNAME(Choose),0 }, + { "Index", SbxINTEGER, 0,NULL,0 }, { "Expression", SbxVARIANT, 0,NULL,0 }, { "Chr", SbxSTRING, 1 | _FUNCTION, RTLNAME(Chr),0 }, @@ -171,11 +171,11 @@ static Methods aMethods[] = { { "CInt", SbxINTEGER, 1 | _FUNCTION, RTLNAME(CInt),0 }, { "expression", SbxVARIANT, 0,NULL,0 }, { "CLEAR_ALLTABS", SbxINTEGER, _CPROP, RTLNAME(CLEAR_ALLTABS),0 }, -{ "CLEAR_TAB", SbxINTEGER, _CPROP, RTLNAME(CLEAR_TAB),0 }, +{ "CLEAR_TAB", SbxINTEGER, _CPROP, RTLNAME(CLEAR_TAB),0 }, { "CLng", SbxLONG, 1 | _FUNCTION, RTLNAME(CLng),0 }, { "expression", SbxVARIANT, 0,NULL,0 }, -{ "CompatibilityMode", SbxBOOL, 1 | _FUNCTION, RTLNAME(CompatibilityMode),0}, - { "bEnable", SbxBOOL, 0,NULL,0 }, +{ "CompatibilityMode", SbxBOOL, 1 | _FUNCTION, RTLNAME(CompatibilityMode),0}, + { "bEnable", SbxBOOL, 0,NULL,0 }, { "ConvertFromUrl", SbxSTRING, 1 | _FUNCTION, RTLNAME(ConvertFromUrl),0 }, { "Url", SbxSTRING, 0,NULL,0 }, { "ConvertToUrl", SbxSTRING, 1 | _FUNCTION, RTLNAME(ConvertToUrl),0 }, @@ -219,19 +219,19 @@ static Methods aMethods[] = { { "Period", SbxDOUBLE, 0, NULL,0 }, { "Factor", SbxVARIANT, _OPT, NULL,0 }, { "Date", SbxDATE, _LFUNCTION,RTLNAME(Date),0 }, -{ "DateAdd", SbxDATE, 3 | _FUNCTION, RTLNAME(DateAdd),0 }, +{ "DateAdd", SbxDATE, 3 | _FUNCTION, RTLNAME(DateAdd),0 }, { "Interval", SbxSTRING, 0,NULL,0 }, - { "Number", SbxLONG, 0,NULL,0 }, - { "Date", SbxDATE, 0,NULL,0 }, + { "Number", SbxLONG, 0,NULL,0 }, + { "Date", SbxDATE, 0,NULL,0 }, { "DateDiff", SbxDOUBLE, 5 | _FUNCTION, RTLNAME(DateDiff),0 }, { "Interval", SbxSTRING, 0,NULL,0 }, - { "Date1", SbxDATE, 0,NULL,0 }, - { "Date2", SbxDATE, 0,NULL,0 }, + { "Date1", SbxDATE, 0,NULL,0 }, + { "Date2", SbxDATE, 0,NULL,0 }, { "Firstdayofweek" , SbxINTEGER, _OPT,NULL,0 }, { "Firstweekofyear", SbxINTEGER, _OPT,NULL,0 }, { "DatePart", SbxLONG, 4 | _FUNCTION, RTLNAME(DatePart),0 }, { "Interval", SbxSTRING, 0,NULL,0 }, - { "Date", SbxDATE, 0,NULL,0 }, + { "Date", SbxDATE, 0,NULL,0 }, { "Firstdayofweek" , SbxINTEGER, _OPT, NULL,0 }, { "Firstweekofyear", SbxINTEGER, _OPT, NULL,0 }, { "DateSerial", SbxDATE, 3 | _FUNCTION, RTLNAME(DateSerial),0 }, @@ -248,9 +248,9 @@ static Methods aMethods[] = { { "Ddeinitiate", SbxINTEGER, 2 | _FUNCTION, RTLNAME(DDEInitiate),0 }, { "Application", SbxSTRING, 0,NULL,0 }, { "Topic", SbxSTRING, 0,NULL,0 }, -{ "Ddepoke", SbxNULL, 3 | _FUNCTION, RTLNAME(DDEPoke),0 }, +{ "Ddepoke", SbxNULL, 3 | _FUNCTION, RTLNAME(DDEPoke),0 }, { "Channel", SbxLONG, 0,NULL,0 }, - { "Item", SbxSTRING, 0,NULL,0 }, + { "Item", SbxSTRING, 0,NULL,0 }, { "Data", SbxSTRING, 0,NULL,0 }, { "Dderequest", SbxSTRING, 2 | _FUNCTION, RTLNAME(DDERequest),0 }, { "Channel", SbxLONG, 0,NULL,0 }, @@ -258,21 +258,21 @@ static Methods aMethods[] = { { "Ddeterminate", SbxNULL, 1 | _FUNCTION, RTLNAME(DDETerminate),0 }, { "Channel", SbxLONG, 0,NULL,0 }, { "Ddeterminateall", SbxNULL, _FUNCTION, RTLNAME(DDETerminateAll),0 }, -{ "DimArray", SbxOBJECT, _FUNCTION, RTLNAME(DimArray),0 }, +{ "DimArray", SbxOBJECT, _FUNCTION, RTLNAME(DimArray),0 }, { "Dir", SbxSTRING, 2 | _FUNCTION, RTLNAME(Dir),0 }, { "FileSpec", SbxSTRING, _OPT, NULL,0 }, { "attrmask", SbxINTEGER, _OPT, NULL,0 }, -{ "DoEvents", SbxINTEGER, _FUNCTION, RTLNAME(DoEvents),0 }, +{ "DoEvents", SbxINTEGER, _FUNCTION, RTLNAME(DoEvents),0 }, { "DumpAllObjects", SbxEMPTY, 2 | _SUB, RTLNAME(DumpAllObjects),0 }, { "FileSpec", SbxSTRING, 0,NULL,0 }, - { "DumpAll", SbxINTEGER, _OPT, NULL,0 }, + { "DumpAll", SbxINTEGER, _OPT, NULL,0 }, { "Empty", SbxVARIANT, _CPROP, RTLNAME(Empty),0 }, { "EqualUnoObjects",SbxBOOL, 2 | _FUNCTION, RTLNAME(EqualUnoObjects),0 }, { "Variant", SbxVARIANT, 0,NULL,0 }, { "Variant", SbxVARIANT, 0,NULL,0 }, -{ "EnableReschedule", SbxNULL, 1 | _FUNCTION, RTLNAME(EnableReschedule),0}, - { "bEnable", SbxBOOL, 0,NULL,0 }, +{ "EnableReschedule", SbxNULL, 1 | _FUNCTION, RTLNAME(EnableReschedule),0}, + { "bEnable", SbxBOOL, 0,NULL,0 }, { "Environ", SbxSTRING, 1 | _FUNCTION, RTLNAME(Environ),0 }, { "Environmentstring",SbxSTRING, 0,NULL,0 }, { "EOF", SbxBOOL, 1 | _FUNCTION, RTLNAME(EOF),0 }, @@ -297,10 +297,10 @@ static Methods aMethods[] = { { "filename", SbxSTRING, 0,NULL,0 }, { "FileLen", SbxLONG, 1 | _FUNCTION, RTLNAME(FileLen),0 }, { "filename", SbxSTRING, 0,NULL,0 }, -{ "FindObject", SbxOBJECT, 1 | _FUNCTION, RTLNAME(FindObject),0 }, +{ "FindObject", SbxOBJECT, 1 | _FUNCTION, RTLNAME(FindObject),0 }, { "Name", SbxSTRING, 0,NULL,0 }, -{ "FindPropertyObject", SbxOBJECT, 2 | _FUNCTION, RTLNAME(FindPropertyObject),0 }, - { "Object", SbxOBJECT, 0,NULL,0 }, +{ "FindPropertyObject", SbxOBJECT, 2 | _FUNCTION, RTLNAME(FindPropertyObject),0 }, + { "Object", SbxOBJECT, 0,NULL,0 }, { "Name", SbxSTRING, 0,NULL,0 }, { "Fix", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Fix),0 }, { "number", SbxDOUBLE, 0,NULL,0 }, @@ -310,9 +310,9 @@ static Methods aMethods[] = { { "FormatDateTime", SbxSTRING, 2 | _FUNCTION | _COMPTMASK, RTLNAME(FormatDateTime),0 }, { "Date", SbxDATE, 0,NULL,0 }, { "NamedFormat", SbxINTEGER, _OPT, NULL,0 }, -{ "FRAMEANCHORCHAR", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORCHAR),0 }, -{ "FRAMEANCHORPAGE", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORPAGE),0 }, -{ "FRAMEANCHORPARA", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORPARA),0 }, +{ "FRAMEANCHORCHAR", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORCHAR),0 }, +{ "FRAMEANCHORPAGE", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORPAGE),0 }, +{ "FRAMEANCHORPARA", SbxINTEGER, _CPROP, RTLNAME(FRAMEANCHORPARA),0 }, { "FreeFile", SbxINTEGER, _FUNCTION, RTLNAME(FreeFile),0 }, { "FreeLibrary", SbxNULL, 1 | _FUNCTION, RTLNAME(FreeLibrary),0 }, { "Modulename", SbxSTRING, 0,NULL,0 }, @@ -326,7 +326,7 @@ static Methods aMethods[] = { { "Get", SbxNULL, 3 | _FUNCTION, RTLNAME(Get),0 }, { "filenumber", SbxINTEGER, 0,NULL,0 }, { "recordnumber", SbxLONG, 0,NULL,0 }, - { "variablename", SbxVARIANT, 0,NULL,0 }, + { "variablename", SbxVARIANT, 0,NULL,0 }, { "GetAttr", SbxINTEGER, 1 | _FUNCTION, RTLNAME(GetAttr),0 }, { "filename", SbxSTRING, 0,NULL,0 }, { "GetDefaultContext", SbxOBJECT, 0 | _FUNCTION, RTLNAME(GetDefaultContext),0 }, @@ -343,26 +343,26 @@ static Methods aMethods[] = { { "Green", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Green),0 }, { "RGB-Value", SbxLONG, 0,NULL,0 }, -{ "HasUnoInterfaces", SbxBOOL, 1 | _FUNCTION, RTLNAME(HasUnoInterfaces),0}, +{ "HasUnoInterfaces", SbxBOOL, 1 | _FUNCTION, RTLNAME(HasUnoInterfaces),0}, { "InterfaceName",SbxSTRING, 0,NULL,0 }, { "Hex", SbxSTRING, 1 | _FUNCTION, RTLNAME(Hex),0 }, { "number", SbxLONG, 0,NULL,0 }, { "Hour", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Hour),0 }, { "Date", SbxDATE, 0,NULL,0 }, -{ "IDABORT", SbxINTEGER, _CPROP, RTLNAME(IDABORT),0 }, -{ "IDCANCEL", SbxINTEGER, _CPROP, RTLNAME(IDCANCEL),0 }, -{ "IDNO", SbxINTEGER, _CPROP, RTLNAME(IDNO),0 }, -{ "IDOK", SbxINTEGER, _CPROP, RTLNAME(IDOK),0 }, -{ "IDRETRY", SbxINTEGER, _CPROP, RTLNAME(IDRETRY),0 }, -{ "IDYES", SbxINTEGER, _CPROP, RTLNAME(IDYES),0 }, +{ "IDABORT", SbxINTEGER, _CPROP, RTLNAME(IDABORT),0 }, +{ "IDCANCEL", SbxINTEGER, _CPROP, RTLNAME(IDCANCEL),0 }, +{ "IDNO", SbxINTEGER, _CPROP, RTLNAME(IDNO),0 }, +{ "IDOK", SbxINTEGER, _CPROP, RTLNAME(IDOK),0 }, +{ "IDRETRY", SbxINTEGER, _CPROP, RTLNAME(IDRETRY),0 }, +{ "IDYES", SbxINTEGER, _CPROP, RTLNAME(IDYES),0 }, { "Iif", SbxVARIANT, 3 | _FUNCTION, RTLNAME(Iif),0 }, - { "Bool", SbxBOOL, 0,NULL,0 }, + { "Bool", SbxBOOL, 0,NULL,0 }, { "Variant1", SbxVARIANT, 0,NULL,0 }, { "Variant2", SbxVARIANT, 0,NULL,0 }, -{ "Input", SbxSTRING, 2 | _FUNCTION | _COMPTMASK, RTLNAME(Input),0}, +{ "Input", SbxSTRING, 2 | _FUNCTION | _COMPTMASK, RTLNAME(Input),0}, { "Number", SbxLONG, 0,NULL,0 }, { "FileNumber", SbxLONG, 0,NULL,0 }, { "InputBox", SbxSTRING, 5 | _FUNCTION, RTLNAME(InputBox),0 }, @@ -411,12 +411,12 @@ static Methods aMethods[] = { { "Variant", SbxVARIANT, 0,NULL,0 }, { "IsUnoStruct", SbxBOOL, 1 | _FUNCTION, RTLNAME(IsUnoStruct),0 }, { "Variant", SbxVARIANT, 0,NULL,0 }, -{ "Join", SbxSTRING, 2 | _FUNCTION, RTLNAME(Join),0 }, - { "list", SbxOBJECT, 0,NULL,0 }, +{ "Join", SbxSTRING, 2 | _FUNCTION, RTLNAME(Join),0 }, + { "list", SbxOBJECT, 0,NULL,0 }, { "delimiter", SbxSTRING, 0,NULL,0 }, { "Kill", SbxNULL, 1 | _FUNCTION, RTLNAME(Kill),0 }, { "filespec", SbxSTRING, 0,NULL,0 }, -{ "LBound", SbxLONG, 1 | _FUNCTION, RTLNAME(LBound),0 }, +{ "LBound", SbxLONG, 1 | _FUNCTION, RTLNAME(LBound),0 }, { "Variant", SbxVARIANT, 0,NULL,0 }, { "LCase", SbxSTRING, 1 | _FUNCTION, RTLNAME(LCase),0 }, { "string", SbxSTRING, 0,NULL,0 }, @@ -448,15 +448,15 @@ static Methods aMethods[] = { { "MB_ICONEXCLAMATION", SbxINTEGER, _CPROP, RTLNAME(MB_ICONEXCLAMATION),0}, { "MB_ICONINFORMATION", SbxINTEGER, _CPROP, RTLNAME(MB_ICONINFORMATION),0}, { "MB_ICONQUESTION",SbxINTEGER, _CPROP, RTLNAME(MB_ICONQUESTION),0 }, -{ "MB_ICONSTOP", SbxINTEGER, _CPROP, RTLNAME(MB_ICONSTOP),0 }, -{ "MB_OK", SbxINTEGER, _CPROP, RTLNAME(MB_OK),0 }, -{ "MB_OKCANCEL", SbxINTEGER, _CPROP, RTLNAME(MB_OKCANCEL),0 }, +{ "MB_ICONSTOP", SbxINTEGER, _CPROP, RTLNAME(MB_ICONSTOP),0 }, +{ "MB_OK", SbxINTEGER, _CPROP, RTLNAME(MB_OK),0 }, +{ "MB_OKCANCEL", SbxINTEGER, _CPROP, RTLNAME(MB_OKCANCEL),0 }, { "MB_RETRYCANCEL", SbxINTEGER, _CPROP, RTLNAME(MB_RETRYCANCEL),0 }, { "MB_SYSTEMMODAL", SbxINTEGER, _CPROP, RTLNAME(MB_SYSTEMMODAL),0 }, -{ "MB_YESNO", SbxINTEGER, _CPROP, RTLNAME(MB_YESNO),0 }, +{ "MB_YESNO", SbxINTEGER, _CPROP, RTLNAME(MB_YESNO),0 }, { "MB_YESNOCANCEL", SbxINTEGER, _CPROP, RTLNAME(MB_YESNOCANCEL),0 }, -{ "Me", SbxOBJECT, 0 | _FUNCTION | _COMPTMASK, RTLNAME(Me),0 }, +{ "Me", SbxOBJECT, 0 | _FUNCTION | _COMPTMASK, RTLNAME(Me),0 }, { "Mid", SbxSTRING, 3 | _LFUNCTION,RTLNAME(Mid),0 }, { "String", SbxSTRING, 0,NULL,0 }, { "StartPos", SbxLONG, 0,NULL,0 }, @@ -492,17 +492,17 @@ static Methods aMethods[] = { { "NPV", SbxDOUBLE, 2 | _FUNCTION | _COMPTMASK, RTLNAME(NPV),0 }, { "Rate", SbxDOUBLE, 0, NULL,0 }, { "ValueArray", SbxARRAY, 0, NULL,0 }, -{ "Null", SbxNULL, _CPROP, RTLNAME(Null),0 }, +{ "Null", SbxNULL, _CPROP, RTLNAME(Null),0 }, { "Oct", SbxSTRING, 1 | _FUNCTION, RTLNAME(Oct),0 }, { "number", SbxLONG, 0,NULL,0 }, { "Partition", SbxSTRING, 4 | _FUNCTION, RTLNAME(Partition),0 }, - { "number", SbxLONG, 0,NULL,0 }, - { "start", SbxLONG, 0,NULL,0 }, - { "stop", SbxLONG, 0,NULL,0 }, - { "interval", SbxLONG, 0,NULL,0 }, -{ "Pi", SbxDOUBLE, _CPROP, RTLNAME(PI),0 }, + { "number", SbxLONG, 0,NULL,0 }, + { "start", SbxLONG, 0,NULL,0 }, + { "stop", SbxLONG, 0,NULL,0 }, + { "interval", SbxLONG, 0,NULL,0 }, +{ "Pi", SbxDOUBLE, _CPROP, RTLNAME(PI),0 }, { "Pmt", SbxDOUBLE, 5 | _FUNCTION | _COMPTMASK, RTLNAME(Pmt),0 }, { "Rate", SbxDOUBLE, 0, NULL,0 }, @@ -522,7 +522,7 @@ static Methods aMethods[] = { { "Put", SbxNULL, 3 | _FUNCTION, RTLNAME(Put),0 }, { "filenumber", SbxINTEGER, 0,NULL,0 }, { "recordnumber", SbxLONG, 0,NULL,0 }, - { "variablename", SbxVARIANT, 0,NULL,0 }, + { "variablename", SbxVARIANT, 0,NULL,0 }, { "PV", SbxDOUBLE, 5 | _FUNCTION | _COMPTMASK, RTLNAME(PV),0 }, { "Rate", SbxDOUBLE, 0, NULL,0 }, @@ -531,8 +531,8 @@ static Methods aMethods[] = { { "FV", SbxVARIANT, _OPT, NULL,0 }, { "Due", SbxVARIANT, _OPT, NULL,0 }, -{ "QBColor", SbxLONG, 1 | _FUNCTION, RTLNAME(QBColor),0 }, - { "number", SbxINTEGER, 0,NULL,0 }, +{ "QBColor", SbxLONG, 1 | _FUNCTION, RTLNAME(QBColor),0 }, + { "number", SbxINTEGER, 0,NULL,0 }, { "Randomize", SbxNULL, 1 | _FUNCTION, RTLNAME(Randomize),0 }, { "Number", SbxDOUBLE, _OPT, NULL,0 }, @@ -549,16 +549,16 @@ static Methods aMethods[] = { { "ResolvePath", SbxSTRING, 1 | _FUNCTION, RTLNAME(ResolvePath),0 }, { "Path", SbxSTRING, 0,NULL,0 }, { "RGB", SbxLONG, 3 | _FUNCTION, RTLNAME(RGB),0 }, - { "Red", SbxINTEGER, 0,NULL,0 }, - { "Green", SbxINTEGER, 0,NULL,0 }, - { "Blue", SbxINTEGER, 0,NULL,0 }, + { "Red", SbxINTEGER, 0,NULL,0 }, + { "Green", SbxINTEGER, 0,NULL,0 }, + { "Blue", SbxINTEGER, 0,NULL,0 }, { "Replace", SbxSTRING, 6 | _FUNCTION, RTLNAME(Replace),0 }, { "Expression", SbxSTRING, 0,NULL,0 }, - { "Find", SbxSTRING, 0,NULL,0 }, + { "Find", SbxSTRING, 0,NULL,0 }, { "Replace", SbxSTRING, 0,NULL,0 }, - { "Start", SbxINTEGER, _OPT, NULL,0 }, - { "Count", SbxINTEGER, _OPT, NULL,0 }, - { "Compare", SbxINTEGER, _OPT, NULL,0 }, + { "Start", SbxINTEGER, _OPT, NULL,0 }, + { "Count", SbxINTEGER, _OPT, NULL,0 }, + { "Compare", SbxINTEGER, _OPT, NULL,0 }, { "Right", SbxSTRING, 2 | _FUNCTION, RTLNAME(Right),0 }, { "String", SbxSTRING, 0,NULL,0 }, { "Count", SbxLONG, 0,NULL,0 }, @@ -569,7 +569,7 @@ static Methods aMethods[] = { { "Numdecimalplaces", SbxINTEGER, _OPT, NULL,0 }, { "Rnd", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Rnd),0 }, { "Number", SbxDOUBLE, _OPT, NULL,0 }, -{ "RTL", SbxOBJECT, 0 | _FUNCTION | _COMPTMASK, RTLNAME(RTL),0}, +{ "RTL", SbxOBJECT, 0 | _FUNCTION | _COMPTMASK, RTLNAME(RTL),0}, { "RTrim", SbxSTRING, 1 | _FUNCTION, RTLNAME(RTrim),0 }, { "string", SbxSTRING, 0,NULL,0 }, @@ -586,9 +586,9 @@ static Methods aMethods[] = { { "SetAttr", SbxNULL, 2 | _FUNCTION, RTLNAME(SetAttr),0 }, { "File" , SbxSTRING, 0,NULL,0 }, { "Attributes", SbxINTEGER, 0,NULL,0 }, -{ "SET_OFF", SbxINTEGER, _CPROP, RTLNAME(SET_OFF),0 }, -{ "SET_ON", SbxINTEGER, _CPROP, RTLNAME(SET_ON),0 }, -{ "SET_TAB", SbxINTEGER, _CPROP, RTLNAME(SET_TAB),0 }, +{ "SET_OFF", SbxINTEGER, _CPROP, RTLNAME(SET_OFF),0 }, +{ "SET_ON", SbxINTEGER, _CPROP, RTLNAME(SET_ON),0 }, +{ "SET_TAB", SbxINTEGER, _CPROP, RTLNAME(SET_TAB),0 }, { "Sgn", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Sgn),0 }, { "number", SbxDOUBLE, 0,NULL,0 }, { "Shell", SbxLONG, 2 | _FUNCTION, RTLNAME(Shell),0 }, @@ -607,12 +607,12 @@ static Methods aMethods[] = { { "Period", SbxDOUBLE, 0,NULL,0 }, { "Space", SbxSTRING, 1 | _FUNCTION, RTLNAME(Space),0 }, { "string", SbxLONG, 0,NULL,0 }, -{ "Spc", SbxSTRING, 1 | _FUNCTION, RTLNAME(Spc),0 }, +{ "Spc", SbxSTRING, 1 | _FUNCTION, RTLNAME(Spc),0 }, { "Count", SbxLONG, 0,NULL,0 }, -{ "Split", SbxOBJECT, 3 | _FUNCTION, RTLNAME(Split),0 }, - { "expression", SbxSTRING, 0,NULL,0 }, +{ "Split", SbxOBJECT, 3 | _FUNCTION, RTLNAME(Split),0 }, + { "expression", SbxSTRING, 0,NULL,0 }, { "delimiter", SbxSTRING, 0,NULL,0 }, - { "count", SbxLONG, 0,NULL,0 }, + { "count", SbxLONG, 0,NULL,0 }, { "Sqr", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Sqr),0 }, { "number", SbxDOUBLE, 0,NULL,0 }, { "Str", SbxSTRING, 1 | _FUNCTION, RTLNAME(Str),0 }, @@ -624,13 +624,13 @@ static Methods aMethods[] = { { "StrConv", SbxOBJECT, 3 | _FUNCTION, RTLNAME(StrConv),0 }, { "String", SbxSTRING, 0,NULL,0 }, { "Conversion", SbxSTRING, 0,NULL,0 }, - { "LCID", SbxINTEGER, _OPT,NULL,0 }, + { "LCID", SbxINTEGER, _OPT,NULL,0 }, { "String", SbxSTRING, 2 | _FUNCTION, RTLNAME(String),0 }, { "Count", SbxLONG, 0,NULL,0 }, { "Filler", SbxVARIANT, 0,NULL,0 }, { "StrReverse", SbxSTRING, 1 | _FUNCTION | _COMPTMASK, RTLNAME(StrReverse),0 }, { "String1", SbxSTRING, 0,NULL,0 }, -{ "Switch", SbxVARIANT, 2 | _FUNCTION, RTLNAME(Switch),0 }, +{ "Switch", SbxVARIANT, 2 | _FUNCTION, RTLNAME(Switch),0 }, { "Expression", SbxVARIANT, 0,NULL,0 }, { "Value", SbxVARIANT, 0,NULL,0 }, @@ -644,54 +644,54 @@ static Methods aMethods[] = { { "Second", SbxLONG, 0,NULL,0 }, { "TimeValue", SbxDATE, 1 | _FUNCTION, RTLNAME(TimeValue),0 }, { "String", SbxSTRING, 0,NULL,0 }, -{ "TOGGLE", SbxINTEGER, _CPROP, RTLNAME(TOGGLE),0 }, +{ "TOGGLE", SbxINTEGER, _CPROP, RTLNAME(TOGGLE),0 }, { "Trim", SbxSTRING, 1 | _FUNCTION, RTLNAME(Trim),0 }, { "String", SbxSTRING, 0,NULL,0 }, { "True", SbxBOOL, _CPROP, RTLNAME(True),0 }, { "TwipsPerPixelX", SbxLONG, _FUNCTION, RTLNAME(TwipsPerPixelX),0 }, { "TwipsPerPixelY", SbxLONG, _FUNCTION, RTLNAME(TwipsPerPixelY),0 }, -{ "TYP_AUTHORFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_AUTHORFLD),0 }, -{ "TYP_CHAPTERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_CHAPTERFLD),0 }, -{ "TYP_CONDTXTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_CONDTXTFLD),0 }, -{ "TYP_DATEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DATEFLD),0 }, -{ "TYP_DBFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBFLD),0 }, -{ "TYP_DBNAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNAMEFLD),0 }, -{ "TYP_DBNEXTSETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNEXTSETFLD),0 }, -{ "TYP_DBNUMSETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNUMSETFLD),0 }, -{ "TYP_DBSETNUMBERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBSETNUMBERFLD),0 }, -{ "TYP_DDEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DDEFLD),0 }, -{ "TYP_DOCINFOFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DOCINFOFLD),0 }, -{ "TYP_DOCSTATFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DOCSTATFLD),0 }, -{ "TYP_EXTUSERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_EXTUSERFLD),0 }, -{ "TYP_FILENAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FILENAMEFLD),0 }, -{ "TYP_FIXDATEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FIXDATEFLD),0 }, -{ "TYP_FIXTIMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FIXTIMEFLD),0 }, -{ "TYP_FORMELFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FORMELFLD),0 }, -{ "TYP_GETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETFLD),0 }, -{ "TYP_GETREFFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETREFFLD),0 }, -{ "TYP_GETREFPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETREFPAGEFLD),0 }, -{ "TYP_HIDDENPARAFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_HIDDENPARAFLD),0 }, -{ "TYP_HIDDENTXTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_HIDDENTXTFLD),0 }, -{ "TYP_INPUTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_INPUTFLD),0 }, -{ "TYP_INTERNETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_INTERNETFLD),0 }, -{ "TYP_JUMPEDITFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_JUMPEDITFLD),0 }, -{ "TYP_MACROFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_MACROFLD),0 }, -{ "TYP_NEXTPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_NEXTPAGEFLD),0 }, -{ "TYP_PAGENUMBERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_PAGENUMBERFLD),0 }, -{ "TYP_POSTITFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_POSTITFLD),0 }, -{ "TYP_PREVPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_PREVPAGEFLD),0 }, -{ "TYP_SEQFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SEQFLD),0 }, -{ "TYP_SETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETFLD),0 }, -{ "TYP_SETINPFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETINPFLD),0 }, -{ "TYP_SETREFFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETREFFLD),0 }, -{ "TYP_SETREFPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETREFPAGEFLD),0 }, -{ "TYP_TEMPLNAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_TEMPLNAMEFLD),0}, -{ "TYP_TIMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_TIMEFLD),0 }, -{ "TYP_USERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_USERFLD),0 }, -{ "TYP_USRINPFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_USRINPFLD),0 }, - -{ "TypeLen", SbxINTEGER, 1 | _FUNCTION, RTLNAME(TypeLen),0 }, +{ "TYP_AUTHORFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_AUTHORFLD),0 }, +{ "TYP_CHAPTERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_CHAPTERFLD),0 }, +{ "TYP_CONDTXTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_CONDTXTFLD),0 }, +{ "TYP_DATEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DATEFLD),0 }, +{ "TYP_DBFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBFLD),0 }, +{ "TYP_DBNAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNAMEFLD),0 }, +{ "TYP_DBNEXTSETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNEXTSETFLD),0 }, +{ "TYP_DBNUMSETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBNUMSETFLD),0 }, +{ "TYP_DBSETNUMBERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DBSETNUMBERFLD),0 }, +{ "TYP_DDEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DDEFLD),0 }, +{ "TYP_DOCINFOFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DOCINFOFLD),0 }, +{ "TYP_DOCSTATFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_DOCSTATFLD),0 }, +{ "TYP_EXTUSERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_EXTUSERFLD),0 }, +{ "TYP_FILENAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FILENAMEFLD),0 }, +{ "TYP_FIXDATEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FIXDATEFLD),0 }, +{ "TYP_FIXTIMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FIXTIMEFLD),0 }, +{ "TYP_FORMELFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_FORMELFLD),0 }, +{ "TYP_GETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETFLD),0 }, +{ "TYP_GETREFFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETREFFLD),0 }, +{ "TYP_GETREFPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_GETREFPAGEFLD),0 }, +{ "TYP_HIDDENPARAFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_HIDDENPARAFLD),0 }, +{ "TYP_HIDDENTXTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_HIDDENTXTFLD),0 }, +{ "TYP_INPUTFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_INPUTFLD),0 }, +{ "TYP_INTERNETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_INTERNETFLD),0 }, +{ "TYP_JUMPEDITFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_JUMPEDITFLD),0 }, +{ "TYP_MACROFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_MACROFLD),0 }, +{ "TYP_NEXTPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_NEXTPAGEFLD),0 }, +{ "TYP_PAGENUMBERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_PAGENUMBERFLD),0 }, +{ "TYP_POSTITFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_POSTITFLD),0 }, +{ "TYP_PREVPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_PREVPAGEFLD),0 }, +{ "TYP_SEQFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SEQFLD),0 }, +{ "TYP_SETFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETFLD),0 }, +{ "TYP_SETINPFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETINPFLD),0 }, +{ "TYP_SETREFFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETREFFLD),0 }, +{ "TYP_SETREFPAGEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_SETREFPAGEFLD),0 }, +{ "TYP_TEMPLNAMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_TEMPLNAMEFLD),0}, +{ "TYP_TIMEFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_TIMEFLD),0 }, +{ "TYP_USERFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_USERFLD),0 }, +{ "TYP_USRINPFLD", SbxINTEGER, _CPROP, RTLNAME(TYP_USRINPFLD),0 }, + +{ "TypeLen", SbxINTEGER, 1 | _FUNCTION, RTLNAME(TypeLen),0 }, { "Var", SbxVARIANT, 0,NULL,0 }, { "TypeName", SbxSTRING, 1 | _FUNCTION, RTLNAME(TypeName),0 }, { "Var", SbxVARIANT, 0,NULL,0 }, @@ -717,7 +717,7 @@ static Methods aMethods[] = { { "V_DATE", SbxINTEGER, _CPROP, RTLNAME(V_DATE),0 }, { "V_STRING", SbxINTEGER, _CPROP, RTLNAME(V_STRING),0 }, -{ "Wait", SbxNULL, 1 | _FUNCTION, RTLNAME(Wait),0 }, +{ "Wait", SbxNULL, 1 | _FUNCTION, RTLNAME(Wait),0 }, { "Milliseconds", SbxLONG, 0,NULL,0 }, { "FuncCaller", SbxVARIANT, _FUNCTION, RTLNAME(FuncCaller),0 }, //#i64882# @@ -787,9 +787,9 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t ) USHORT nSrchMask = _TYPEMASK; switch( t ) { - case SbxCLASS_METHOD: nSrchMask = _METHOD; break; - case SbxCLASS_PROPERTY: nSrchMask = _PROPERTY; break; - case SbxCLASS_OBJECT: nSrchMask = _OBJECT; break; + case SbxCLASS_METHOD: nSrchMask = _METHOD; break; + case SbxCLASS_PROPERTY: nSrchMask = _PROPERTY; break; + case SbxCLASS_OBJECT: nSrchMask = _OBJECT; break; default: break; } while( p->nArgs != -1 ) diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 28bda15bcacc..58f2c047d836 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,23 +34,23 @@ #include "runtime.hxx" #include <basic/sbstdobj.hxx> -#define ATTR_IMP_TYPE 1 -#define ATTR_IMP_WIDTH 2 -#define ATTR_IMP_HEIGHT 3 -#define ATTR_IMP_BOLD 4 -#define ATTR_IMP_ITALIC 5 -#define ATTR_IMP_STRIKETHROUGH 6 -#define ATTR_IMP_UNDERLINE 7 -#define ATTR_IMP_WEIGHT 8 -#define ATTR_IMP_SIZE 9 -#define ATTR_IMP_NAME 10 - -#define METH_CLEAR 20 -#define METH_GETDATA 21 -#define METH_GETFORMAT 22 -#define METH_GETTEXT 23 -#define METH_SETDATA 24 -#define METH_SETTEXT 25 +#define ATTR_IMP_TYPE 1 +#define ATTR_IMP_WIDTH 2 +#define ATTR_IMP_HEIGHT 3 +#define ATTR_IMP_BOLD 4 +#define ATTR_IMP_ITALIC 5 +#define ATTR_IMP_STRIKETHROUGH 6 +#define ATTR_IMP_UNDERLINE 7 +#define ATTR_IMP_WEIGHT 8 +#define ATTR_IMP_SIZE 9 +#define ATTR_IMP_NAME 10 + +#define METH_CLEAR 20 +#define METH_GETDATA 21 +#define METH_GETFORMAT 22 +#define METH_GETTEXT 23 +#define METH_SETDATA 24 +#define METH_SETTEXT 25 //------------------------------------------------------------------------------ SbStdFactory::SbStdFactory() @@ -102,7 +102,7 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite ) } Size aSize = aGraphic.GetPrefSize(); - aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); + aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) ); pVar->PutInteger( (INT16)aSize.Width() ); @@ -117,7 +117,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite ) } Size aSize = aGraphic.GetPrefSize(); - aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); + aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() ); aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) ); pVar->PutInteger( (INT16)aSize.Height() ); @@ -168,17 +168,17 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, return; } - SbxVariable* pVar = pHint->GetVar(); - SbxArray* pPar_ = pVar->GetParameters(); - USHORT nWhich = (USHORT)pVar->GetUserData(); - BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + SbxVariable* pVar = pHint->GetVar(); + SbxArray* pPar_ = pVar->GetParameters(); + USHORT nWhich = (USHORT)pVar->GetUserData(); + BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Propteries switch( nWhich ) { - case ATTR_IMP_TYPE: PropType( pVar, pPar_, bWrite ); return; - case ATTR_IMP_WIDTH: PropWidth( pVar, pPar_, bWrite ); return; - case ATTR_IMP_HEIGHT: PropHeight( pVar, pPar_, bWrite ); return; + case ATTR_IMP_TYPE: PropType( pVar, pPar_, bWrite ); return; + case ATTR_IMP_WIDTH: PropWidth( pVar, pPar_, bWrite ); return; + case ATTR_IMP_HEIGHT: PropHeight( pVar, pPar_, bWrite ); return; } SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType ); @@ -290,20 +290,20 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, return; } - SbxVariable* pVar = pHint->GetVar(); - SbxArray* pPar_ = pVar->GetParameters(); - USHORT nWhich = (USHORT)pVar->GetUserData(); - BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + SbxVariable* pVar = pHint->GetVar(); + SbxArray* pPar_ = pVar->GetParameters(); + USHORT nWhich = (USHORT)pVar->GetUserData(); + BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Propteries switch( nWhich ) { - case ATTR_IMP_BOLD: PropBold( pVar, pPar_, bWrite ); return; - case ATTR_IMP_ITALIC: PropItalic( pVar, pPar_, bWrite ); return; + case ATTR_IMP_BOLD: PropBold( pVar, pPar_, bWrite ); return; + case ATTR_IMP_ITALIC: PropItalic( pVar, pPar_, bWrite ); return; case ATTR_IMP_STRIKETHROUGH:PropStrikeThrough( pVar, pPar_, bWrite ); return; - case ATTR_IMP_UNDERLINE: PropUnderline( pVar, pPar_, bWrite ); return; - case ATTR_IMP_SIZE: PropSize( pVar, pPar_, bWrite ); return; - case ATTR_IMP_NAME: PropName( pVar, pPar_, bWrite ); return; + case ATTR_IMP_UNDERLINE: PropUnderline( pVar, pPar_, bWrite ); return; + case ATTR_IMP_SIZE: PropSize( pVar, pPar_, bWrite ); return; + case ATTR_IMP_NAME: PropName( pVar, pPar_, bWrite ); return; } SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType ); @@ -342,7 +342,7 @@ sal_Bool TransferableHelperImpl::GetData( const ::com::sun::star::datatransfer:: if( nFormat == FORMAT_STRING ) { } - else if( nFormat == FORMAT_BITMAP || + else if( nFormat == FORMAT_BITMAP || nFormat == FORMAT_GDIMETAFILE ) { } @@ -363,7 +363,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL ) void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL ) { (void)pVar; - + if( !pPar_ || (pPar_->Count() != 2) ) { StarBASIC::Error( SbERR_BAD_NUMBER_OF_ARGS ); @@ -427,7 +427,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL ) void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL ) { (void)pVar; - + if( !pPar_ || (pPar_->Count() != 3) ) { StarBASIC::Error( SbERR_BAD_NUMBER_OF_ARGS ); @@ -461,7 +461,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL ) void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL ) { (void)pVar; - + if( !pPar_ || (pPar_->Count() != 2) ) { StarBASIC::Error( SbERR_BAD_NUMBER_OF_ARGS ); @@ -529,20 +529,20 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, return; } - SbxVariable* pVar = pHint->GetVar(); - SbxArray* pPar_ = pVar->GetParameters(); - USHORT nWhich = (USHORT)pVar->GetUserData(); - BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + SbxVariable* pVar = pHint->GetVar(); + SbxArray* pPar_ = pVar->GetParameters(); + USHORT nWhich = (USHORT)pVar->GetUserData(); + BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Methods switch( nWhich ) { - case METH_CLEAR: MethClear( pVar, pPar_, bWrite ); return; - case METH_GETDATA: MethGetData( pVar, pPar_, bWrite ); return; - case METH_GETFORMAT: MethGetFormat( pVar, pPar_, bWrite ); return; - case METH_GETTEXT: MethGetText( pVar, pPar_, bWrite ); return; - case METH_SETDATA: MethSetData( pVar, pPar_, bWrite ); return; - case METH_SETTEXT: MethSetText( pVar, pPar_, bWrite ); return; + case METH_CLEAR: MethClear( pVar, pPar_, bWrite ); return; + case METH_GETDATA: MethGetData( pVar, pPar_, bWrite ); return; + case METH_GETFORMAT: MethGetFormat( pVar, pPar_, bWrite ); return; + case METH_GETTEXT: MethGetText( pVar, pPar_, bWrite ); return; + case METH_SETDATA: MethSetData( pVar, pPar_, bWrite ); return; + case METH_SETTEXT: MethSetText( pVar, pPar_, bWrite ); return; } SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType ); diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 156df6aa7e38..7503832cc2d4 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -171,29 +171,29 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) #endif } -void SbiRuntime::StepEXP() { StepArith( SbxEXP ); } -void SbiRuntime::StepMUL() { StepArith( SbxMUL ); } -void SbiRuntime::StepDIV() { StepArith( SbxDIV ); } -void SbiRuntime::StepIDIV() { StepArith( SbxIDIV ); } -void SbiRuntime::StepMOD() { StepArith( SbxMOD ); } -void SbiRuntime::StepPLUS() { StepArith( SbxPLUS ); } -void SbiRuntime::StepMINUS() { StepArith( SbxMINUS ); } -void SbiRuntime::StepCAT() { StepArith( SbxCAT ); } -void SbiRuntime::StepAND() { StepArith( SbxAND ); } -void SbiRuntime::StepOR() { StepArith( SbxOR ); } -void SbiRuntime::StepXOR() { StepArith( SbxXOR ); } -void SbiRuntime::StepEQV() { StepArith( SbxEQV ); } -void SbiRuntime::StepIMP() { StepArith( SbxIMP ); } - -void SbiRuntime::StepNEG() { StepUnary( SbxNEG ); } -void SbiRuntime::StepNOT() { StepUnary( SbxNOT ); } - -void SbiRuntime::StepEQ() { StepCompare( SbxEQ ); } -void SbiRuntime::StepNE() { StepCompare( SbxNE ); } -void SbiRuntime::StepLT() { StepCompare( SbxLT ); } -void SbiRuntime::StepGT() { StepCompare( SbxGT ); } -void SbiRuntime::StepLE() { StepCompare( SbxLE ); } -void SbiRuntime::StepGE() { StepCompare( SbxGE ); } +void SbiRuntime::StepEXP() { StepArith( SbxEXP ); } +void SbiRuntime::StepMUL() { StepArith( SbxMUL ); } +void SbiRuntime::StepDIV() { StepArith( SbxDIV ); } +void SbiRuntime::StepIDIV() { StepArith( SbxIDIV ); } +void SbiRuntime::StepMOD() { StepArith( SbxMOD ); } +void SbiRuntime::StepPLUS() { StepArith( SbxPLUS ); } +void SbiRuntime::StepMINUS() { StepArith( SbxMINUS ); } +void SbiRuntime::StepCAT() { StepArith( SbxCAT ); } +void SbiRuntime::StepAND() { StepArith( SbxAND ); } +void SbiRuntime::StepOR() { StepArith( SbxOR ); } +void SbiRuntime::StepXOR() { StepArith( SbxXOR ); } +void SbiRuntime::StepEQV() { StepArith( SbxEQV ); } +void SbiRuntime::StepIMP() { StepArith( SbxIMP ); } + +void SbiRuntime::StepNEG() { StepUnary( SbxNEG ); } +void SbiRuntime::StepNOT() { StepUnary( SbxNOT ); } + +void SbiRuntime::StepEQ() { StepCompare( SbxEQ ); } +void SbiRuntime::StepNE() { StepCompare( SbxNE ); } +void SbiRuntime::StepLT() { StepCompare( SbxLT ); } +void SbiRuntime::StepGT() { StepCompare( SbxGT ); } +void SbiRuntime::StepLE() { StepCompare( SbxLE ); } +void SbiRuntime::StepGE() { StepCompare( SbxGE ); } namespace { @@ -443,7 +443,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // Check value, !object is no error for sure if, only if type is fixed SbxDataType eValType = refVal->GetType(); -// bool bGetValObject = false; +// bool bGetValObject = false; if( !bHandleDefaultProp && eValType != SbxOBJECT && !(eValType & SbxARRAY) && refVal->IsFixed() ) { Error( SbERR_INVALID_USAGE_OBJECT ); @@ -549,7 +549,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b xComListener = createComListener( aControlAny, aVBAType, aPrefix, xScopeObj ); refVal->SetDeclareClassName( aDeclareClassName ); - refVal->SetComListener( xComListener ); // Hold reference + refVal->SetComListener( xComListener ); // Hold reference } *refVar = *refVal; @@ -851,7 +851,7 @@ void SbiRuntime::StepREDIMP() // REDIM_COPY // TOS = Array-Variable, Reference to array is copied -// Variable is cleared as in ERASE +// Variable is cleared as in ERASE void SbiRuntime::StepREDIMP_ERASE() { @@ -1197,7 +1197,7 @@ void SbiRuntime::StepLEAVE() SbxErrObject::getUnoErrObject()->Clear(); } -void SbiRuntime::StepCHANNEL() // TOS = Kanalnummer +void SbiRuntime::StepCHANNEL() // TOS = Kanalnummer { SbxVariableRef pChan = PopVar(); short nChan = pChan->GetInteger(); @@ -1210,26 +1210,26 @@ void SbiRuntime::StepCHANNEL0() pIosys->ResetChannel(); } -void SbiRuntime::StepPRINT() // print TOS +void SbiRuntime::StepPRINT() // print TOS { SbxVariableRef p = PopVar(); String s1 = p->GetString(); String s; if( p->GetType() >= SbxINTEGER && p->GetType() <= SbxDOUBLE ) - s = ' '; // ein Blank davor + s = ' '; // ein Blank davor s += s1; ByteString aByteStr( s, gsl_getSystemTextEncoding() ); pIosys->Write( aByteStr ); Error( pIosys->GetError() ); } -void SbiRuntime::StepPRINTF() // print TOS in field +void SbiRuntime::StepPRINTF() // print TOS in field { SbxVariableRef p = PopVar(); String s1 = p->GetString(); String s; if( p->GetType() >= SbxINTEGER && p->GetType() <= SbxDOUBLE ) - s = ' '; // ein Blank davor + s = ' '; // ein Blank davor s += s1; s.Expand( 14, ' ' ); ByteString aByteStr( s, gsl_getSystemTextEncoding() ); @@ -1237,7 +1237,7 @@ void SbiRuntime::StepPRINTF() // print TOS in field Error( pIosys->GetError() ); } -void SbiRuntime::StepWRITE() // write TOS +void SbiRuntime::StepWRITE() // write TOS { SbxVariableRef p = PopVar(); // Muss der String gekapselt werden? @@ -1261,7 +1261,7 @@ void SbiRuntime::StepWRITE() // write TOS Error( pIosys->GetError() ); } -void SbiRuntime::StepRENAME() // Rename Tos+1 to Tos +void SbiRuntime::StepRENAME() // Rename Tos+1 to Tos { SbxVariableRef pTos1 = PopVar(); SbxVariableRef pTos = PopVar(); diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index e023750cc27a..a619a01b3dbb 100644 --- a/basic/source/runtime/step1.cxx +++ b/basic/source/runtime/step1.cxx @@ -116,12 +116,12 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 ) StarBASIC::FatalError( SbERR_INTERNAL_ERROR ); else { - BOOL bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt? + BOOL bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt? SbxDataType t = (SbxDataType) (nOp1 & 0x7FFF); - SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 ); // letztes Arg + SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 ); // letztes Arg // BYVAL prüfen - if( pVar->GetRefCount() > 2 ) // 2 ist normal für BYVAL + if( pVar->GetRefCount() > 2 ) // 2 ist normal für BYVAL { // Parameter ist eine Referenz if( bByVal ) @@ -132,15 +132,15 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 ) refExprStk->Put( pVar, refArgv->Count() - 1 ); } else - pVar->SetFlag( SBX_REFERENCE ); // Ref-Flag für DllMgr + pVar->SetFlag( SBX_REFERENCE ); // Ref-Flag für DllMgr } else { // Parameter ist KEINE Referenz if( bByVal ) - pVar->ResetFlag( SBX_REFERENCE ); // Keine Referenz -> OK + pVar->ResetFlag( SBX_REFERENCE ); // Keine Referenz -> OK else - Error( SbERR_BAD_PARAMETERS ); // Referenz verlangt + Error( SbERR_BAD_PARAMETERS ); // Referenz verlangt } if( pVar->GetType() != t ) @@ -572,12 +572,12 @@ void SbiRuntime::StepBASED( UINT32 nOp1 ) // #109275 Check compatiblity mode bool bCompatible = ((nOp1 & 0x8000) != 0); - USHORT uBase = static_cast<USHORT>(nOp1 & 1); // Can only be 0 or 1 + USHORT uBase = static_cast<USHORT>(nOp1 & 1); // Can only be 0 or 1 p1->PutInteger( uBase ); if( !bCompatible ) x2->Compute( SbxPLUS, *p1 ); - PushVar( x2 ); // erst die Expr - PushVar( p1 ); // dann die Base + PushVar( x2 ); // erst die Expr + PushVar( p1 ); // dann die Base } diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx index 543c69a34b97..c2446420098c 100644 --- a/basic/source/runtime/step2.cxx +++ b/basic/source/runtime/step2.cxx @@ -113,13 +113,13 @@ SbxVariable* SbiRuntime::FindElement pElem = pObj->Find( aName, SbxCLASS_DONTCARE ); // #110004, #112015: Make private really private - if( bLocal && pElem ) // Local as flag for global search + if( bLocal && pElem ) // Local as flag for global search { if( pElem->IsSet( SBX_PRIVATE ) ) { SbiInstance* pInst_ = pINST; if( pInst_ && pInst_->IsCompatibility() && pObj != pElem->GetParent() ) - pElem = NULL; // Found but in wrong module! + pElem = NULL; // Found but in wrong module! // Interfaces: Use SBX_EXTFOUND } @@ -386,7 +386,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 ) Any aUnoAny = pParentUnoObj->getUnoAny(); Reference< XInvocation > xInvocation; aUnoAny >>= xInvocation; - if( xInvocation.is() ) // TODO: if( xOLEAutomation.is() ) + if( xInvocation.is() ) // TODO: if( xOLEAutomation.is() ) { bError_ = false; @@ -688,7 +688,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 ) p->PutString( String() ); } else - p->PutErr( 448 ); // Wie in VB: Error-Code 448 (SbERR_NAMED_NOT_FOUND) + p->PutErr( 448 ); // Wie in VB: Error-Code 448 (SbERR_NAMED_NOT_FOUND) refParams->Put( p, iLoop ); iLoop--; @@ -883,7 +883,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 ) pInst->CalcBreakCallLevel( nNewFlags ); //16.10.96, ALT: //if( nNewFlags != SbDEBUG_CONTINUE ) - // nFlags = nNewFlags; + // nFlags = nNewFlags; } } @@ -1070,7 +1070,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 ) // Objekt aus User-Type kreieren (+StringID+StringID) -SbxObject* createUserTypeImpl( const String& rClassName ); // sb.cxx +SbxObject* createUserTypeImpl( const String& rClassName ); // sb.cxx void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 ) { @@ -1088,7 +1088,7 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 ) void SbiRuntime::implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 ) { - USHORT nCount = static_cast<USHORT>( nOp2 >> 17 ); // len = all bits above 0x10000 + USHORT nCount = static_cast<USHORT>( nOp2 >> 17 ); // len = all bits above 0x10000 String aStr; aStr.Fill( nCount, 0 ); pStrVar->PutString( aStr ); diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx index b7b2e717aedc..b88dc3bcbba3 100644 --- a/basic/source/sample/collelem.cxx +++ b/basic/source/sample/collelem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ void SampleElement::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); ULONG t = pHint->GetId(); - if( t == SBX_HINT_DATAWANTED && pVar->GetUserData() == 0x12345678 ) + if( t == SBX_HINT_DATAWANTED && pVar->GetUserData() == 0x12345678 ) { // Die Say-Methode: // 1 Parameter + Returnwert diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx index 99501a1b7c70..c1c78684edaf 100644 --- a/basic/source/sample/object.cxx +++ b/basic/source/sample/object.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ // Name der Name // Value ein double-Wert, beide bereits als Default drin // 2) Methoden: -// Create Erzeugen eines neuen Unterelements +// Create Erzeugen eines neuen Unterelements // Display Ausgabe eines Textes // Square Argument * Argument // Event Aufruf eines Basic-Eventhandlers @@ -61,7 +61,7 @@ // MyBasic::MyBasic() : StarBASIC() // { -// AddFactory( new SampleObjectFac() ); +// AddFactory( new SampleObjectFac() ); // } // Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt: @@ -74,7 +74,7 @@ #define _BWRITE 0x0200 // kann as Lvalue verwendet werden #define _LVALUE _BWRITE // kann as Lvalue verwendet werden #define _READWRITE 0x0300 // beides -#define _OPT 0x0400 // TRUE: optionaler Parameter +#define _OPT 0x0400 // TRUE: optionaler Parameter #define _METHOD 0x1000 // Masken-Bit fuer eine Methode #define _PROPERTY 0x2000 // Masken-Bit fuer eine Property #define _COLL 0x4000 // Masken-Bit fuer eine Collection @@ -111,7 +111,7 @@ SampleObject::Methods SampleObject::aMethods[] = { SampleObject::SampleObject( const String& rClass ) : SbxObject( rClass ) { SetName( String( RTL_CONSTASCII_USTRINGPARAM("Sample") ) ); - PutDouble( 1.0 ); // Startwert fuer Value + PutDouble( 1.0 ); // Startwert fuer Value } // Suche nach einem Element: diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src index 7e576134fad5..7c0e8d102aef 100644 --- a/basic/source/sbx/format.src +++ b/basic/source/sbx/format.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index 0028696fa85b..200c10018cde 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -422,7 +422,7 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData ) { p = pVar; p->ResetFlag( SBX_EXTFOUND ); - break; // JSM 1995-10-06 + break; // JSM 1995-10-06 } // Did we have an array/object with extended search? else if( pVar->IsSet( SBX_EXTSEARCH ) ) @@ -788,7 +788,7 @@ UINT32 SbxDimArray::Offset32( SbxArray* pPar ) SetError( SbxERR_BOUNDS ); return 0; } UINT32 nPos = 0; - USHORT nOff = 1; // Non element 0! + USHORT nOff = 1; // Non element 0! for( SbxDim* p = pFirst; p && !IsError(); p = p->pNext ) { INT32 nIdx = pPar->Get( nOff++ )->GetLong(); diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 62c822af1ea7..f96c39730db1 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,8 +161,8 @@ void SbxBase::AddFactory( SbxFactory* pFac ) const SbxFactory* pTemp = pFac; // From 1996-03-06: take the HandleLast-Flag into account - USHORT nPos = p->aFacs.Count(); // Insert-Position - if( !pFac->IsHandleLast() ) // Only if not self HandleLast + USHORT nPos = p->aFacs.Count(); // Insert-Position + if( !pFac->IsHandleLast() ) // Only if not self HandleLast { // Rank new factory in front of factories with HandleLast while( nPos > 0 && @@ -197,16 +197,16 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator ) if( nCreator == SBXCR_SBX ) switch( nSbxId ) { - case SBXID_VALUE: return new SbxValue; - case SBXID_VARIABLE: return new SbxVariable; - case SBXID_ARRAY: return new SbxArray; - case SBXID_DIMARRAY: return new SbxDimArray; - case SBXID_OBJECT: return new SbxObject( aEmptyStr ); - case SBXID_COLLECTION: return new SbxCollection( aEmptyStr ); + case SBXID_VALUE: return new SbxValue; + case SBXID_VARIABLE: return new SbxVariable; + case SBXID_ARRAY: return new SbxArray; + case SBXID_DIMARRAY: return new SbxDimArray; + case SBXID_OBJECT: return new SbxObject( aEmptyStr ); + case SBXID_COLLECTION: return new SbxCollection( aEmptyStr ); case SBXID_FIXCOLLECTION: return new SbxStdCollection( aEmptyStr, aEmptyStr ); - case SBXID_METHOD: return new SbxMethod( aEmptyStr, SbxEMPTY ); - case SBXID_PROPERTY: return new SbxProperty( aEmptyStr, SbxEMPTY ); + case SBXID_METHOD: return new SbxMethod( aEmptyStr, SbxEMPTY ); + case SBXID_PROPERTY: return new SbxProperty( aEmptyStr, SbxEMPTY ); } // Unknown type: go over the factories! SbxAppData* p = GetSbxData_Impl(); diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index 35e36a94a557..1f7d510e4890 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,7 +199,7 @@ void ImpPutBool( SbxValues* p, INT16 n ) case SbxLPSTR: if ( !p->pOUString ) p->pOUString = new ::rtl::OUString( SbxRes( n ? STRING_TRUE : STRING_FALSE ) ); - else + else *p->pOUString = SbxRes( n ? STRING_TRUE : STRING_FALSE ); break; diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index 727d1174417d..0151f59bc0b9 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ start: nRes = (BYTE) p->nChar; break; case SbxBYTE: - nRes = (BYTE) p->nByte; break; + nRes = (BYTE) p->nByte; break; case SbxINTEGER: case SbxBOOL: if( p->nInteger > SbxMAXBYTE ) @@ -136,7 +136,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index f516df8876f8..ab0aff6579a2 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index e5518d79a2fd..5bc2e08f30e7 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx index 8155a98c1f07..66ce3fb03efb 100644 --- a/basic/source/sbx/sbxconv.hxx +++ b/basic/source/sbx/sbxconv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,12 +44,12 @@ extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType ); // SBXINT.CXX -double ImpRound( double ); -INT16 ImpGetInteger( const SbxValues* ); +double ImpRound( double ); +INT16 ImpGetInteger( const SbxValues* ); void ImpPutInteger( SbxValues*, INT16 ); -sal_Int64 ImpGetInt64( const SbxValues* ); +sal_Int64 ImpGetInt64( const SbxValues* ); void ImpPutInt64( SbxValues*, sal_Int64 ); -sal_uInt64 ImpGetUInt64( const SbxValues* ); +sal_uInt64 ImpGetUInt64( const SbxValues* ); void ImpPutUInt64( SbxValues*, sal_uInt64 ); sal_Int64 ImpDoubleToSalInt64( double d ); @@ -58,17 +58,17 @@ double ImpSalUInt64ToDouble( sal_uInt64 n ); // SBXLNG.CXX -INT32 ImpGetLong( const SbxValues* ); +INT32 ImpGetLong( const SbxValues* ); void ImpPutLong( SbxValues*, INT32 ); // SBXSNG.CXX -float ImpGetSingle( const SbxValues* ); +float ImpGetSingle( const SbxValues* ); void ImpPutSingle( SbxValues*, float ); // SBXDBL.CXX -double ImpGetDouble( const SbxValues* ); +double ImpGetDouble( const SbxValues* ); void ImpPutDouble( SbxValues*, double, BOOL bCoreString=FALSE ); #if FALSE @@ -83,15 +83,15 @@ void ImpPutUINT64( SbxValues*, const SbxUINT64& ); // SBXCURR.CXX SbxUINT64 ImpDoubleToUINT64( double ); -double ImpUINT64ToDouble( const SbxUINT64& ); +double ImpUINT64ToDouble( const SbxUINT64& ); SbxINT64 ImpDoubleToINT64( double ); -double ImpINT64ToDouble( const SbxINT64& ); +double ImpINT64ToDouble( const SbxINT64& ); #if TRUE -INT32 ImpGetCurrLong( const SbxValues* ); +INT32 ImpGetCurrLong( const SbxValues* ); void ImpPutCurrLong( SbxValues*, INT32 ); -INT32 ImpDoubleToCurrLong( double ); -double ImpCurrLongToDouble( INT32 ); +INT32 ImpDoubleToCurrLong( double ); +double ImpCurrLongToDouble( INT32 ); #endif SbxINT64 ImpGetCurrency( const SbxValues* ); @@ -100,7 +100,7 @@ inline SbxINT64 ImpDoubleToCurrency( double d ) { return ImpDoubleToINT64( d * CURRENCY_FACTOR ); } inline -double ImpCurrencyToDouble( const SbxINT64 &r ) +double ImpCurrencyToDouble( const SbxINT64 &r ) { return ImpINT64ToDouble( r ) / CURRENCY_FACTOR; } @@ -112,14 +112,14 @@ void ImpPutDecimal( SbxValues* p, SbxDecimal* pDec ); // SBXDATE.CXX -double ImpGetDate( const SbxValues* ); +double ImpGetDate( const SbxValues* ); void ImpPutDate( SbxValues*, double ); // SBXSTR.CXX -::rtl::OUString ImpGetString( const SbxValues* ); -::rtl::OUString ImpGetCoreString( const SbxValues* ); -void ImpPutString( SbxValues*, const ::rtl::OUString* ); +::rtl::OUString ImpGetString( const SbxValues* ); +::rtl::OUString ImpGetCoreString( const SbxValues* ); +void ImpPutString( SbxValues*, const ::rtl::OUString* ); // SBXCHAR.CXX @@ -127,17 +127,17 @@ sal_Unicode ImpGetChar( const SbxValues* ); void ImpPutChar( SbxValues*, sal_Unicode ); // SBXBYTE.CXX -BYTE ImpGetByte( const SbxValues* ); +BYTE ImpGetByte( const SbxValues* ); void ImpPutByte( SbxValues*, BYTE ); // SBXUINT.CXX -UINT16 ImpGetUShort( const SbxValues* ); +UINT16 ImpGetUShort( const SbxValues* ); void ImpPutUShort( SbxValues*, UINT16 ); // SBXULNG.CXX -UINT32 ImpGetULong( const SbxValues* ); +UINT32 ImpGetULong( const SbxValues* ); void ImpPutULong( SbxValues*, UINT32 ); // SBXBOOL.CXX diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index d94586c50a12..0057d6f93aea 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -219,7 +219,7 @@ start: { SbxDecimal* pDec = ImpCreateDecimal( p ); if( !pDec->setDouble( dVal ) ) - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); break; } case SbxBYREF | SbxSTRING: diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 054373ac9113..ed151a79679f 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ double ImpGetDate( const SbxValues* p ) LanguageType eLangType = GetpApp()->GetSettings().GetLanguage(); SvNumberFormatter* pFormatter; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); pFormatter = new SvNumberFormatter( xFactory, eLangType ); @@ -125,13 +125,13 @@ double ImpGetDate( const SbxValues* p ) String aStr( aDateStr ); aStr.AppendAscii( " HH:MM:SS" ); - pFormatter->PutandConvertEntry( aStr, nCheckPos, nType, + pFormatter->PutandConvertEntry( aStr, nCheckPos, nType, nIndex, LANGUAGE_GERMAN, eLangType ); BOOL bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes ); if ( bSuccess ) { short nType_ = pFormatter->GetType( nIndex ); - if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE | + if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE | NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED ))) bSuccess = FALSE; } @@ -237,7 +237,7 @@ start: { SbxDecimal* pDec = ImpCreateDecimal( p ); if( !pDec->setDouble( n ) ) - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); break; } direct: @@ -255,7 +255,7 @@ start: LanguageType eLangType = GetpApp()->GetSettings().GetLanguage(); SvNumberFormatter* pFormatter; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); pFormatter = new SvNumberFormatter( xFactory, eLangType ); diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index f0fe163a7a50..32d4a891b341 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,11 +78,11 @@ double ImpGetDouble( const SbxValues* p ) case SbxSTRING: case SbxLPSTR: if( !p->pOUString ) - { + { nRes = 0; if ( SbiRuntime::isVBAEnabled() )// VBA only behaviour SbxBase::SetError( SbxERR_CONVERSION ); - } + } else { double d; @@ -170,7 +170,7 @@ start: { SbxDecimal* pDec = ImpCreateDecimal( p ); if( !pDec->setDouble( n ) ) - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); break; } direct: diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 8dcf1d44df61..2b53c5fc1cab 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -364,28 +364,28 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight return (SbxDecimal::CmpResult)0; } -void SbxDecimal::setChar( sal_Unicode val ) { (void)val; } -void SbxDecimal::setByte( BYTE val ) { (void)val; } -void SbxDecimal::setShort( INT16 val ) { (void)val; } -void SbxDecimal::setLong( INT32 val ) { (void)val; } -void SbxDecimal::setUShort( UINT16 val ) { (void)val; } -void SbxDecimal::setULong( UINT32 val ) { (void)val; } -bool SbxDecimal::setSingle( float val ) { (void)val; return false; } -bool SbxDecimal::setDouble( double val ) { (void)val; return false; } -void SbxDecimal::setInt( int val ) { (void)val; } -void SbxDecimal::setUInt( unsigned int val ) { (void)val; } -bool SbxDecimal::setString( ::rtl::OUString* pOUString ) { (void)pOUString; return false; } - -bool SbxDecimal::getChar( sal_Unicode& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getByte( BYTE& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getShort( INT16& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getLong( INT32& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getUShort( UINT16& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getULong( UINT32& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getSingle( float& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getDouble( double& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getInt( int& rVal ) { (void)rVal; return false; } -bool SbxDecimal::getUInt( unsigned int& rVal ) { (void)rVal; return false; } +void SbxDecimal::setChar( sal_Unicode val ) { (void)val; } +void SbxDecimal::setByte( BYTE val ) { (void)val; } +void SbxDecimal::setShort( INT16 val ) { (void)val; } +void SbxDecimal::setLong( INT32 val ) { (void)val; } +void SbxDecimal::setUShort( UINT16 val ) { (void)val; } +void SbxDecimal::setULong( UINT32 val ) { (void)val; } +bool SbxDecimal::setSingle( float val ) { (void)val; return false; } +bool SbxDecimal::setDouble( double val ) { (void)val; return false; } +void SbxDecimal::setInt( int val ) { (void)val; } +void SbxDecimal::setUInt( unsigned int val ) { (void)val; } +bool SbxDecimal::setString( ::rtl::OUString* pOUString ) { (void)pOUString; return false; } + +bool SbxDecimal::getChar( sal_Unicode& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getByte( BYTE& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getShort( INT16& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getLong( INT32& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getUShort( UINT16& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getULong( UINT32& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getSingle( float& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getDouble( double& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getInt( int& rVal ) { (void)rVal; return false; } +bool SbxDecimal::getUInt( unsigned int& rVal ) { (void)rVal; return false; } #endif @@ -513,7 +513,7 @@ start: case SbxCURRENCY: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); @@ -752,7 +752,7 @@ start: case SbxBYREF | SbxSINGLE: if( !pDec->getSingle( *p->pSingle ) ) { - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); *p->pSingle = 0; } break; @@ -761,7 +761,7 @@ start: case SbxBYREF | SbxDOUBLE: if( !pDec->getDouble( *p->pDouble ) ) { - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); *p->pDouble = 0; } break; @@ -769,14 +769,14 @@ start: { double d; pDec->getDouble( d ); - *p->pULong64 = ImpDoubleToUINT64( d ); + *p->pULong64 = ImpDoubleToUINT64( d ); break; } case SbxBYREF | SbxLONG64: { double d; pDec->getDouble( d ); - *p->pLong64 = ImpDoubleToINT64( d ); + *p->pLong64 = ImpDoubleToINT64( d ); break; } case SbxBYREF | SbxCURRENCY: diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index fcd7edbe1bc7..85d550919013 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ #undef WB_LEFT #undef WB_RIGHT #include <tools/prewin.h> -} // close extern "C" { +} // close extern "C" { #ifndef __MINGW32__ #include <comutil.h> #endif #include <oleauto.h> -extern "C" { // reopen extern "C" { +extern "C" { // reopen extern "C" { #include <tools/postwin.h> #endif @@ -60,9 +60,9 @@ class SbxDecimal friend void releaseDecimalPtr( SbxDecimal*& rpDecimal ); #ifdef WIN32 - DECIMAL maDec; + DECIMAL maDec; #endif - INT32 mnRefCount; + INT32 mnRefCount; public: SbxDecimal( void ); diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index cc48256fbfbc..0235bc5ce285 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index 182b4e7db37c..533de965dbbb 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,26 +41,26 @@ TODO: gibt es noch irgend welche Star-Basic Besonderheiten ? BEMERKUNG: Visual-Basic behandelt folgende (ung"ultige) Format-Strings wie angezeigt: - ##0##.##0## --> ##000.000## + ##0##.##0## --> ##000.000## (diese Klasse verh"alt sich genau so). */ -#include <stdio.h> // f"ur: sprintf() -#include <float.h> // f"ur: DBL_DIG, DBL_EPSILON -#include <math.h> // f"ur: floor(), fabs(), log10(), pow() +#include <stdio.h> // f"ur: sprintf() +#include <float.h> // f"ur: DBL_DIG, DBL_EPSILON +#include <math.h> // f"ur: floor(), fabs(), log10(), pow() //================================================================= //=========================== DEFINES ============================= //================================================================= -#define _NO_DIGIT -1 +#define _NO_DIGIT -1 -#define MAX_NO_OF_EXP_DIGITS 5 +#define MAX_NO_OF_EXP_DIGITS 5 // +4 wegen dem Wertebereich: zwischen -308 und +308 // +1 f"ur abschliessende 0 -#define MAX_NO_OF_DIGITS DBL_DIG -#define MAX_DOUBLE_BUFFER_LENGTH MAX_NO_OF_DIGITS + 9 +#define MAX_NO_OF_DIGITS DBL_DIG +#define MAX_DOUBLE_BUFFER_LENGTH MAX_NO_OF_DIGITS + 9 // +1 f"ur Vorzeichen // +1 f"ur Ziffer vor dem Dezimal-Punkt // +1 f"ur Dezimal-Punkt @@ -69,38 +69,38 @@ BEMERKUNG: Visual-Basic behandelt folgende (ung"ultige) Format-Strings // +1 f"ur abschliessende 0 // Defines f"ur die Ziffern: -#define ASCII_0 '0' // 48 -#define ASCII_9 '9' // 57 +#define ASCII_0 '0' // 48 +#define ASCII_9 '9' // 57 -#define CREATE_1000SEP_CHAR '@' +#define CREATE_1000SEP_CHAR '@' -#define FORMAT_SEPARATOR ';' +#define FORMAT_SEPARATOR ';' // vordefinierte Formate f"ur den Format$()-Befehl: -#define BASICFORMAT_GENERALNUMBER "General Number" -#define BASICFORMAT_CURRENCY "Currency" -#define BASICFORMAT_FIXED "Fixed" -#define BASICFORMAT_STANDARD "Standard" -#define BASICFORMAT_PERCENT "Percent" -#define BASICFORMAT_SCIENTIFIC "Scientific" -#define BASICFORMAT_YESNO "Yes/No" -#define BASICFORMAT_TRUEFALSE "True/False" -#define BASICFORMAT_ONOFF "On/Off" - -#define EMPTYFORMATSTRING "" +#define BASICFORMAT_GENERALNUMBER "General Number" +#define BASICFORMAT_CURRENCY "Currency" +#define BASICFORMAT_FIXED "Fixed" +#define BASICFORMAT_STANDARD "Standard" +#define BASICFORMAT_PERCENT "Percent" +#define BASICFORMAT_SCIENTIFIC "Scientific" +#define BASICFORMAT_YESNO "Yes/No" +#define BASICFORMAT_TRUEFALSE "True/False" +#define BASICFORMAT_ONOFF "On/Off" + +#define EMPTYFORMATSTRING "" // Bem.: Visual-Basic hat bei Floating-Point-Zahlen maximal 12 Stellen -// nach dem Dezimal-Punkt. +// nach dem Dezimal-Punkt. // Alle Format-Strings sind kompatibel zu Visual-Basic: -#define GENERALNUMBER_FORMAT "0.############" +#define GENERALNUMBER_FORMAT "0.############" // max. 12 Stellen in Visual-Basic ! -#define CURRENCY_FORMAT "@$0.00;@($0.00)" -#define FIXED_FORMAT "0.00" -#define STANDARD_FORMAT "@0.00" -#define PERCENT_FORMAT "0.00%" -#define SCIENTIFIC_FORMAT "#.00E+00" +#define CURRENCY_FORMAT "@$0.00;@($0.00)" +#define FIXED_FORMAT "0.00" +#define STANDARD_FORMAT "@0.00" +#define PERCENT_FORMAT "0.00%" +#define SCIENTIFIC_FORMAT "#.00E+00" // BEMERKUNG: das Zeichen @ bedeutet, das Tausender-Separatoren erzeugt -// weden sollen. Dies ist eine StarBasic 'Erweiterung'. +// weden sollen. Dies ist eine StarBasic 'Erweiterung'. //================================================================= @@ -145,7 +145,7 @@ SbxBasicFormater::SbxBasicFormater( sal_Unicode _cDecPoint, sal_Unicode _cThousa /* void SbxBasicFormater::ShowError( char * sErrMsg ) { -// cout << "ERROR in Format$(): " << sErrMsg << endl; +// cout << "ERROR in Format$(): " << sErrMsg << endl; } */ // verschiebt alle Zeichen des Strings, angefangen von der nStartPos, @@ -397,7 +397,7 @@ short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos, nMaxDigit = (short)get_number_of_digits( dNumber ); // f"uhrende Ziffern 'l"oschen' // Bem.: Fehler nur bei Zahlen gr"osser 0, d.h. bei Ziffern vor dem - // Dezimal-Punkt + // Dezimal-Punkt if( nMaxDigit<nPos && !bFoundFirstDigit && nPos>=0 ) return _NO_DIGIT; // Ziffer gefunden, setze Flag: @@ -423,7 +423,7 @@ short SbxBasicFormater::RoundDigit( double dNumber ) // ist der Wertebereich g"ultig ? if( dNumber<0.0 || dNumber>10.0 ) return -1; - short nTempHigh = (short)(dNumber+0.5); // ggf. floor( ) + short nTempHigh = (short)(dNumber+0.5); // ggf. floor( ) return nTempHigh; } @@ -435,7 +435,7 @@ short SbxBasicFormater::RoundDigit( double dNumber ) // werden muss String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & bFound ) { - bFound = FALSE; // default... + bFound = FALSE; // default... USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR ); if( nPos!=STRING_NOTFOUND ) @@ -454,7 +454,7 @@ String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & b // siehe auch GetPosFormatString() String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & bFound ) { - bFound = FALSE; // default... + bFound = FALSE; // default... USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR ); if( nPos!=STRING_NOTFOUND ) @@ -481,7 +481,7 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b // siehe auch GetPosFormatString() String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFound ) { - bFound = FALSE; // default... + bFound = FALSE; // default... USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR ); if( nPos!=STRING_NOTFOUND ) @@ -513,7 +513,7 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo // siehe auch GetPosFormatString() String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL & bFound ) { - bFound = FALSE; // default... + bFound = FALSE; // default... USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR ); if( nPos!=STRING_NOTFOUND ) @@ -584,7 +584,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg, nNoOfDigitsLeft++; // TODO hier ggf. bessere Fehler-"Uberpr"ufung der Mantisse auf g"ultige Syntax (siehe Grammatik) // ACHTUNG: 'undefiniertes' Verhalten falls # und 0 - // gemischt werden !!! + // gemischt werden !!! // BEMERKUNG: eigentlich sind #-Platzhalter bei Scientific // Darstellung vor dem Dezimal-Punkt sinnlos ! if( c=='#' ) @@ -592,16 +592,16 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg, } else if( nState==1 ) nNoOfDigitsRight++; - else if( nState==-1 ) // suche 0 im Exponent + else if( nState==-1 ) // suche 0 im Exponent { - if( c=='#' ) // # schaltet den Zustand weiter + if( c=='#' ) // # schaltet den Zustand weiter { nNoOfOptionalExponentDigits++; nState = -2; } nNoOfExponentDigits++; } - else if( nState==-2 ) // suche # im Exponent + else if( nState==-2 ) // suche # im Exponent { if( c=='0' ) // ERROR: 0 nach # im Exponent ist NICHT erlaubt !! @@ -613,14 +613,14 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg, case '.': nState++; if( nState>1 ) - return -1; // ERROR: zu viele Dezimal-Punkte + return -1; // ERROR: zu viele Dezimal-Punkte break; case '%': bPercent = TRUE; /* old: bPercent++; if( bPercent>1 ) - return -2; // ERROR: zu viele Prozent-Zeichen + return -2; // ERROR: zu viele Prozent-Zeichen */ break; case '(': @@ -633,19 +633,19 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg, // Zeichen gepr"uft if( ch!=0 && (ch==',' || ch=='.') ) nMultipleThousandSeparators++; - } break; + } break; case 'e': case 'E': // #i13821 not when no digits before if( nNoOfDigitsLeft > 0 || nNoOfDigitsRight > 0 ) { - nState = -1; // breche jetzt das Z"ahlen der Stellen ab + nState = -1; // breche jetzt das Z"ahlen der Stellen ab bScientific = TRUE; } /* old: bScientific++; if( bScientific>1 ) - return -3; // ERROR: zu viele Exponent-Zeichen + return -3; // ERROR: zu viele Exponent-Zeichen */ break; // EIGENES Kommando-Zeichen, das die Erzeugung der @@ -668,10 +668,10 @@ void SbxBasicFormater::ScanFormatString( double dNumber, const String& sFormatStrg, String& sReturnStrg, BOOL bCreateSign ) { - short /*nErr,*/nNoOfDigitsLeft,nNoOfDigitsRight,nNoOfOptionalDigitsLeft, + short /*nErr,*/nNoOfDigitsLeft,nNoOfDigitsRight,nNoOfOptionalDigitsLeft, nNoOfExponentDigits,nNoOfOptionalExponentDigits, nMultipleThousandSeparators; - BOOL bPercent,bCurrency,bScientific,bGenerateThousandSeparator; + BOOL bPercent,bCurrency,bScientific,bGenerateThousandSeparator; // Initialisiere den Return-String sReturnStrg = String(); @@ -738,7 +738,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber, if( bScientific ) { //if( nNoOfOptionalDigitsLeft>0 ) - // ShowError( "# in scientific-format in front of the decimal-point has no effect" ); + // ShowError( "# in scientific-format in front of the decimal-point has no effect" ); // beim Exponent ggf. "uberz"ahlige Stellen vor dem Komma abziehen dExponent = dExponent - (double)(nNoOfDigitsLeft-1); nDigitPos = nMaxDigit; @@ -817,13 +817,13 @@ void SbxBasicFormater::ScanFormatString( double dNumber, // muss f"ur eine leere Stelle eventuell eine 0 ausgegeben werden ? if( nMaxDigit<nDigitPos && ( c=='0' || bZeroSpaceOn ) ) { - AppendDigit( sReturnStrg,0 ); // Ja + AppendDigit( sReturnStrg,0 ); // Ja // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen bFirstDigit = FALSE; bZeroSpaceOn = 1; // BEM.: bei Visual-Basic schaltet die erste 0 f"ur alle // nachfolgenden # (bis zum Dezimal-Punkt) die 0 ein, - // dieses Verhalten wird hier mit dem Flag simmuliert. + // dieses Verhalten wird hier mit dem Flag simmuliert. // muss ggf. ein Tausender-Trennzeichen erzeugt werden? if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && nDigitPos>0 && (nDigitPos % 3 == 0) ) StrAppendChar( sReturnStrg,cThousandSep ); @@ -870,7 +870,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber, } // muss f"ur eine leere Stelle eventuell eine 0 ausgegeben werden ? if( nMaxExponentDigit<nExponentPos && c=='0' ) - AppendDigit( sReturnStrg,0 ); // Ja + AppendDigit( sReturnStrg,0 ); // Ja else #ifdef _with_sprintf AppendDigit( sReturnStrg,GetDigitAtPosExpScan( dExponent,nExponentPos,bFoundFirstDigit ) ); @@ -881,7 +881,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber, } break; case '.': - if( bDigitPosNegative ) // #i13821: If no digits before . + if( bDigitPosNegative ) // #i13821: If no digits before . { bDigitPosNegative = false; nDigitPos = 0; @@ -941,7 +941,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber, nState++; // gebe Exponent-Zeichen aus StrAppendChar( sReturnStrg,c ); - // i++; // MANIPULATION der Schleifen-Variable ! + // i++; // MANIPULATION der Schleifen-Variable ! c = sFormatStrg.GetChar( ++i ); // und gebe Vorzeichen / Exponent aus if( c!=0 ) @@ -961,18 +961,18 @@ void SbxBasicFormater::ScanFormatString( double dNumber, StrAppendChar( sReturnStrg,'+' ); } //else - // ShowError( "operator e/E did not find + or -" ); + // ShowError( "operator e/E did not find + or -" ); } //else - // ShowError( "operator e/E ended with 0" ); + // ShowError( "operator e/E ended with 0" ); break; case ',': // ACHTUNG: nur falls Zahl bisher ausgegeben wurde - // das Zeichen ausgeben + // das Zeichen ausgeben ////--> Siehe Kommentar vom 11.7. in AnalyseFormatString() ////if( !bFirstDigit ) - //// // gebe Tausender-Trennzeichen aus - //// StrAppendChar( sReturnStrg,cThousandSep ); + //// // gebe Tausender-Trennzeichen aus + //// StrAppendChar( sReturnStrg,cThousandSep ); break; case ';': break; @@ -1007,7 +1007,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber, if( c!=0 ) StrAppendChar( sReturnStrg,c ); //else - // ShowError( "operator \\ ended with 0" ); + // ShowError( "operator \\ ended with 0" ); break; case CREATE_1000SEP_CHAR: // hier ignorieren, Aktion wurde schon in diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index e15ece1b6d82..1bf183688932 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); @@ -331,7 +331,7 @@ start: SbxBase::SetError( SbxERR_OVERFLOW ); *p->puInt64 = 0; } else - *p->puInt64 = n; + *p->puInt64 = n; break; case SbxBYREF | SbxSINGLE: *p->pSingle = (float) n; break; @@ -431,7 +431,7 @@ start: case SbxCURRENCY: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); @@ -719,7 +719,7 @@ start: case SbxCURRENCY: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 47ae83cb7b21..748034171dde 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); @@ -312,7 +312,7 @@ start: SbxBase::SetError( SbxERR_OVERFLOW ); *p->puInt64 = 0; } else - *p->puInt64 = n; + *p->puInt64 = n; break; case SbxBYREF | SbxSINGLE: *p->pSingle = (float) n; break; diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx index e4ed782d75b2..c2eeaeff7dfe 100644 --- a/basic/source/sbx/sbxmstrm.cxx +++ b/basic/source/sbx/sbxmstrm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index d4681cd3574e..afc7debdc95f 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ TYPEINIT1(SbxMethod,SbxVariable) TYPEINIT1(SbxProperty,SbxVariable) TYPEINIT2(SbxObject,SbxVariable,SfxListener) -static const char* pNameProp; // Name-Property -static const char* pParentProp; // Parent-Property +static const char* pNameProp; // Name-Property +static const char* pParentProp; // Parent-Property static USHORT nNameHash = 0, nParentHash = 0; @@ -242,9 +242,9 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t ) switch( t ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -307,7 +307,7 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam ) return FALSE; } -SbxProperty* SbxObject::GetDfltProperty() +SbxProperty* SbxObject::GetDfltProperty() { if ( !pDfltProp && aDfltPropName.Len() ) { @@ -320,7 +320,7 @@ SbxProperty* SbxObject::GetDfltProperty() void SbxObject::SetDfltProperty( const XubString& rName ) { if ( rName != aDfltPropName ) - pDfltProp = NULL; + pDfltProp = NULL; aDfltPropName = rName; SetModified( TRUE ); } @@ -350,9 +350,9 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx ) if( pVar ) switch( pVar->GetClass() ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -385,9 +385,9 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy switch( ct ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -553,9 +553,9 @@ void SbxObject::QuickInsert( SbxVariable* pVar ) switch( pVar->GetClass() ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -592,9 +592,9 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar ) switch( pVar->GetClass() ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -669,9 +669,9 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx ) if( pVar ) switch( pVar->GetClass() ) { case SbxCLASS_VARIABLE: - case SbxCLASS_PROPERTY: pArray = pProps; break; - case SbxCLASS_METHOD: pArray = pMethods; break; - case SbxCLASS_OBJECT: pArray = pObjs; break; + case SbxCLASS_PROPERTY: pArray = pProps; break; + case SbxCLASS_METHOD: pArray = pMethods; break; + case SbxCLASS_OBJECT: pArray = pObjs; break; default: DBG_ASSERT( !this, "Ungueltige SBX-Klasse" ); } @@ -707,8 +707,8 @@ void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos ) pArray->Insert( refVar, nPos ); } } -// SetModified( TRUE ); -// Broadcast( SBX_HINT_OBJECTCHANGED ); +// SetModified( TRUE ); +// Broadcast( SBX_HINT_OBJECTCHANGED ); } static BOOL LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray ) @@ -1051,7 +1051,7 @@ SbxClassType SbxProperty::GetClass() const void SbxObject::GarbageCollection( ULONG /*nObjects*/ ) -/* [Beschreibung] +/* [Beschreibung] Diese statische Methode durchsucht die n"achsten 'nObjects' der zur Zeit existierenden <SbxObject>-Instanzen nach zyklischen Referenzen, die sich diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx index 61080be5deb1..612911aaad04 100644 --- a/basic/source/sbx/sbxres.cxx +++ b/basic/source/sbx/sbxres.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ static const char* pSbxRes[] = { "Item", "Remove", - "Error ", // with blank! + "Error ", // with blank! "False", "True" }; diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx index 135dcf80f7c9..eb2e20266503 100644 --- a/basic/source/sbx/sbxres.hxx +++ b/basic/source/sbx/sbxres.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,46 +35,46 @@ // Because it is non-critical resources (BASIC-Keywords), // we can work with dummies. -#define STRING_TYPES 0 -#define STRING_EMPTY 0 -#define STRING_NULL 1 -#define STRING_INTEGER 2 -#define STRING_LONG 3 -#define STRING_SINGLE 4 -#define STRING_DOUBLE 5 -#define STRING_CURRENCY 6 -#define STRING_DATE 7 -#define STRING_STRING 8 -#define STRING_OBJECT 9 -#define STRING_ERROR 10 -#define STRING_BOOL 11 -#define STRING_VARIANT 12 -#define STRING_ANY 13 -#define STRING_CHAR 16 -#define STRING_BYTE 17 -#define STRING_USHORT 18 -#define STRING_ULONG 19 -#define STRING_INT 22 -#define STRING_UINT 23 -#define STRING_LPSTR 30 -#define STRING_LPWSTR 31 -#define STRING_AS 32 -#define STRING_OPTIONAL 33 -#define STRING_BYREF 34 +#define STRING_TYPES 0 +#define STRING_EMPTY 0 +#define STRING_NULL 1 +#define STRING_INTEGER 2 +#define STRING_LONG 3 +#define STRING_SINGLE 4 +#define STRING_DOUBLE 5 +#define STRING_CURRENCY 6 +#define STRING_DATE 7 +#define STRING_STRING 8 +#define STRING_OBJECT 9 +#define STRING_ERROR 10 +#define STRING_BOOL 11 +#define STRING_VARIANT 12 +#define STRING_ANY 13 +#define STRING_CHAR 16 +#define STRING_BYTE 17 +#define STRING_USHORT 18 +#define STRING_ULONG 19 +#define STRING_INT 22 +#define STRING_UINT 23 +#define STRING_LPSTR 30 +#define STRING_LPWSTR 31 +#define STRING_AS 32 +#define STRING_OPTIONAL 33 +#define STRING_BYREF 34 -#define STRING_NAMEPROP 35 -#define STRING_PARENTPROP 36 -#define STRING_APPLPROP 37 -#define STRING_COUNTPROP 38 -#define STRING_ADDMETH 39 -#define STRING_ITEMMETH 40 -#define STRING_REMOVEMETH 41 +#define STRING_NAMEPROP 35 +#define STRING_PARENTPROP 36 +#define STRING_APPLPROP 37 +#define STRING_COUNTPROP 38 +#define STRING_ADDMETH 39 +#define STRING_ITEMMETH 40 +#define STRING_REMOVEMETH 41 -#define STRING_ERRORMSG 42 -#define STRING_FALSE 43 -#define STRING_TRUE 44 +#define STRING_ERRORMSG 42 +#define STRING_FALSE 43 +#define STRING_TRUE 44 -#define SBXRES_MAX 44 +#define SBXRES_MAX 44 class SbxRes : public ::rtl::OUString { diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 5fe1704bcc38..aeff9a4108e7 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType else { cIntntlComma = cNonIntntlComma; - cIntntl1000 = cNonIntntlComma; // Unschaedlich machen + cIntntl1000 = cNonIntntlComma; // Unschaedlich machen } // Nur International -> IntnlComma uebernehmen if( bOnlyIntntl ) @@ -114,10 +114,10 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma || *p == cIntntl1000) && isdigit( *(p+1 ) ) ) ) { - short exp = 0; // >0: Exponentteil - short comma = 0; // >0: Nachkomma - short ndig = 0; // Anzahl Ziffern - short ncdig = 0; // Anzahl Ziffern nach Komma + short exp = 0; // >0: Exponentteil + short comma = 0; // >0: Nachkomma + short ndig = 0; // Anzahl Ziffern + short ncdig = 0; // Anzahl Ziffern nach Komma ByteString aSearchStr( "0123456789DEde" ); // Kommas ergaenzen aSearchStr += cNonIntntlComma; @@ -257,7 +257,7 @@ SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle if( bSingle ) { SbxValues aValues( nVal ); - nVal = (double)ImpGetSingle( &aValues ); // Hier Error bei Overflow + nVal = (double)ImpGetSingle( &aValues ); // Hier Error bei Overflow } return nRetError; } @@ -265,20 +265,20 @@ SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle //////////////////////////////////////////////////////////////////////////// static double roundArray[] = { - 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6, 0.5e-7, - 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,0.5e-15 }; + 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6, 0.5e-7, + 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,0.5e-15 }; /*************************************************************************** |* -|* void myftoa( double, char *, short, short, BOOL, BOOL ) +|* void myftoa( double, char *, short, short, BOOL, BOOL ) |* -|* Beschreibung: Konversion double --> ASCII -|* Parameter: double die Zahl. -|* char * der Zielpuffer -|* short Anzahl Nachkommastellen -|* short Weite des Exponenten( 0=kein E ) -|* BOOL TRUE: mit 1000er Punkten -|* BOOL TRUE: formatfreie Ausgabe +|* Beschreibung: Konversion double --> ASCII +|* Parameter: double die Zahl. +|* char * der Zielpuffer +|* short Anzahl Nachkommastellen +|* short Weite des Exponenten( 0=kein E ) +|* BOOL TRUE: mit 1000er Punkten +|* BOOL TRUE: formatfreie Ausgabe |* ***************************************************************************/ @@ -286,9 +286,9 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth, BOOL bPt, BOOL bFix, sal_Unicode cForceThousandSep = 0 ) { - short nExp = 0; // Exponent - short nDig = nPrec + 1; // Anzahl Digits in Zahl - short nDec; // Anzahl Vorkommastellen + short nExp = 0; // Exponent + short nDig = nPrec + 1; // Anzahl Digits in Zahl + short nDec; // Anzahl Vorkommastellen register int i, digit; // Komma besorgen @@ -327,7 +327,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth, if( nPrec ) *pBuf++ = (char)cDecimalSep; i = -nExp - 1; if( nDig <= 0 ) i = nPrec; - while( i-- ) *pBuf++ = '0'; + while( i-- ) *pBuf++ = '0'; nDec = 0; } else @@ -492,17 +492,17 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType ) static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt ) { const String& rFmt = rWFmt; - char cFill = ' '; // Fuellzeichen - char cPre = 0; // Startzeichen( evtl. "$" ) - short nExpDig= 0; // Anzahl Exponentstellen - short nPrec = 0; // Anzahl Nachkommastellen - short nWidth = 0; // Zahlenweite gesamnt - short nLen; // Laenge konvertierte Zahl - BOOL bPoint = FALSE; // TRUE: mit 1000er Kommas - BOOL bTrail = FALSE; // TRUE, wenn folgendes Minus - BOOL bSign = FALSE; // TRUE: immer mit Vorzeichen - BOOL bNeg = FALSE; // TRUE: Zahl ist negativ - char cBuf [1024]; // Zahlenpuffer + char cFill = ' '; // Fuellzeichen + char cPre = 0; // Startzeichen( evtl. "$" ) + short nExpDig= 0; // Anzahl Exponentstellen + short nPrec = 0; // Anzahl Nachkommastellen + short nWidth = 0; // Zahlenweite gesamnt + short nLen; // Laenge konvertierte Zahl + BOOL bPoint = FALSE; // TRUE: mit 1000er Kommas + BOOL bTrail = FALSE; // TRUE, wenn folgendes Minus + BOOL bSign = FALSE; // TRUE: immer mit Vorzeichen + BOOL bNeg = FALSE; // TRUE: Zahl ist negativ + char cBuf [1024]; // Zahlenpuffer char * p; const char* pFmt = rFmt; rRes.Erase(); @@ -662,7 +662,7 @@ enum VbaFormatType struct VbaFormatInfo { - VbaFormatType meType; + VbaFormatType meType; const char* mpVbaFormat; // Format string in vba NfIndexTableOffset meOffset; // SvNumberFormatter format index, if meType = VBA_FORMAT_TYPE_OFFSET const char* mpOOoFormat; // if meType = VBA_FORMAT_TYPE_USERDEFINED @@ -674,12 +674,12 @@ struct VbaFormatInfo #define VBA_FORMAT_USERDEFINED( pcUtf8, pcDefinedUtf8 ) \ { VBA_FORMAT_TYPE_USERDEFINED, pcUtf8, NF_NUMBER_STANDARD, pcDefinedUtf8 } -static VbaFormatInfo pFormatInfoTable[] = +static VbaFormatInfo pFormatInfoTable[] = { VBA_FORMAT_OFFSET( "Long Date", NF_DATE_SYSTEM_LONG ), VBA_FORMAT_USERDEFINED( "Medium Date", "DD-MMM-YY" ), VBA_FORMAT_OFFSET( "Short Date", NF_DATE_SYSTEM_SHORT ), - VBA_FORMAT_USERDEFINED( "Long Time", "H:MM:SS AM/PM" ), + VBA_FORMAT_USERDEFINED( "Long Time", "H:MM:SS AM/PM" ), VBA_FORMAT_OFFSET( "Medium Time", NF_TIME_HHMMAMPM ), VBA_FORMAT_OFFSET( "Short Time", NF_TIME_HHMM ), VBA_FORMAT_OFFSET( "ddddd", NF_DATE_SYSTEM_SHORT ), @@ -697,7 +697,7 @@ VbaFormatInfo* getFormatInfo( const String& rFmt ) { if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) ) break; - i++; + i++; } return pInfo; } @@ -708,8 +708,8 @@ VbaFormatInfo* getFormatInfo( const String& rFmt ) #define VBAFORMAT_NN "nn" #define VBAFORMAT_W "w" #define VBAFORMAT_Y "y" -#define VBAFORMAT_LOWERCASE "<" -#define VBAFORMAT_UPPERCASE ">" +#define VBAFORMAT_LOWERCASE "<" +#define VBAFORMAT_UPPERCASE ">" // From methods1.cxx INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 ); @@ -724,7 +724,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const double d = 0; // pflin, It is better to use SvNumberFormatter to handle the date/time/number format. - // the SvNumberFormatter output is mostly compatible with + // the SvNumberFormatter output is mostly compatible with // VBA output besides the OOo-basic output if( pFmt && !SbxBasicFormater::isBasicFormat( *pFmt ) ) { @@ -742,7 +742,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const } LanguageType eLangType = GetpApp()->GetSettings().GetLanguage(); - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); SvNumberFormatter aFormatter( xFactory, eLangType ); @@ -754,7 +754,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const BOOL bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber ); - // number format, use SvNumberFormatter to handle it. + // number format, use SvNumberFormatter to handle it. if( bSuccess ) { String aFmtStr = *pFmt; @@ -773,14 +773,14 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const aFormatter.GetOutputString( nNumber, nIndex, rRes, &pCol ); } else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_GENERALDATE ) - || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_C )) + || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_C )) { if( nNumber <=-1.0 || nNumber >= 1.0 ) { - // short date + // short date nIndex = aFormatter.GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLangType ); aFormatter.GetOutputString( nNumber, nIndex, rRes, &pCol ); - + // long time if( floor( nNumber ) != nNumber ) { @@ -801,7 +801,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const } } else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_N ) - || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN )) + || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN )) { INT32 nMin = implGetMinute( nNumber ); if( nMin < 10 && aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ) ) @@ -850,10 +850,10 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const case SbxULONG: case SbxINT: case SbxUINT: - case SbxNULL: // #45929 NULL mit durchschummeln - nComma = 0; goto cvt; + case SbxNULL: // #45929 NULL mit durchschummeln + nComma = 0; goto cvt; case SbxSINGLE: - nComma = 6; goto cvt; + nComma = 6; goto cvt; case SbxDOUBLE: nComma = 14; @@ -888,7 +888,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const sal_Unicode cComma = rData.getNumDecimalSep().GetBuffer()[0]; sal_Unicode c1000 = rData.getNumThousandSep().GetBuffer()[0]; String aCurrencyStrg = rData.getCurrSymbol(); - + // Initialisierung des Basic-Formater-Hilfsobjekts: // hole die Resourcen f"ur die vordefinierten Ausgaben // des Format()-Befehls, z.B. f"ur "On/Off". @@ -914,7 +914,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const } // Bem.: Aus Performance-Gr"unden wird nur EIN BasicFormater- // Objekt erzeugt und 'gespeichert', dadurch erspart man - // sich das teure Resourcen-Laden (f"ur landesspezifische + // sich das teure Resourcen-Laden (f"ur landesspezifische // vordefinierte Ausgaben, z.B. "On/Off") und die st"andige // String-Erzeugungs Operationen. // ABER: dadurch ist dieser Code NICHT multithreading f"ahig ! diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index a6250bf1d570..21dd38f44424 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ start: case SbxCURRENCY: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); @@ -220,7 +220,7 @@ start: { SbxDecimal* pDec = ImpCreateDecimal( p ); if( !pDec->setSingle( n ) ) - SbxBase::SetError( SbxERR_OVERFLOW ); + SbxBase::SetError( SbxERR_OVERFLOW ); break; } direct: diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index b4b73f79cc58..ebfc7a01c23b 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -270,18 +270,18 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr) pArray->unoAddDim( 0, -1 ); } - for( USHORT i=0; i< nArraySize; i++) + for( USHORT i=0; i< nArraySize; i++) { SbxVariable* pNew = new SbxVariable( SbxBYTE ); BYTE aByte = static_cast< BYTE >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff ); pNew->PutByte( aByte ); pNew->SetFlag( SBX_WRITE ); - pArray->Put( pNew, i ); + pArray->Put( pNew, i ); if( i%2 ) pSrc++; } return pArray; -} +} // Convert an array of bytes to string (2bytes per character) ::rtl::OUString ByteArrayToString(SbxArray* pArr) @@ -300,10 +300,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr) } else { - aChar = aTempChar; + aChar = aTempChar; } } - + if( nCount%2 ) { aStrBuf.append(aChar); diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index a0d11deac1be..d5123b814a34 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 81e3e9978a5a..13c91f8e5213 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ start: case SbxBYREF | SbxDECIMAL: { double dVal; - if( p->eType == SbxCURRENCY ) + if( p->eType == SbxCURRENCY ) dVal = ImpCurrencyToDouble( p->nLong64 ); else if( p->eType == SbxLONG64 ) dVal = ImpINT64ToDouble( p->nLong64 ); diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx index c33d922864c5..4f08b3ba5f96 100644 --- a/basic/source/sbx/sbxvals.cxx +++ b/basic/source/sbx/sbxvals.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index d49aa0f495f2..2c22aa246f25 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -196,7 +196,7 @@ int matherr( struct _exception* p ) #else case _OVERFLOW: SbxBase::SetError( SbxERR_OVERFLOW ); break; #endif - default: SbxBase::SetError( SbxERR_NOTIMP ); break; + default: SbxBase::SetError( SbxERR_NOTIMP ); break; } return TRUE; } @@ -224,22 +224,22 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase() if( p ) switch( t & 0x0FFF ) { - case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (INT16*) p; break; - case SbxULONG64: n |= SbxBYREF; aData.pULong64 = (SbxUINT64*) p; break; + case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (INT16*) p; break; + case SbxULONG64: n |= SbxBYREF; aData.pULong64 = (SbxUINT64*) p; break; case SbxLONG64: - case SbxCURRENCY: n |= SbxBYREF; aData.pLong64 = (SbxINT64*) p; break; - case SbxLONG: n |= SbxBYREF; aData.pLong = (INT32*) p; break; - case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break; + case SbxCURRENCY: n |= SbxBYREF; aData.pLong64 = (SbxINT64*) p; break; + case SbxLONG: n |= SbxBYREF; aData.pLong = (INT32*) p; break; + case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break; case SbxDATE: - case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break; - case SbxSTRING: n |= SbxBYREF; aData.pOUString = (::rtl::OUString*) p; break; + case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break; + case SbxSTRING: n |= SbxBYREF; aData.pOUString = (::rtl::OUString*) p; break; case SbxERROR: case SbxUSHORT: - case SbxBOOL: n |= SbxBYREF; aData.pUShort = (UINT16*) p; break; - case SbxULONG: n |= SbxBYREF; aData.pULong = (UINT32*) p; break; - case SbxCHAR: n |= SbxBYREF; aData.pChar = (xub_Unicode*) p; break; - case SbxBYTE: n |= SbxBYREF; aData.pByte = (BYTE*) p; break; - case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break; + case SbxBOOL: n |= SbxBYREF; aData.pUShort = (UINT16*) p; break; + case SbxULONG: n |= SbxBYREF; aData.pULong = (UINT32*) p; break; + case SbxCHAR: n |= SbxBYREF; aData.pChar = (xub_Unicode*) p; break; + case SbxBYTE: n |= SbxBYREF; aData.pByte = (BYTE*) p; break; + case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break; case SbxOBJECT: aData.pObj = (SbxBase*) p; if( p ) @@ -526,29 +526,29 @@ BOOL SbxValue::Get( SbxValues& rRes ) const { case SbxEMPTY: case SbxVOID: - case SbxNULL: break; + case SbxNULL: break; case SbxVARIANT: rRes = p->aData; break; case SbxINTEGER: rRes.nInteger = ImpGetInteger( &p->aData ); break; - case SbxLONG: rRes.nLong = ImpGetLong( &p->aData ); break; - case SbxSALINT64: rRes.nInt64 = ImpGetInt64( &p->aData ); break; - case SbxSALUINT64: rRes.uInt64 = ImpGetUInt64( &p->aData ); break; - case SbxSINGLE: rRes.nSingle = ImpGetSingle( &p->aData ); break; - case SbxDOUBLE: rRes.nDouble = ImpGetDouble( &p->aData ); break; + case SbxLONG: rRes.nLong = ImpGetLong( &p->aData ); break; + case SbxSALINT64: rRes.nInt64 = ImpGetInt64( &p->aData ); break; + case SbxSALUINT64: rRes.uInt64 = ImpGetUInt64( &p->aData ); break; + case SbxSINGLE: rRes.nSingle = ImpGetSingle( &p->aData ); break; + case SbxDOUBLE: rRes.nDouble = ImpGetDouble( &p->aData ); break; case SbxCURRENCY:rRes.nLong64 = ImpGetCurrency( &p->aData ); break; case SbxDECIMAL: rRes.pDecimal = ImpGetDecimal( &p->aData ); break; - case SbxDATE: rRes.nDouble = ImpGetDate( &p->aData ); break; + case SbxDATE: rRes.nDouble = ImpGetDate( &p->aData ); break; case SbxBOOL: rRes.nUShort = sal::static_int_cast< UINT16 >( ImpGetBool( &p->aData ) ); break; - case SbxCHAR: rRes.nChar = ImpGetChar( &p->aData ); break; - case SbxBYTE: rRes.nByte = ImpGetByte( &p->aData ); break; - case SbxUSHORT: rRes.nUShort = ImpGetUShort( &p->aData ); break; - case SbxULONG: rRes.nULong = ImpGetULong( &p->aData ); break; + case SbxCHAR: rRes.nChar = ImpGetChar( &p->aData ); break; + case SbxBYTE: rRes.nByte = ImpGetByte( &p->aData ); break; + case SbxUSHORT: rRes.nUShort = ImpGetUShort( &p->aData ); break; + case SbxULONG: rRes.nULong = ImpGetULong( &p->aData ); break; case SbxLPSTR: - case SbxSTRING: p->aPic = ImpGetString( &p->aData ); + case SbxSTRING: p->aPic = ImpGetString( &p->aData ); rRes.pOUString = &p->aPic; break; - case SbxCoreSTRING: p->aPic = ImpGetCoreString( &p->aData ); + case SbxCoreSTRING: p->aPic = ImpGetCoreString( &p->aData ); rRes.pOUString = &p->aPic; break; case SbxINT: #if SAL_TYPES_SIZEOFINT == 2 @@ -704,7 +704,7 @@ BOOL SbxValue::Put( const SbxValues& rVal ) // the real values SbxValue* p = this; if( rVal.eType != SbxOBJECT ) - p = TheRealValue( FALSE ); // #55226 Don't allow an error here + p = TheRealValue( FALSE ); // #55226 Don't allow an error here if( p ) { if( !p->CanWrite() ) @@ -714,23 +714,23 @@ BOOL SbxValue::Put( const SbxValues& rVal ) { case SbxEMPTY: case SbxVOID: - case SbxNULL: break; - case SbxINTEGER: ImpPutInteger( &p->aData, rVal.nInteger ); break; - case SbxLONG: ImpPutLong( &p->aData, rVal.nLong ); break; - case SbxSALINT64: ImpPutInt64( &p->aData, rVal.nInt64 ); break; - case SbxSALUINT64: ImpPutUInt64( &p->aData, rVal.uInt64 ); break; - case SbxSINGLE: ImpPutSingle( &p->aData, rVal.nSingle ); break; - case SbxDOUBLE: ImpPutDouble( &p->aData, rVal.nDouble ); break; - case SbxCURRENCY: ImpPutCurrency( &p->aData, rVal.nLong64 ); break; - case SbxDECIMAL: ImpPutDecimal( &p->aData, rVal.pDecimal ); break; - case SbxDATE: ImpPutDate( &p->aData, rVal.nDouble ); break; - case SbxBOOL: ImpPutBool( &p->aData, rVal.nInteger ); break; - case SbxCHAR: ImpPutChar( &p->aData, rVal.nChar ); break; - case SbxBYTE: ImpPutByte( &p->aData, rVal.nByte ); break; - case SbxUSHORT: ImpPutUShort( &p->aData, rVal.nUShort ); break; - case SbxULONG: ImpPutULong( &p->aData, rVal.nULong ); break; + case SbxNULL: break; + case SbxINTEGER: ImpPutInteger( &p->aData, rVal.nInteger ); break; + case SbxLONG: ImpPutLong( &p->aData, rVal.nLong ); break; + case SbxSALINT64: ImpPutInt64( &p->aData, rVal.nInt64 ); break; + case SbxSALUINT64: ImpPutUInt64( &p->aData, rVal.uInt64 ); break; + case SbxSINGLE: ImpPutSingle( &p->aData, rVal.nSingle ); break; + case SbxDOUBLE: ImpPutDouble( &p->aData, rVal.nDouble ); break; + case SbxCURRENCY: ImpPutCurrency( &p->aData, rVal.nLong64 ); break; + case SbxDECIMAL: ImpPutDecimal( &p->aData, rVal.pDecimal ); break; + case SbxDATE: ImpPutDate( &p->aData, rVal.nDouble ); break; + case SbxBOOL: ImpPutBool( &p->aData, rVal.nInteger ); break; + case SbxCHAR: ImpPutChar( &p->aData, rVal.nChar ); break; + case SbxBYTE: ImpPutByte( &p->aData, rVal.nByte ); break; + case SbxUSHORT: ImpPutUShort( &p->aData, rVal.nUShort ); break; + case SbxULONG: ImpPutULong( &p->aData, rVal.nULong ); break; case SbxLPSTR: - case SbxSTRING: ImpPutString( &p->aData, rVal.pOUString ); break; + case SbxSTRING: ImpPutString( &p->aData, rVal.pOUString ); break; case SbxINT: #if SAL_TYPES_SIZEOFINT == 2 ImpPutInteger( &p->aData, (INT16) rVal.nInt ); @@ -1181,7 +1181,7 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) SetError( SbxERR_CONVERSION ); } else if( eOpType == SbxSTRING && rOp.IsFixed() ) - { // Numeric: there is no String allowed on the right side + { // Numeric: there is no String allowed on the right side SetError( SbxERR_CONVERSION ); } else if( ( eOp >= SbxIDIV && eOp <= SbxNOT ) || eOp == SbxMOD ) @@ -1193,8 +1193,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) || GetType() == SbxCURRENCY || GetType() == SbxULONG ) aL.eType = aR.eType = GetType(); -// else if( GetType() == SbxDouble || GetType() == SbxSingle ) -// aL.eType = aR.eType = SbxLONG64; +// else if( GetType() == SbxDouble || GetType() == SbxSingle ) +// aL.eType = aR.eType = SbxLONG64; else if ( bVBAInterop && eOpType == SbxBOOL ) aL.eType = aR.eType = SbxBOOL; else @@ -1204,9 +1204,9 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) || GetType() == SbxULONG64 || eOpType == SbxULONG64 || GetType() == SbxLONG64 || eOpType == SbxLONG64 ) aL.eType = aR.eType = SbxLONG64; -// else if( GetType() == SbxDouble || rOP.GetType() == SbxDouble -// || GetType() == SbxSingle || rOP.GetType() == SbxSingle ) -// aL.eType = aR.eType = SbxLONG64; +// else if( GetType() == SbxDouble || rOP.GetType() == SbxDouble +// || GetType() == SbxSingle || rOP.GetType() == SbxSingle ) +// aL.eType = aR.eType = SbxLONG64; else aL.eType = aR.eType = SbxLONG; @@ -1406,7 +1406,7 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) } else Lbl_OpIsDouble: - { // other operators + { // other operators aL.eType = aR.eType = SbxDOUBLE; if( rOp.Get( aR ) ) { @@ -1519,7 +1519,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const } } // From 1995-12-19: If SbxSINGLE participate, then convert to SINGLE, - // elsewise it shows a numeric error + // elsewise it shows a numeric error else if( GetType() == SbxSINGLE || rOp.GetType() == SbxSINGLE ) { aL.eType = aR.eType = SbxSINGLE; diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 4d52381650c9..9ea647e6730a 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ using namespace com::sun::star::uno; TYPEINIT1(SbxVariable,SbxValue) TYPEINIT1(SbxHint,SfxSimpleHint) -extern UINT32 nVarCreator; // in SBXBASE.CXX, fuer LoadData() +extern UINT32 nVarCreator; // in SBXBASE.CXX, fuer LoadData() #ifdef DBG_UTIL static ULONG nVar = 0; #endif @@ -58,8 +58,8 @@ static ULONG nVar = 0; class SbxVariableImpl { friend class SbxVariable; - String m_aDeclareClassName; - Reference< XInterface > m_xComListener; + String m_aDeclareClassName; + Reference< XInterface > m_xComListener; SbxVariableImpl( void ) {} @@ -509,7 +509,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer ) BOOL SbxVariable::StoreData( SvStream& rStrm ) const { - rStrm << (BYTE) 0xFF; // Marker + rStrm << (BYTE) 0xFF; // Marker BOOL bValStore; if( this->IsA( TYPE(SbxMethod) ) ) { @@ -537,7 +537,7 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const rStrm << (UINT32)nUserData; if( pInfo.Is() ) { - rStrm << (BYTE) 2; // Version 2: with UserData! + rStrm << (BYTE) 2; // Version 2: with UserData! pInfo->StoreData( rStrm ); } else diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 449a0ee86584..b4172dd2dfff 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -268,8 +268,8 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement //Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() ); //if( !xMSF.is() ) //{ - // OSL_ENSURE( 0, "### couln't get ProcessServiceFactory\n" ); - // return aRetAny; + // OSL_ENSURE( 0, "### couln't get ProcessServiceFactory\n" ); + // return aRetAny; //} Reference< XParser > xParser( mxMSF->createInstance( @@ -319,7 +319,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement InputSource source; source.aInputStream = xInput; - source.sSystemId = aFile; + source.sSystemId = aFile; try { // start parsing @@ -365,7 +365,7 @@ Reference< ::com::sun::star::resource::XStringResourcePersistence > bool bReadOnly = pDialogLibrary->mbReadOnly; // get ui locale - ::com::sun ::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); + ::com::sun ::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); OUString aComment = aResourceFileCommentBase; aComment += aLibName; diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx index c38fc75c4041..cec28757c8b5 100644 --- a/basic/source/uno/modsizeexceeded.cxx +++ b/basic/source/uno/modsizeexceeded.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >& script::ModuleSizeExceededRequest aReq; aReq.Names = sModules; - m_aRequest <<= aReq; + m_aRequest <<= aReq; - m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY ); - m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY ); + m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY ); + m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY ); m_lContinuations.realloc( 2 ); m_lContinuations[0] = m_xApprove; m_lContinuations[1] = m_xAbort; } -sal_Bool -ModuleSizeExceeded::isAbort() const -{ +sal_Bool +ModuleSizeExceeded::isAbort() const +{ framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() ); return pBase->isSelected(); } -sal_Bool -ModuleSizeExceeded::isApprove() const +sal_Bool +ModuleSizeExceeded::isApprove() const { framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() ); return pBase->isSelected(); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 06461e1ed756..9efa92eec6bb 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -323,7 +323,7 @@ DBG_NAME( SfxLibraryContainer ) // Ctor SfxLibraryContainer::SfxLibraryContainer( void ) : LibraryContainerHelper( maMutex ) - , mbVBACompat( sal_False ) + , mbVBACompat( sal_False ) , maModifiable( *this, maMutex ) , maNameContainer( getCppuType( (Reference< XNameAccess >*) NULL ) ) , mbOldInfoFormat( sal_False ) @@ -767,7 +767,7 @@ sal_Bool SfxLibraryContainer::init_Impl( { InputSource source; source.aInputStream = xInput; - source.sSystemId = aFileName; + source.sSystemId = aFileName; // start parsing ::xmlscript::LibDescriptorArray* pLibArray = new ::xmlscript::LibDescriptorArray(); @@ -1400,7 +1400,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); // #87671 Allow encryption -//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") ); +//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") ); aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) ); @@ -1548,7 +1548,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); // #87671 Allow encryption -//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") ); +//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") ); aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) ); @@ -1688,7 +1688,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib, InputSource source; source.aInputStream = xInput; - source.sSystemId = aLibInfoPath; + source.sSystemId = aLibInfoPath; // start parsing try { @@ -2381,7 +2381,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) } Reference< XNameContainer > xLib( pImplLib ); - Any aAny = importLibraryElement( xLib, aElementName, + Any aAny = importLibraryElement( xLib, aElementName, aFile, xInStream ); if( pImplLib->hasByName( aElementName ) ) { @@ -2468,7 +2468,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU aLibAny >>= xNameAccess; SfxLibrary* pImplLib = static_cast< SfxLibrary* >( xNameAccess.get() ); if( pImplLib->mbPasswordProtected && !pImplLib->mbPasswordVerified ) - return; // Lib with unverified password cannot be renamed + return; // Lib with unverified password cannot be renamed loadLibrary( Name ); // Remove from container @@ -2722,9 +2722,9 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU ::xmlscript::LibDescriptor aLibDesc; aLibDesc.aName = Name; - aLibDesc.bLink = false; // Link status gets lost? + aLibDesc.bLink = false; // Link status gets lost? aLibDesc.bReadOnly = pImplLib->mbReadOnly; - aLibDesc.bPreload = false; // Preload status gets lost? + aLibDesc.bPreload = false; // Preload status gets lost? aLibDesc.bPasswordProtected = pImplLib->mbPasswordProtected; aLibDesc.aElementNames = pImplLib->getElementNames(); @@ -2799,7 +2799,7 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString OUString aRetStr = pImplLib->maOrignialStorageURL; return aRetStr; } - + // XVBACompatibility ::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException) @@ -3168,7 +3168,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia } case BUNDLED_EXTENSIONS: { - Reference< deployment::XPackage > xScriptPackage = + Reference< deployment::XPackage > xScriptPackage = implGetNextBundledScriptPackage( rbPureDialogLib ); if( !xScriptPackage.is() ) break; @@ -3244,7 +3244,7 @@ Reference< deployment::XPackage > ScriptSubPackageIterator::getNextScriptSubPack else { xScriptPackage = implDetectScriptPackage( m_xMainPackage, rbPureDialogLib ); - m_bIsValid = false; // No more script packages + m_bIsValid = false; // No more script packages } return xScriptPackage; @@ -3364,7 +3364,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript if( m_iUserPackage == m_aUserPackagesSeq.getLength() ) { - m_eState = SHARED_EXTENSIONS; // Later: SHARED_MODULE + m_eState = SHARED_EXTENSIONS; // Later: SHARED_MODULE } else { @@ -3401,7 +3401,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri try { Reference< XExtensionManager > xSharedManager = - ExtensionManager::get( m_xContext ); + ExtensionManager::get( m_xContext ); m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); @@ -3454,7 +3454,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr try { Reference< XExtensionManager > xManager = - ExtensionManager::get( m_xContext ); + ExtensionManager::get( m_xContext ); m_aBundledPackagesSeq = xManager->getDeployedExtensions (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); diff --git a/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx index 3c8d115b1912..f054225a8b04 100644 --- a/basic/source/uno/sbmodule.cxx +++ b/basic/source/uno/sbmodule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx index 2dd0b3dd7910..64e9f16c2cc6 100644 --- a/basic/source/uno/sbmodule.hxx +++ b/basic/source/uno/sbmodule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx index 5c4e1fc98309..77361efb4077 100644 --- a/basic/source/uno/sbservices.cxx +++ b/basic/source/uno/sbservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 7c4ac1fae2c9..cc5c26e3d40f 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -154,7 +154,7 @@ SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embe // Methods to get library instances of the correct type SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName ) { - (void)aName; // Only needed for SfxDialogLibrary + (void)aName; // Only needed for SfxDialogLibrary SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxMSF, mxSFI ); return pRet; } @@ -163,7 +163,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, const OUString& StorageURL, sal_Bool ReadOnly ) { - (void)aName; // Only needed for SfxDialogLibrary + (void)aName; // Only needed for SfxDialogLibrary SfxLibrary* pRet = new SfxScriptLibrary ( maModifiable, mxMSF, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly ); @@ -245,7 +245,7 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement ( const Reference < XNameContainer >& xLib, - const OUString& aElementName, const OUString& aFile, + const OUString& aElementName, const OUString& aFile, const uno::Reference< io::XInputStream >& xInStream ) { Any aRetAny; @@ -286,7 +286,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement InputSource source; source.aInputStream = xInput; - source.sSystemId = aFile; + source.sSystemId = aFile; // start parsing xmlscript::ModuleDescriptor aMod; @@ -359,9 +359,9 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement { try { - xVBACodeNameAccess.set( xSF->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "ooo.vba.VBAObjectModuleObjectProvider"))), + xVBACodeNameAccess.set( xSF->createInstance( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "ooo.vba.VBAObjectModuleObjectProvider"))), UNO_QUERY ); } catch(uno::Exception&) {} @@ -370,7 +370,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement { try { - aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY ); + aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY ); } catch(uno::Exception&) { @@ -1014,7 +1014,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary throw io::IOException(); // read access denied, seems to be impossible Reference< XNameContainer > xLib( pLib ); - Any aAny = importLibraryElement( xLib, + Any aAny = importLibraryElement( xLib, aElementName, aSourceStreamName, xInStream ); if( pLib->hasByName( aElementName ) ) @@ -1120,9 +1120,9 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary throw io::IOException(); // read access denied, seems to be impossible Reference< XNameContainer > xLib( pLib ); - Any aAny = importLibraryElement( xLib, - aElementName, - aSourceStreamName, + Any aAny = importLibraryElement( xLib, + aElementName, + aSourceStreamName, xInStream ); if( pLib->hasByName( aElementName ) ) { @@ -1151,11 +1151,11 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary } } -//REMOVE // If the password is verified the library must remain modified, because -//REMOVE // otherwise for saving the storage would be copied and that doesn't work -//REMOVE // with mtg's storages when the password is verified -//REMOVE if( !pLib->mbPasswordVerified ) -//REMOVE pLib->mbModified = sal_False; +//REMOVE // If the password is verified the library must remain modified, because +//REMOVE // otherwise for saving the storage would be copied and that doesn't work +//REMOVE // with mtg's storages when the password is verified +//REMOVE if( !pLib->mbPasswordVerified ) +//REMOVE pLib->mbModified = sal_False; return bRet; } @@ -1253,7 +1253,7 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, // Provide modify state including resources sal_Bool SfxScriptLibrary::isModified( void ) { - return implIsModified(); // No resources + return implIsModified(); // No resources } void SfxScriptLibrary::storeResources( void ) @@ -1297,7 +1297,7 @@ bool SAL_CALL SfxScriptLibrary::isLibraryElementValid( ::com::sun::star::uno::An IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE ); -script::ModuleInfo SAL_CALL +script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const ::rtl::OUString& ModuleName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { if ( !hasModuleInfo( ModuleName ) ) diff --git a/basic/workben/basmgr.src b/basic/workben/basmgr.src index f89c719c2399..e53efc82467f 100644 --- a/basic/workben/basmgr.src +++ b/basic/workben/basmgr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx index 979648fe7112..dfdf83a66142 100644 --- a/basic/workben/mgrtest.cxx +++ b/basic/workben/mgrtest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,27 +39,27 @@ #include <basic/basrdll.hxx> // Defines for ToolBox-Id's -#define TB_NEW 1 -#define TB_OPENSTORAGE 2 -#define TB_SAVESTORAGE 3 -#define TB_ORG 4 -#define TB_CREATELIB1 10 -#define TB_CREATELIB2 11 -#define TB_CREATELIB3 12 -#define TB_LOADLIB1 20 -#define TB_LOADLIB2 21 -#define TB_LOADLIB3 22 -#define TB_STORELIBX 30 -#define TB_UNLOADX 31 -#define TB_LOADX 32 -#define TB_EXECX 33 -#define TB_REMOVEX 34 -#define TB_REMOVEDELX 35 - -#define TB_LIB0 40 -#define TB_LIB1 41 -#define TB_LIB2 42 -#define TB_LIB3 43 +#define TB_NEW 1 +#define TB_OPENSTORAGE 2 +#define TB_SAVESTORAGE 3 +#define TB_ORG 4 +#define TB_CREATELIB1 10 +#define TB_CREATELIB2 11 +#define TB_CREATELIB3 12 +#define TB_LOADLIB1 20 +#define TB_LOADLIB2 21 +#define TB_LOADLIB3 22 +#define TB_STORELIBX 30 +#define TB_UNLOADX 31 +#define TB_LOADX 32 +#define TB_EXECX 33 +#define TB_REMOVEX 34 +#define TB_REMOVEDELX 35 + +#define TB_LIB0 40 +#define TB_LIB1 41 +#define TB_LIB2 42 +#define TB_LIB3 43 const char* pLib1Str = "Lib1"; const char* pLib2Str = "Lib2"; @@ -78,11 +78,11 @@ public: class TestWindow : public WorkWindow { private: - ToolBox aToolBox; - BasicManager* pBasMgr; + ToolBox aToolBox; + BasicManager* pBasMgr; - void CheckError(); - USHORT nLibX; + void CheckError(); + USHORT nLibX; DECL_LINK( BasicErrorHdl, StarBASIC * ); @@ -90,16 +90,16 @@ public: TestWindow(); ~TestWindow(); - virtual void Paint( const Rectangle& ); - virtual void Resize(); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); DECL_LINK( TBSelect, ToolBox * ); - void UpdateToolBox(); - void ShowInfo(); + void UpdateToolBox(); + void ShowInfo(); }; TestWindow::~TestWindow() @@ -417,13 +417,13 @@ IMPL_LINK( TestWindow, TBSelect, ToolBox *, p ) } break; - case TB_LIB0: nLibX = 0; + case TB_LIB0: nLibX = 0; break; - case TB_LIB1: nLibX = 1; + case TB_LIB1: nLibX = 1; break; - case TB_LIB2: nLibX = 2; + case TB_LIB2: nLibX = 2; break; - case TB_LIB3: nLibX = 3; + case TB_LIB3: nLibX = 3; break; } |