diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /unotools | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'unotools')
28 files changed, 113 insertions, 113 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index e02b0f315938..cfa440ae2acf 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -135,7 +135,7 @@ class SvtCommandOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& lPropertyNames ); + virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -150,7 +150,7 @@ class SvtCommandOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 2fed816580f8..cb1488cd83fe 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -247,7 +247,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& lPropertyNames ); + virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -262,7 +262,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; // public interface diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 5fa5ab134348..4285c4980ebc 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -86,10 +86,10 @@ namespace utl{ ~ConfigChangeListener_Impl(); //XChangesListener - virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE; //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; }; } diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index e8ff2be0a4ff..91603499f5d4 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -93,8 +93,8 @@ public: SvtDefaultOptions_Impl(); OUString GetDefaultPath( sal_uInt16 nId ) const; - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; }; // global ---------------------------------------------------------------- diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 74a3a48b9db2..92052b1f698d 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -238,7 +238,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& lPropertyNames ); + virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -253,7 +253,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index fb890c3e70fb..0121fc09762f 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -79,7 +79,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& seqPropertyNames ); + virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -94,7 +94,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode(); private: diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 54e5453b5a80..8371b3089e0a 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -61,8 +61,8 @@ public: bLoadVBA(false), bSaveVBA(false) {} ~SvtAppFilterOptions_Impl(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void Load(); bool IsLoad() const {return bLoadVBA;} @@ -133,7 +133,7 @@ public: SvtAppFilterOptions_Impl(rRoot), bLoadExecutable(false) {} - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; void Load(); bool IsLoadExecutable() const {return bLoadExecutable;} @@ -179,7 +179,7 @@ public: SvtAppFilterOptions_Impl(rRoot), bLoadExecutable(false) {} - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; void Load(); bool IsLoadExecutable() const {return bLoadExecutable;} diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 99cc3284a3d4..c6ac4757ed1e 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -66,7 +66,7 @@ class SvtFontOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& seqPropertyNames ); + virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -81,7 +81,7 @@ class SvtFontOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; /*-**************************************************************************************************** @short access method to get internal values diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index db1cc261b3e7..7858bbdb8215 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -46,7 +46,7 @@ class ItemHolder1 : private ItemHolderMutexBase public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 5e910d6bd4f3..924047324616 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -150,8 +150,8 @@ public: virtual ~SvtLinguConfigItem(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; // make some protected functions of utl::ConfigItem public using utl::ConfigItem::GetNodeNames; diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index e060a0b23861..2c30cd179357 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -65,7 +65,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& seqPropertyNames ); + virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -80,7 +80,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; /*-**************************************************************************************************** @short access method to get internal values diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index f571e6f01569..753f3aa7c77d 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -51,8 +51,8 @@ public: SfxMiscCfg( ); ~SfxMiscCfg( ); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; bool IsNotFoundWarning() const {return bNotFound;} void SetNotFoundWarning( bool bSet); diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index edcd930fd6b4..6076435dddde 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -312,8 +312,8 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem // overloaded methods of baseclass - virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ); - virtual void Commit( ); + virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE; + virtual void Commit( ) SAL_OVERRIDE; // public interface diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index 0f6e79798d2f..b673ef24e988 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -57,8 +57,8 @@ private: public: SvtOptionsDlgOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; static ::osl::Mutex & getInitMutex(); diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 2334b796b889..af844f530e29 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -67,8 +67,8 @@ public: // overloaded methods of baseclass - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; // public interface diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 321a930b1b25..d3c659256aff 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -93,8 +93,8 @@ public: SvtSaveOptions_Impl(); ~SvtSaveOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; sal_Int32 GetAutoSaveTime() const { return nAutoSaveTime; } bool IsUseUserData() const { return bUseUserData; } @@ -761,8 +761,8 @@ public: SvtLoadOptions_Impl(); ~SvtLoadOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();} bool IsLoadUserSettings() const {return bLoadUserDefinedSettings;} diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 894529523869..c2c3b2a973ac 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -58,8 +58,8 @@ public: virtual ~SvtSearchOptions_Impl(); // ConfigItem - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; bool GetFlag( sal_uInt16 nOffset ) const; void SetFlag( sal_uInt16 nOffset, bool bVal ); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index e7668bf18745..1ee9f67777b9 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -137,7 +137,7 @@ class SvtSecurityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Notify( const Sequence< OUString >& seqPropertyNames ); + virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE; /*-**************************************************************************************************** @short write changes to configuration @@ -152,7 +152,7 @@ class SvtSecurityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; // public interface diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 0457c4277ec7..7c6b0f56b036 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -72,8 +72,8 @@ public: SvtSysLocaleOptions_Impl(); virtual ~SvtSysLocaleOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; const OUString& GetLocaleString() const { return m_aLocaleString; } diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index e4c9a1924899..55697d585110 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -79,9 +79,9 @@ public: ChangeListener (Impl& rParent): m_rParent(rParent) { } // XChangesListener - virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) throw(uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing (lang::EventObject const& Source) throw(uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing (lang::EventObject const& Source) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; private: Impl& m_rParent; diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx index 6f2adc340b35..7fef9334c64a 100644 --- a/unotools/source/misc/closeveto.cxx +++ b/unotools/source/misc/closeveto.cxx @@ -60,11 +60,11 @@ namespace utl } // XCloseListener - virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // 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; bool hasOwnership() const { return m_bHasOwnership; } diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index b71652b5e508..27afe06b1a24 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -70,11 +70,11 @@ namespace utl private: // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx index 91973c5e6c64..5b983e042bf0 100644 --- a/unotools/source/misc/eventlisteneradapter.cxx +++ b/unotools/source/misc/eventlisteneradapter.cxx @@ -52,7 +52,7 @@ namespace utl const Reference< XComponent >& getComponent() const { return m_xComponent; } protected: - virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 18c64a8963c9..171311069e48 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1049,8 +1049,8 @@ private: ::std::multimap<sal_Unicode, SymbolEntry> maMagicMap; public: StarSymbolToMSMultiFontImpl(bool bPerfectOnly); - OUString ConvertChar(sal_Unicode &rChar); - OUString ConvertString(OUString &rString, sal_Int32& rIndex); + OUString ConvertChar(sal_Unicode &rChar) SAL_OVERRIDE; + OUString ConvertString(OUString &rString, sal_Int32& rIndex) SAL_OVERRIDE; }; struct ExtraTable { sal_Unicode cStar; sal_uInt8 cMS;}; diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 70d61bd229da..1bf431d31c26 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -90,11 +90,11 @@ namespace utl virtual ~CloseableComponentImpl(); // XCloseListener overridables - virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener overridables - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** starts or stops being a CloseListener at the component diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index 86021cc475ba..7cd80c33f625 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -46,7 +46,7 @@ public: virtual ~SvtSysLocale_Impl(); CharClass* GetCharClass(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; private: void setDateAcceptancePatternsConfig(); diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 626954c60c79..090704590fa5 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -66,67 +66,67 @@ public: //Methods // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release( ) - throw (); + throw () SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTempFile virtual ::sal_Bool SAL_CALL getRemoveFile() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getUri() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getResourceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInputStream virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL available( ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput( ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XOutputStream virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput( ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition( ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLength( ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStream virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTruncate virtual void SAL_CALL truncate() - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL XTempFile_createInstance( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); static OUString getImplementationName_Static (); diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index f4f0fd0c5136..7253efff8a3d 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -83,16 +83,16 @@ public: { return m_xLockBytes; } // XActiveDataControl. - virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) + virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataSink. - virtual void SAL_CALL setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException, std::exception) + virtual void SAL_CALL setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->setInputStream_Impl (rxInputStream); } - virtual Reference<XInputStream> SAL_CALL getInputStream (void) throw(RuntimeException, std::exception) + virtual Reference<XInputStream> SAL_CALL getInputStream (void) throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_xLockBytes->getInputStream_Impl(); } }; @@ -110,16 +110,16 @@ public: {} // XActiveDataControl. - virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) + virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataStreamer - virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) throw(RuntimeException, std::exception) + virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xStream = aStream; m_xLockBytes->setStream_Impl( aStream ); } - virtual Reference< XStream > SAL_CALL getStream() throw(RuntimeException, std::exception) + virtual Reference< XStream > SAL_CALL getStream() throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_xStream; } }; @@ -135,9 +135,9 @@ public: : m_aProgress( rLink ) {} // XProgressHandler - virtual void SAL_CALL push(const Any & /*rStatus*/) throw (RuntimeException, std::exception) {} - virtual void SAL_CALL pop() throw (RuntimeException, std::exception) {} - virtual void SAL_CALL update(const Any & /*rStatus*/) throw (RuntimeException, std::exception) + virtual void SAL_CALL push(const Any & /*rStatus*/) throw (RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL pop() throw (RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL update(const Any & /*rStatus*/) throw (RuntimeException, std::exception) SAL_OVERRIDE { if ( m_aProgress.IsSet() ) m_aProgress.Call( 0 ); } }; @@ -156,10 +156,10 @@ public: , m_xProgressHandler( rxProgressHandler ) {} - virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException, std::exception) + virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException, std::exception) SAL_OVERRIDE { return m_xInteractionHandler; } - virtual Reference<XProgressHandler> SAL_CALL getProgressHandler() throw (RuntimeException, std::exception) + virtual Reference<XProgressHandler> SAL_CALL getProgressHandler() throw (RuntimeException, std::exception) SAL_OVERRIDE { return m_xProgressHandler; } }; @@ -176,8 +176,8 @@ public: : m_xLockBytes( rRef ) {} - virtual void SAL_CALL disposing ( const EventObject &/*rEvent*/) throw(RuntimeException, std::exception) {} - virtual void SAL_CALL propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception); + virtual void SAL_CALL disposing ( const EventObject &/*rEvent*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception) SAL_OVERRIDE; }; void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception) @@ -291,7 +291,7 @@ public: } protected: - bool applies() const { + bool applies() const SAL_OVERRIDE { return m_aModerator.m_aResultType != NORESULT; } @@ -326,7 +326,7 @@ public: } protected: - bool applies() const { + bool applies() const SAL_OVERRIDE { return m_aModerator.m_aReplyType != NOREPLY; } @@ -346,8 +346,8 @@ public: protected: - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: osl::Mutex m_aMutex; @@ -385,14 +385,14 @@ public: ) throw( RuntimeException, std::exception - ); + ) SAL_OVERRIDE; virtual Reference<XStream> SAL_CALL getStream ( void ) throw( RuntimeException, std::exception - ) + ) SAL_OVERRIDE { osl::MutexGuard aGuard(m_aMutex); return m_xStream; @@ -423,14 +423,14 @@ public: ) throw( RuntimeException, std::exception - ); + ) SAL_OVERRIDE; virtual Reference<XInputStream> SAL_CALL getInputStream ( void ) throw( RuntimeException, std::exception - ) + ) SAL_OVERRIDE { osl::MutexGuard aGuard(m_aMutex); return m_xStream; @@ -509,7 +509,7 @@ public: virtual void SAL_CALL handle( const Reference<XInteractionRequest >& Request ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -527,13 +527,13 @@ public: virtual void SAL_CALL push( const Any& Status ) throw ( - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update( const Any& Status ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL pop( ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: |