From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 12 Oct 2015 16:04:04 +0200
Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
---
 svx/source/inc/filtnav.hxx | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'svx/source/inc/filtnav.hxx')

diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 8e1bf2190c98..7761ad679433 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -117,7 +117,7 @@ public:
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >&
         GetFilterController() { return m_xFilterController; }
 
-    virtual Image GetImage() const SAL_OVERRIDE;
+    virtual Image GetImage() const override;
 };
 
 
@@ -129,7 +129,7 @@ public:
     FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {}
 
     FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const;
-    virtual Image GetImage() const SAL_OVERRIDE;
+    virtual Image GetImage() const override;
 };
 
 
@@ -150,7 +150,7 @@ public:
     const OUString& GetFieldName() const {return m_aFieldName;}
     sal_Int32 GetComponentIndex() const { return m_nComponentIndex; }
 
-    virtual Image GetImage() const SAL_OVERRIDE;
+    virtual Image GetImage() const override;
 };
 
 
@@ -215,7 +215,7 @@ public:
     void setFormItem( FmFormItem* _pItem ) { m_pFormItem = _pItem; }
 
 protected:
-    virtual void AddSupportedFormats() SAL_OVERRIDE;
+    virtual void AddSupportedFormats() override;
 };
 
 inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats )
@@ -231,7 +231,7 @@ public:
     OFilterItemExchange* operator->() const { return static_cast<OFilterItemExchange*>(m_pTransferable); }
 
 protected:
-    virtual OLocalExchange* createExchange() const SAL_OVERRIDE;
+    virtual OLocalExchange* createExchange() const override;
 };
 
 
@@ -252,7 +252,7 @@ class FmFilterNavigator : public SvTreeListBox, public SfxListener
 public:
     FmFilterNavigator( vcl::Window* pParent );
     virtual ~FmFilterNavigator();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void UpdateContent(
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers,
@@ -263,17 +263,17 @@ public:
 protected:
     using Control::Notify;
 
-    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
-    virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
-    virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
-    virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) SAL_OVERRIDE;
-    virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) override;
+    virtual void Command( const CommandEvent& rEvt ) override;
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+    virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) override;
+    virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) override;
+    virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) override;
+    virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
 
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
-    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
-    virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
+    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) override;
+    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
+    virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override;
 
     void DeleteSelection();
     SvTreeListEntry* FindEntry(const FmFilterData* pItem) const;
@@ -316,24 +316,24 @@ private:
     VclPtr<FmFilterNavigator> m_pNavigator;
 
 protected:
-    virtual void Resize() SAL_OVERRIDE;
-    virtual bool Close() SAL_OVERRIDE;
-    virtual Size CalcDockingSize( SfxChildAlignment ) SAL_OVERRIDE;
-    virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE;
+    virtual void Resize() override;
+    virtual bool Close() override;
+    virtual Size CalcDockingSize( SfxChildAlignment ) override;
+    virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) override;
 
 public:
     FmFilterNavigatorWin( SfxBindings *pBindings, SfxChildWindow *pMgr,
                    vcl::Window* pParent );
     virtual ~FmFilterNavigatorWin();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void UpdateContent( FmFormShell* pFormShell );
-    void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
-    void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE;
+    void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
+    void FillInfo( SfxChildWinInfo& rInfo ) const override;
 
     using SfxDockingWindow::StateChanged;
 
-    virtual void GetFocus() SAL_OVERRIDE;
+    virtual void GetFocus() override;
 };
 
 
-- 
cgit