summaryrefslogtreecommitdiffstats
path: root/filter/source/xsltdialog
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /filter/source/xsltdialog
parentHAVE_CXX11_OVERRIDE is required on all supported toolchains (diff)
downloadcore-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz
core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'filter/source/xsltdialog')
-rw-r--r--filter/source/xsltdialog/typedetectionimport.hxx16
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx32
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx18
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
8 files changed, 39 insertions, 39 deletions
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index f0ddd7584563..fcc668e96454 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -67,21 +67,21 @@ public:
static void doImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference < css::io::XInputStream > xOS, XMLFilterVector& rFilters );
virtual void SAL_CALL startDocument( )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
- throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
private:
void fillFilterVector( XMLFilterVector& rFilters );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 44aa2b8e5c52..c8d36a723fdb 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -73,35 +73,35 @@ public:
protected:
// XInterface
- virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
- virtual void SAL_CALL release() throw () SAL_OVERRIDE;
+ virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire() throw () override;
+ virtual void SAL_CALL release() throw () override;
// XTypeProvider
- virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override;
+ virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override;
// XExecutableDialog
- virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
// XTerminateListener
- 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;
- virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
/** Called in dispose method after the listeners were notified.
*/
- virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() override;
private:
css::uno::Reference<css::awt::XWindow> mxParent; /// parent window
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 1eebb9c110f6..6b4e8d238cd9 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -43,16 +43,16 @@ private:
VclPtr<HeaderBar> m_pHeaderBar;
VclPtr<XMLFilterListBox> m_pFocusCtrl;
protected:
- virtual void Resize() SAL_OVERRIDE;
- virtual Size GetOptimalSize() const SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual Size GetOptimalSize() const override;
public:
explicit SvxPathControl(vcl::Window* pParent);
HeaderBar* getHeaderBar() { return m_pHeaderBar; }
XMLFilterListBox* getListBox() { return m_pFocusCtrl; }
virtual ~SvxPathControl();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual bool Notify( NotifyEvent& rNEvt ) override;
};
class HeaderBar;
@@ -70,14 +70,14 @@ private:
public:
XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl);
virtual ~XMLFilterListBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
/** adds a new filter info entry to the ui filter list */
void addFilterEntry( const filter_info_impl* pInfo );
void changeEntry( const filter_info_impl* pInfo );
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
};
@@ -89,13 +89,13 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
Dialog::InitFlag eFlag = Dialog::InitFlag::Default);
virtual ~XMLFilterSettingsDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
DECL_LINK_TYPED(ClickHdl_Impl, Button *, void );
DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool );
- virtual short Execute() SAL_OVERRIDE;
+ virtual short Execute() override;
void onNew();
void onEdit();
@@ -107,7 +107,7 @@ public:
void updateStates();
- virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual bool Notify( NotifyEvent& rNEvt ) override;
bool isClosable() { return m_bIsClosable;}
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index a853a1472e96..067a22ac9d22 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -36,7 +36,7 @@ class XMLFilterTabDialog: public TabDialog
public:
XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
virtual ~XMLFilterTabDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
bool onOk();
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index 6bd2b91b52bd..cc90664cc457 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -34,7 +34,7 @@ class XMLFilterTabPageBasic : public TabPage
public:
explicit XMLFilterTabPageBasic(vcl::Window* pParent);
virtual ~XMLFilterTabPageBasic();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
bool FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 5a1f29a090f2..054f3e1b0f2c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -35,7 +35,7 @@ class XMLFilterTabPageXSLT : public TabPage
public:
explicit XMLFilterTabPageXSLT(vcl::Window* pParent);
virtual ~XMLFilterTabPageXSLT();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
bool FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index e6f149b906e1..eddaf829e023 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -74,10 +74,10 @@ public:
explicit GlobalEventListenerImpl( XMLFilterTestDialog* pDialog );
// XDocumentEventListener
- virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) override;
// lang::XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
private:
VclPtr<XMLFilterTestDialog> mpDialog;
};
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 3a8b119d6753..c5ee4201e52b 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -37,7 +37,7 @@ public:
XMLFilterTestDialog(vcl::Window* pParent,
const css::uno::Reference< css::uno::XComponentContext >& rxContext);
virtual ~XMLFilterTestDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void test( const filter_info_impl& rFilterInfo );