diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /basic/source | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'basic/source')
-rw-r--r-- | basic/source/basmgr/basicmanagerrepository.cxx | 4 | ||||
-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/comp/codegen.cxx | 24 | ||||
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 48 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 154 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 18 | ||||
-rw-r--r-- | basic/source/inc/sbintern.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/sbjsmod.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 30 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 70 | ||||
-rw-r--r-- | basic/source/inc/stdobj.hxx | 6 | ||||
-rw-r--r-- | basic/source/inc/symtbl.hxx | 6 | ||||
-rw-r--r-- | basic/source/runtime/comenumwrapper.hxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/inputbox.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 22 |
20 files changed, 311 insertions, 311 deletions
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 9faa5ef17e3e..5a2a2fa2eeff 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -176,10 +176,10 @@ namespace basic ); // OEventListenerAdapter overridables - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; // SfxListener overridables - virtual void Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) override; /** removes the Model/BasicManager pair given by iterator from our store */ diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 70c6a5580456..f6b9f141aec1 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -157,15 +157,15 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; // XContainerListener virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; }; @@ -1708,11 +1708,11 @@ public: : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {} // Methods XStarBasicModuleInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override { return maName; } - virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) override { return maLanguage; } - virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) override { return maSource; } }; @@ -1729,9 +1729,9 @@ public: : maName( aName ), mData( Data ) {} // Methods XStarBasicDialogInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override { return maName; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) override { return mData; } }; @@ -1766,17 +1766,17 @@ public: {} // Methods XStarBasicLibraryInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override { return maName; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) override { return mxModuleContainer; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) override { return mxDialogContainer; } - virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) override { return maPassword; } - virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) override { return maExternaleSourceURL; } - virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) override { return maLinkTargetURL; } }; @@ -1792,29 +1792,29 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + lang::WrappedTargetException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; }; // Methods XElementAccess @@ -1943,27 +1943,27 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; }; // Methods XElementAccess @@ -2100,27 +2100,27 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; }; @@ -2250,16 +2250,16 @@ public: public: // Methods virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(container::ElementExistException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) 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 7abf2567fd12..202b76aed444 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -40,22 +40,22 @@ public: ErrObject(); virtual ~ErrObject(); // Attributes - 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; + virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) override; // Methods - 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; + virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception) 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) override; // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) 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 f73d8055d25e..0afda2fdfc64 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -149,13 +149,13 @@ public: // Methods of XAllListener virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) - throw( InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + throw( InvocationTargetException, RuntimeException, std::exception ) override; // Methods of XEventListener virtual void SAL_CALL disposing(const EventObject& Source) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; }; // Methods XAllListener diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 01586bd94996..5deefb066087 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -84,9 +84,9 @@ public: mbDisposed = bDisposed; } - 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; + virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override; private: StarBASIC& mrDocBasic; @@ -469,8 +469,8 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass ) class SbOLEFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; }; SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 ) @@ -492,8 +492,8 @@ SbxObject* SbOLEFactory::CreateObject( const OUString& rClassName ) class SbFormFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; }; SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 ) @@ -596,8 +596,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) class SbTypeFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; }; SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 ) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 0e9c826580b9..248f96b566d4 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3888,11 +3888,11 @@ public: virtual ~BasicAllListener_Impl(); // Methods of XAllListener - 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; + virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override; + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) override; }; @@ -3994,14 +3994,14 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - 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; + throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; + virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override; private: Reference< XIdlReflection > m_xCoreReflection; @@ -4322,25 +4322,25 @@ public: {} // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) SAL_OVERRIDE; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) override; virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) - throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (UnknownPropertyException, RuntimeException, std::exception) override; virtual Any SAL_CALL getValue( const OUString& rProperty ) - throw (UnknownPropertyException, RuntimeException, 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; + throw (UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) override; virtual Any SAL_CALL invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >& rOutParamIndex, Sequence< Any >& rOutParam ) throw (CannotConvertException, InvocationTargetException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; // XComponent - 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; + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override; }; ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index ce72ed39514b..ab36e858888c 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -102,24 +102,24 @@ public: explicit DocObjectWrapper( SbModule* pMod ); virtual ~DocObjectWrapper(); - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override { return css::uno::Sequence<sal_Int8>(); } - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception) 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) 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 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) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ) override; - virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) override; }; DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pVar->GetName() ) @@ -2338,7 +2338,7 @@ public: mxModel.clear(); } - virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { if ( mpUserForm ) { @@ -2353,7 +2353,7 @@ public: } - virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { #ifdef IN_THE_FUTURE uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY ); @@ -2385,21 +2385,21 @@ public: } - virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { mbOpened = false; mbShowing = false; } - virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL windowNormalized( 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) override { } - virtual void SAL_CALL windowActivated( 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) override { if ( mpUserForm ) { @@ -2412,13 +2412,13 @@ public: } } - virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { if ( mpUserForm ) mpUserForm->triggerDeactivateEvent(); } - virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override { if ( mpUserForm ) { @@ -2427,21 +2427,21 @@ public: } } - virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override { if ( mpUserForm ) mpUserForm->triggerLayoutEvent(); } - virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL windowHidden( 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) override { } - virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) override { // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate" if( rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::CLOSEDOC ) ) @@ -2453,7 +2453,7 @@ public: } } - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) override { SAL_INFO("basic", "** Userform/Dialog disposing"); removeListener(); diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 29fece0132c6..5cafbaa78db4 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -468,11 +468,11 @@ class OffSetAccumulator : public PCodeVisitor< T > public: OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){} - virtual void start( sal_uInt8* /*pStart*/ ) SAL_OVERRIDE {} - virtual void processOpCode0( SbiOpcode /*eOp*/ ) SAL_OVERRIDE { ++m_nNumOp0; } - virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ) SAL_OVERRIDE { ++m_nNumSingleParams; } - virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) SAL_OVERRIDE { ++m_nNumDoubleParams; } - virtual void end() SAL_OVERRIDE {} + virtual void start( sal_uInt8* /*pStart*/ ) override {} + virtual void processOpCode0( SbiOpcode /*eOp*/ ) override { ++m_nNumOp0; } + virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ) override { ++m_nNumSingleParams; } + virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) override { ++m_nNumDoubleParams; } + virtual void end() override {} S offset() { T result = 0 ; @@ -480,7 +480,7 @@ public: result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 ) * m_nNumDoubleParams ); return std::min(static_cast<T>(max), result); } - virtual bool processParams() SAL_OVERRIDE { return false; } + virtual bool processParams() override { return false; } }; @@ -492,12 +492,12 @@ class BufferTransformer : public PCodeVisitor< T > SbiBuffer m_ConvertedBuf; public: BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {} - virtual void start( sal_uInt8* pStart ) SAL_OVERRIDE { m_pStart = pStart; } - virtual void processOpCode0( SbiOpcode eOp ) SAL_OVERRIDE + virtual void start( sal_uInt8* pStart ) override { m_pStart = pStart; } + virtual void processOpCode0( SbiOpcode eOp ) override { m_ConvertedBuf += (sal_uInt8)eOp; } - virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) SAL_OVERRIDE + virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) override { m_ConvertedBuf += (sal_uInt8)eOp; switch( eOp ) @@ -522,7 +522,7 @@ public: } m_ConvertedBuf += static_cast<S>(nOp1); } - virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) SAL_OVERRIDE + virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) override { m_ConvertedBuf += (sal_uInt8)eOp; if ( eOp == _CASEIS ) @@ -532,8 +532,8 @@ public: m_ConvertedBuf += static_cast<S>(nOp2); } - virtual bool processParams() SAL_OVERRIDE { return true; } - virtual void end() SAL_OVERRIDE {} + virtual bool processParams() override { return true; } + virtual void end() override {} // yeuch, careful here, you can only call // GetBuffer on the returned SbiBuffer once, also // you (as the caller) get to own the memory diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index d60d0e6f8530..5f2ed0fa3d53 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -36,37 +36,37 @@ namespace basic class SfxDialogLibraryContainer : public SfxLibraryContainer { // Methods to distinguish between different library types - virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) SAL_OVERRIDE; + virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) override; virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, bool ReadOnly ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL createEmptyLibraryElement() SAL_OVERRIDE; - virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE; + const OUString& StorageURL, bool ReadOnly ) override; + virtual css::uno::Any SAL_CALL createEmptyLibraryElement() override; + virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override; virtual void SAL_CALL writeLibraryElement ( const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const css::uno::Reference< css::io::XOutputStream >& xOutput ) - throw(css::uno::Exception) SAL_OVERRIDE; + throw(css::uno::Exception) override; virtual css::uno::Any SAL_CALL importLibraryElement ( const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const OUString& aFile, - const css::uno::Reference< css::io::XInputStream >& xElementStream ) SAL_OVERRIDE; + const css::uno::Reference< css::io::XInputStream >& xElementStream ) override; - virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE; + virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) override; - virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE; + virtual SfxLibraryContainer* createInstanceImpl() override; - virtual void onNewRootStorage() SAL_OVERRIDE; + virtual void onNewRootStorage() override; - virtual const sal_Char* SAL_CALL getInfoFileName() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getOldInfoFileName() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getLibElementFileExtension() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE; + virtual const sal_Char* SAL_CALL getInfoFileName() const override; + virtual const sal_Char* SAL_CALL getOldInfoFileName() const override; + virtual const sal_Char* SAL_CALL getLibElementFileExtension() const override; + virtual const sal_Char* SAL_CALL getLibrariesDir() const override; public: SfxDialogLibraryContainer(); @@ -77,7 +77,7 @@ public: const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::uno::RuntimeException, css::lang::WrappedTargetException, - std::exception) SAL_OVERRIDE; + std::exception) override; // Resource handling css::uno::Reference< css::resource::XStringResourcePersistence > @@ -85,12 +85,12 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -106,13 +106,13 @@ class SfxDialogLibrary :public SfxLibrary OUString m_aName; // Provide modify state including resources - virtual bool isModified() SAL_OVERRIDE; - virtual void storeResources() SAL_OVERRIDE; - virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; + virtual bool isModified() override; + virtual void storeResources() override; + virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) override; virtual void storeResourcesToURL( const OUString& URL, - const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE; + const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override; virtual void storeResourcesToStorage( const css::uno::Reference - < css::embed::XStorage >& xStorage ) SAL_OVERRIDE; + < css::embed::XStorage >& xStorage ) override; public: SfxDialogLibrary @@ -139,7 +139,7 @@ public: // XStringResourceSupplier virtual css::uno::Reference< css::resource::XStringResourceResolver > - SAL_CALL getStringResource( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getStringResource( ) throw (css::uno::RuntimeException, std::exception) override; OUString getName() { return m_aName; } @@ -153,7 +153,7 @@ public: static bool containsValidDialog( const css::uno::Any& aElement ); protected: - virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE; + virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override; }; } // namespace basic diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 085d9e3945ce..e88820b6bc35 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -107,49 +107,49 @@ public: // Methods XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XContainer virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -198,7 +198,7 @@ private: virtual bool implTypedNotify( const css::uno::Reference< css::script::vba::XVBAScriptListener >& rxListener, const css::script::vba::VBAScriptEvent& rEvent ) - throw (css::uno::Exception) SAL_OVERRIDE; + throw (css::uno::Exception) override; }; @@ -362,10 +362,10 @@ protected: void SAL_CALL initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument ); // OEventListenerAdapter - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; private: void init_Impl( const OUString& rInitialDocumentURL, @@ -390,145 +390,145 @@ public: // Methods XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Members XStorageBasedLibraryContainer - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Methods XModifiable (base of XPersistentLibraryContainer) - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer) - virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL storeLibraries( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeLibraries( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //Methods XLibraryContainer3 virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XLibraryContainer2 (base of XPersistentLibraryContainer) virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) throw (css::container::NoSuchElementException, css::container::ElementExistException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XLibraryContainer (base of XLibraryContainer2) virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL createLibrary( const OUString& Name ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL createLibraryLink ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeLibrary( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL loadLibrary( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XContainer virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // Methods XLibraryContainerExport virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw (css::uno::Exception, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw (css::uno::RuntimeException, std::exception) override = 0; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw (css::uno::RuntimeException, std::exception) override = 0; // Methods XVBACompatibility - virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msProjectName; } - virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) override { return msProjectName; } + virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRunningVBAScripts() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVBAScriptListener( const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVBAScriptListener( const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -636,65 +636,65 @@ public: ); // Methods XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); } + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw() override { OComponentHelper::acquire(); } + virtual void SAL_CALL release() throw() override { OComponentHelper::release(); } // Methods XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // Methods XContainer virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; public: struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } }; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 5bd6d51fe50c..325976ec3fea 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -49,7 +49,7 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue) @@ -57,31 +57,31 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (std::exception) SAL_OVERRIDE; + throw (std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (std::exception) SAL_OVERRIDE; + throw (std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (std::exception) SAL_OVERRIDE; + throw (std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (std::exception) SAL_OVERRIDE; + throw (std::exception) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; class StarBASIC; diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 931ad30f9ed7..de299dc630f3 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -39,8 +39,8 @@ class SbModule; class SbiFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; }; typedef ::std::vector< OUString > StringVector; @@ -72,8 +72,8 @@ public: void AddClassModule( SbModule* pClassModule ); void RemoveClassModule( SbModule* pClassModule ); - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; SbModule* FindClass( const OUString& rClassName ); }; diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index a34ba5cb3abd..9ba492efcacd 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 ) SAL_OVERRIDE; - virtual bool StoreData( SvStream& ) const SAL_OVERRIDE; + virtual bool LoadData( SvStream&, sal_uInt16 ) override; + virtual bool StoreData( SvStream& ) const 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 692e5140aefa..f601f8ebe08e 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -88,7 +88,7 @@ public: virtual ~SbUnoStructRefObject(); // override Find to support e. g. NameAccess - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; // Force creation of all properties for debugging void createAllProperties() @@ -96,7 +96,7 @@ public: // give out value css::uno::Any getUnoAny(); - void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( SfxBroadcaster&, const SfxHint& rHint ) override; }; class SbUnoObject: public SbxObject @@ -127,7 +127,7 @@ public: void doIntrospection(); // override Find to support e. g. NameAccess - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; // Force creation of all properties for debugging void createAllProperties() @@ -138,7 +138,7 @@ public: css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; } css::uno::Reference< css::script::XInvocation > getInvocation() { return mxInvocation; } - void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( SfxBroadcaster&, const SfxHint& rHint ) override; bool isNativeCOMObject() { return bNativeCOMObject; } @@ -170,7 +170,7 @@ public: SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > xUnoMethod_, bool bInvocation ); virtual ~SbUnoMethod(); - virtual SbxInfo* GetInfo() SAL_OVERRIDE; + virtual SbxInfo* GetInfo() override; const css::uno::Sequence< css::reflection::ParamInfo >& getParamInfos(); @@ -210,8 +210,8 @@ public: class SbUnoFactory : public SbxFactory { public: - virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) SAL_OVERRIDE; - virtual SbxObject* CreateObject( const OUString& ) SAL_OVERRIDE; + virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ) override; + virtual SbxObject* CreateObject( const OUString& ) override; }; // wrapper for an uno-class @@ -230,7 +230,7 @@ public: {} - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; const css::uno::Reference< css::reflection::XIdlClass >& getUnoClass() { return m_xClass; } @@ -258,9 +258,9 @@ public: , m_bNeedsInit( true ) {} - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; - void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( SfxBroadcaster&, const SfxHint& rHint ) override; }; SbUnoService* findUnoService( const OUString& rName ); @@ -282,7 +282,7 @@ public: SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > xServiceCtorDesc ); virtual ~SbUnoServiceCtor(); - virtual SbxInfo* GetInfo() SAL_OVERRIDE; + virtual SbxInfo* GetInfo() override; css::uno::Reference< css::reflection::XServiceConstructorDescription > getServiceCtorDesc() { return m_xServiceCtorDesc; } @@ -299,7 +299,7 @@ public: SbUnoSingleton( const OUString& aName_, const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc ); - void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( SfxBroadcaster&, const SfxHint& rHint ) override; }; SbUnoSingleton* findUnoSingleton( const OUString& rName ); @@ -369,7 +369,7 @@ class BasicCollection : public SbxObject void Initialize(); virtual ~BasicCollection(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; sal_Int32 implGetIndex( SbxVariable* pIndexVar ); sal_Int32 implGetIndexForName( const OUString& rName ); void CollAdd( SbxArray* pPar_ ); @@ -379,8 +379,8 @@ class BasicCollection : public SbxObject public: TYPEINFO_OVERRIDE(); BasicCollection( const OUString& rClassname ); - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - virtual void Clear() SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; + virtual void Clear() override; }; typedef std::unordered_map< OUString, css::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 232552cc0b19..69914c9a37a7 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -36,57 +36,57 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas css::uno::Reference< css::container::XNameAccess > mxCodeNameAccess; // Methods to distinguish between deffirent library types - virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) SAL_OVERRIDE; + virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) override; virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, bool ReadOnly ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL createEmptyLibraryElement() SAL_OVERRIDE; - virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE; + const OUString& StorageURL, bool ReadOnly ) override; + virtual css::uno::Any SAL_CALL createEmptyLibraryElement() override; + virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override; virtual void SAL_CALL writeLibraryElement ( const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const css::uno::Reference< css::io::XOutputStream >& xOutput ) - throw(css::uno::Exception) SAL_OVERRIDE; + throw(css::uno::Exception) override; virtual css::uno::Any SAL_CALL importLibraryElement ( const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const OUString& aFile, - const css::uno::Reference< css::io::XInputStream >& xElementStream ) SAL_OVERRIDE; + const css::uno::Reference< css::io::XInputStream >& xElementStream ) override; - virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE; + virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) override; - virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE; + virtual SfxLibraryContainer* createInstanceImpl() override; // Password encryption virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, - const css::uno::Reference< css::embed::XStorage>& xStorage, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; + const css::uno::Reference< css::embed::XStorage>& xStorage, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override; // New variant for library export virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& aTargetURL, - const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; + const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override; virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly=false ) throw(css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; - virtual void onNewRootStorage() SAL_OVERRIDE; + virtual void onNewRootStorage() override; // OldBasicPassword interface - virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) SAL_OVERRIDE; + virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) override; - virtual const sal_Char* SAL_CALL getInfoFileName() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getOldInfoFileName() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getLibElementFileExtension() const SAL_OVERRIDE; - virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE; + virtual const sal_Char* SAL_CALL getInfoFileName() const override; + virtual const sal_Char* SAL_CALL getOldInfoFileName() const override; + virtual const sal_Char* SAL_CALL getLibElementFileExtension() const override; + virtual const sal_Char* SAL_CALL getLibrariesDir() const override; public: SfxScriptLibraryContainer(); @@ -96,28 +96,28 @@ public: // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -136,13 +136,13 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE ModuleInfoMap mModuleInfos; // Provide modify state including resources - virtual bool isModified() SAL_OVERRIDE; - virtual void storeResources() SAL_OVERRIDE; - virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; + virtual bool isModified() override; + virtual void storeResources() override; + virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) override; virtual void storeResourcesToURL( const OUString& URL, - const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE; - virtual void storeResourcesToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) SAL_OVERRIDE; - virtual bool isLoadedStorable() SAL_OVERRIDE; + const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override; + virtual void storeResourcesToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; + virtual bool isLoadedStorable() override; public: SfxScriptLibrary @@ -164,15 +164,15 @@ public: DECLARE_XTYPEPROVIDER() // XVBAModuleInfo - virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; static bool containsValidModule( const css::uno::Any& _rElement ); protected: - virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE; + virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override; }; diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx index 619b59c344a4..0d6293f84e4c 100644 --- a/basic/source/inc/stdobj.hxx +++ b/basic/source/inc/stdobj.hxx @@ -32,11 +32,11 @@ class SbiStdObject : public SbxObject virtual ~SbiStdObject(); using SbxVariable::GetInfo; static SbxInfo* GetInfo( short ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: SbiStdObject( const OUString&, StarBASIC* ); - virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - virtual void SetModified( bool ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) override; + virtual void SetModified( bool ) override; }; #endif diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index e4e84fe6a6a6..d9e279d7761b 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -177,8 +177,8 @@ class SbiProcDef : public SbiSymDef { // procedure definition (from basic): public: SbiProcDef( SbiParser*, const OUString&, bool bProcDecl=false ); virtual ~SbiProcDef(); - virtual SbiProcDef* GetProcDef() SAL_OVERRIDE; - virtual void SetType( SbxDataType ) SAL_OVERRIDE; + virtual SbiProcDef* GetProcDef() override; + virtual void SetType( SbxDataType ) override; SbiSymPool& GetParams() { return aParams; } SbiSymPool& GetLabels() { return aLabels; } SbiSymPool& GetLocals() { return GetPool();} @@ -213,7 +213,7 @@ class SbiConstDef : public SbiSymDef public: SbiConstDef( const OUString& ); virtual ~SbiConstDef(); - virtual SbiConstDef* GetConstDef() SAL_OVERRIDE; + virtual SbiConstDef* GetConstDef() override; void Set( double, SbxDataType ); void Set( const OUString& ); double GetValue() { return nVal; } diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx index fbe750c6a451..f1267ca9618f 100644 --- a/basic/source/runtime/comenumwrapper.hxx +++ b/basic/source/runtime/comenumwrapper.hxx @@ -38,8 +38,8 @@ public: } // container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index c9e14b73efad..dbd58613da73 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -47,8 +47,8 @@ public: SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 ); virtual ~SvRTLInputBox() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; - OUString GetText() const SAL_OVERRIDE { return aText; } + virtual void dispose() override; + OUString GetText() const override { return aText; } }; SvRTLInputBox::SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index cf3b33eef8c1..bfeb4d6c65d2 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -73,7 +73,7 @@ class SbiInputDialog : public ModalDialog { public: SbiInputDialog( vcl::Window*, const OUString& ); virtual ~SbiInputDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const OUString& GetInput() { return aText; } }; @@ -312,11 +312,11 @@ class OslStream : public SvStream public: OslStream( const OUString& rName, StreamMode nStrmMode ); virtual ~OslStream(); - virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; - virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; - virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; - virtual void FlushData() SAL_OVERRIDE; - virtual void SetSize( sal_uInt64 nSize) SAL_OVERRIDE; + virtual sal_Size GetData( void* pData, sal_Size nSize ) override; + virtual sal_Size PutData( const void* pData, sal_Size nSize ) override; + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override; + virtual void FlushData() override; + virtual void SetSize( sal_uInt64 nSize) override; }; OslStream::OslStream( const OUString& rName, StreamMode nStrmMode ) @@ -408,11 +408,11 @@ public: explicit UCBStream( Reference< XInputStream > & xIS ); explicit UCBStream( Reference< XStream > & xS ); virtual ~UCBStream(); - virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; - virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; - virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; - virtual void FlushData() SAL_OVERRIDE; - virtual void SetSize( sal_uInt64 nSize ) SAL_OVERRIDE; + virtual sal_Size GetData( void* pData, sal_Size nSize ) override; + virtual sal_Size PutData( const void* pData, sal_Size nSize ) override; + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override; + virtual void FlushData() override; + virtual void SetSize( sal_uInt64 nSize ) override; }; UCBStream::UCBStream( Reference< XInputStream > & rStm ) |