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 /editeng/source/xml | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'editeng/source/xml')
-rw-r--r-- | editeng/source/xml/editsource.hxx | 6 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 44 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 2 |
3 files changed, 26 insertions, 26 deletions
diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index 259851f57915..4b49838448ad 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -31,9 +31,9 @@ public: explicit SvxEditEngineSource( EditEngine* pEditEngine ); virtual ~SvxEditEngineSource(); - virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; private: explicit SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 7ca0ffb80a57..2dad6f43d26f 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -155,33 +155,33 @@ public: // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) override; // XAnyCompareFactory - virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -326,9 +326,9 @@ public: virtual ~SvxXMLTextExportComponent(); // methods without content: - virtual void _ExportAutoStyles() SAL_OVERRIDE; - virtual void _ExportMasterStyles() SAL_OVERRIDE; - virtual void _ExportContent() SAL_OVERRIDE; + virtual void _ExportAutoStyles() override; + virtual void _ExportMasterStyles() override; + virtual void _ExportContent() override; private: css::uno::Reference< css::text::XText > mxText; diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 5f20e25a7287..321a817e2221 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -60,7 +60,7 @@ public: SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText ); virtual ~SvxXMLTextImportContext(); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override; // SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } |