diff options
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/sbobjmod.hxx | 10 | ||||
-rw-r--r-- | basic/inc/sbstdobj.hxx | 14 | ||||
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 86 | ||||
-rw-r--r-- | basic/source/classes/errobject.cxx | 26 | ||||
-rw-r--r-- | basic/source/classes/eventatt.cxx | 6 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 18 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 36 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 48 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 24 | ||||
-rw-r--r-- | basic/source/inc/sbjsmod.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 30 | ||||
-rw-r--r-- | basic/source/inc/stdobj.hxx | 6 | ||||
-rw-r--r-- | basic/source/inc/symtbl.hxx | 6 | ||||
-rw-r--r-- | basic/source/runtime/inputbox.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 20 |
15 files changed, 168 insertions, 168 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index a47763c19295..b5b422d58e62 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -39,10 +39,10 @@ protected: public: TYPEINFO_OVERRIDE(); SbObjModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible ); - virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); + virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE; virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; using SbxValue::GetObject; SbxVariable* GetObject(); @@ -66,7 +66,7 @@ public: TYPEINFO_OVERRIDE(); SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat ); virtual ~SbUserFormModule(); - virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); + virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE; void ResetApiObj( bool bTriggerTerminateEvent = true ); void Unload(); void Load(); @@ -95,8 +95,8 @@ public: SbUserFormModuleInstance( SbUserFormModule* pParentModule, const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat ); - virtual sal_Bool IsClass( const OUString& ) const; - virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); + virtual sal_Bool IsClass( const OUString& ) const SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE; }; #endif // INCLUDED_BASIC_INC_SBOBJMOD_HXX diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 62a40560ec69..9fdce98b96f8 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -31,7 +31,7 @@ class BASIC_DLLPUBLIC SbStdFactory : public SbxFactory public: SbStdFactory(); - virtual SbxObject* CreateObject( const OUString& rClassName ); + virtual SbxObject* CreateObject( const OUString& rClassName ) SAL_OVERRIDE; }; // class SbStdPicture @@ -42,7 +42,7 @@ protected: ~SbStdPicture(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; void PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); void PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); @@ -52,7 +52,7 @@ public: TYPEINFO_OVERRIDE(); SbStdPicture(); - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; Graphic GetGraphic() const { return aGraphic; } void SetGraphic( const Graphic& rGrf ) { aGraphic = rGrf; } @@ -71,7 +71,7 @@ protected: ~SbStdFont(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; void PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); void PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); @@ -84,7 +84,7 @@ public: TYPEINFO_OVERRIDE(); SbStdFont(); - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; void SetBold( sal_Bool bB ) { bBold = bB; } sal_Bool IsBold() const { return bBold; } @@ -107,7 +107,7 @@ protected: ~SbStdClipboard(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; void MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); void MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); @@ -120,7 +120,7 @@ public: TYPEINFO_OVERRIDE(); SbStdClipboard(); - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; }; #endif // INCLUDED_BASIC_INC_SBSTDOBJ_HXX diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index a000c5677e29..3247f827dc54 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -158,15 +158,15 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -1858,11 +1858,11 @@ public: : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {} // Methods XStarBasicModuleInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maName; } - virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maLanguage; } - virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maSource; } }; @@ -1879,9 +1879,9 @@ public: : maName( aName ), mData( Data ) {} // Methods XStarBasicDialogInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maName; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) + virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return mData; } }; @@ -1916,17 +1916,17 @@ public: {} // Methods XStarBasicLibraryInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maName; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) + virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxModuleContainer; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) + virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxDialogContainer; } - virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maPassword; } - virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maExternaleSourceURL; } - virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return maLinkTargetURL; } }; @@ -1942,29 +1942,29 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception); + lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception); + lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; // Methods XElementAccess @@ -2093,27 +2093,27 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; // Methods XElementAccess @@ -2252,27 +2252,27 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -2402,16 +2402,16 @@ public: public: // Methods virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException, std::exception); + throw(container::ElementExistException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer() diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 1eec72926949..91b0b0f4b5f1 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -41,22 +41,22 @@ public: ErrObject(); ~ErrObject(); // Attributes - virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception); - 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, std::exception); + virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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, std::exception) SAL_OVERRIDE; // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // Helper method void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 39b43108a02c..8647e8a23bfd 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -155,13 +155,13 @@ public: // Methods of XAllListener virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) - throw( RuntimeException, std::exception ); + throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) - throw( InvocationTargetException, RuntimeException, std::exception ); + throw( InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methods of XEventListener virtual void SAL_CALL disposing(const EventObject& Source) - throw( RuntimeException, std::exception ); + throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; // Methods XAllListener diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 098fd3127aad..8c5fe1b3167d 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -80,9 +80,9 @@ public: void startListening(); void stopListening(); - virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; private: StarBASIC& mrDocBasic; @@ -449,8 +449,8 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass ) class SbOLEFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); - virtual SbxObject* CreateObject( const OUString& ); + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; + virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; }; SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 ) @@ -474,8 +474,8 @@ SbxObject* SbOLEFactory::CreateObject( const OUString& rClassName ) class SbFormFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); - virtual SbxObject* CreateObject( const OUString& ); + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; + virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; }; SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 ) @@ -578,8 +578,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) class SbTypeFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); - virtual SbxObject* CreateObject( const OUString& ); + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; + virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; }; SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 ) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 0d28425bbbcc..4e32d311c34a 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3907,11 +3907,11 @@ public: ~BasicAllListener_Impl(); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ); - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ); + virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ); + virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -4013,14 +4013,14 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); + throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); - virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ); + throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) SAL_OVERRIDE; private: Reference< XIdlReflection > m_xCoreReflection; @@ -4352,24 +4352,24 @@ public: {} // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) - throw( UnknownPropertyException, std::exception ); + throw( UnknownPropertyException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL getValue( const OUString& rProperty ) - throw( UnknownPropertyException, std::exception ); - virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception); - virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception); + throw( UnknownPropertyException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) SAL_OVERRIDE; virtual Any SAL_CALL invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >& rOutParamIndex, Sequence< Any >& rOutParam ) - throw( CannotConvertException, InvocationTargetException, std::exception ); + throw( CannotConvertException, InvocationTargetException, std::exception ) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index b7732319de9d..8cd6588a5a90 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -104,24 +104,24 @@ public: DocObjectWrapper( SbModule* pMod ); virtual ~DocObjectWrapper(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Sequence<sal_Int8>(); } - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception); - virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception); - virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ); + virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ); + virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; }; DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pVar->GetName() ) @@ -2348,7 +2348,7 @@ public: mxModel.clear(); } - virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( mpUserForm ) { @@ -2363,7 +2363,7 @@ public: } - virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { #ifdef IN_THE_FUTURE uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY ); @@ -2395,21 +2395,21 @@ public: } - virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { mbOpened = false; mbShowing = false; } - virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( mpUserForm ) { @@ -2422,13 +2422,13 @@ public: } } - virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( mpUserForm ) mpUserForm->triggerDeactivateEvent(); } - virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( mpUserForm ) { @@ -2437,21 +2437,21 @@ public: } } - virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( mpUserForm ) mpUserForm->triggerLayoutEvent(); } - virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate" if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) ) @@ -2463,7 +2463,7 @@ public: } } - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { SAL_INFO("basic", "** Userform/Dialog disposing"); removeListener(); diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 23141c641254..19c560d274cd 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -51,7 +51,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) @@ -59,31 +59,31 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -121,11 +121,11 @@ public: // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index 35906bcb3c4c..fb655f587b25 100644 --- a/basic/source/inc/sbjsmod.hxx +++ b/basic/source/inc/sbjsmod.hxx @@ -28,8 +28,8 @@ class SbJScriptModule : public SbModule { - virtual bool LoadData( SvStream&, sal_uInt16 ); - virtual bool StoreData( SvStream& ) const; + virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual bool StoreData( SvStream& ) const SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1); TYPEINFO_OVERRIDE(); diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 0566e3964f68..50032f84dcf6 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -87,7 +87,7 @@ public: ~SbUnoStructRefObject(); // Find overloaded to support e. g. NameAccess - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; // Force creation of all properties for debugging void createAllProperties( void ) @@ -95,7 +95,7 @@ public: // give out value ::com::sun::star::uno::Any getUnoAny(); - void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); + void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SbUnoStructRefObject); @@ -127,7 +127,7 @@ public: void doIntrospection( void ); // Find overloaded to support e. g. NameAccess - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; // Force creation of all properties for debugging void createAllProperties( void ) @@ -138,7 +138,7 @@ public: ::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& ); + void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; bool isNativeCOMObject( void ) { return bNativeCOMObject; } @@ -172,7 +172,7 @@ public: bool bInvocation, bool bDirect = false ); virtual ~SbUnoMethod(); - virtual SbxInfo* GetInfo(); + virtual SbxInfo* GetInfo() SAL_OVERRIDE; const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos( void ); @@ -214,8 +214,8 @@ public: class SbUnoFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); - virtual SbxObject* CreateObject( const OUString& ); + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; + virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; }; // wrapper for an uno-class @@ -234,7 +234,7 @@ public: {} - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; } @@ -263,9 +263,9 @@ public: , m_bNeedsInit( true ) {} - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); + void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SbUnoService); @@ -288,7 +288,7 @@ public: SbUnoServiceCtor( const OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc ); virtual ~SbUnoServiceCtor(); - virtual SbxInfo* GetInfo(); + virtual SbxInfo* GetInfo() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc( void ) { return m_xServiceCtorDesc; } @@ -305,7 +305,7 @@ public: SbUnoSingleton( const OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc ); - void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); + void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SbUnoSingleton); @@ -377,7 +377,7 @@ class BasicCollection : public SbxObject void Initialize(); virtual ~BasicCollection(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; sal_Int32 implGetIndex( SbxVariable* pIndexVar ); sal_Int32 implGetIndexForName( const OUString& rName ); void CollAdd( SbxArray* pPar_ ); @@ -387,8 +387,8 @@ class BasicCollection : public SbxObject public: TYPEINFO_OVERRIDE(); BasicCollection( const OUString& rClassname ); - virtual SbxVariable* Find( const OUString&, SbxClassType ); - virtual void Clear(); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; }; typedef boost::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx index ba1e13389849..3efdebcbf0a0 100644 --- a/basic/source/inc/stdobj.hxx +++ b/basic/source/inc/stdobj.hxx @@ -33,11 +33,11 @@ class SbiStdObject : public SbxObject using SbxVariable::GetInfo; SbxInfo* GetInfo( short ); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; public: SbiStdObject( const OUString&, StarBASIC* ); - virtual SbxVariable* Find( const OUString&, SbxClassType ); - virtual void SetModified( bool ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual void SetModified( bool ) SAL_OVERRIDE; }; #endif diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 4a5956da1709..c2bc4f068448 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -185,8 +185,8 @@ class SbiProcDef : public SbiSymDef { // procedure definition (from basic): public: SbiProcDef( SbiParser*, const OUString&, bool bProcDecl=false ); virtual ~SbiProcDef(); - virtual SbiProcDef* GetProcDef(); - virtual void SetType( SbxDataType ); + virtual SbiProcDef* GetProcDef() SAL_OVERRIDE; + virtual void SetType( SbxDataType ) SAL_OVERRIDE; SbiSymPool& GetParams() { return aParams; } SbiSymPool& GetLabels() { return aLabels; } SbiSymPool& GetLocals() { return GetPool();} @@ -221,7 +221,7 @@ class SbiConstDef : public SbiSymDef public: SbiConstDef( const OUString& ); virtual ~SbiConstDef(); - virtual SbiConstDef* GetConstDef(); + virtual SbiConstDef* GetConstDef() SAL_OVERRIDE; void Set( double, SbxDataType ); void Set( const OUString& ); double GetValue() { return nVal; } diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index af59f84f4d5c..e574e4e51c96 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -45,7 +45,7 @@ class SvRTLInputBox : public ModalDialog public: SvRTLInputBox( Window* pParent, const OUString& rPrompt, const OUString& rTitle, const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 ); - OUString GetText() const { return aText; } + OUString GetText() const SAL_OVERRIDE { return aText; } }; SvRTLInputBox::SvRTLInputBox( Window* pParent, const OUString& rPrompt, diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 5ed56b56f300..dd486a927a3c 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -313,11 +313,11 @@ class OslStream : public SvStream public: OslStream( const OUString& rName, short nStrmMode ); ~OslStream(); - virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ); - virtual void FlushData(); - virtual void SetSize( sal_uIntPtr nSize ); + virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; + virtual void SetSize( sal_uIntPtr nSize ) SAL_OVERRIDE; }; OslStream::OslStream( const OUString& rName, short nStrmMode ) @@ -407,11 +407,11 @@ public: UCBStream( Reference< XInputStream > & xIS ); UCBStream( Reference< XStream > & xS ); ~UCBStream(); - virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ); - virtual void FlushData(); - virtual void SetSize( sal_uIntPtr nSize ); + virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; + virtual void SetSize( sal_uIntPtr nSize ) SAL_OVERRIDE; }; UCBStream::UCBStream( Reference< XInputStream > & rStm ) |