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 /include/svx/svdedxv.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/svdedxv.hxx')
-rw-r--r-- | include/svx/svdedxv.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 1211e20f61a5..9e00c8a163dd 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -149,15 +149,15 @@ public: void TextEditDrawing(SdrPaintWindow& rPaintWindow) const; // Actionhandling for macromod - virtual bool IsAction() const SAL_OVERRIDE; - virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; - virtual void EndAction() SAL_OVERRIDE; - virtual void BrkAction() SAL_OVERRIDE; - virtual void BckAction() SAL_OVERRIDE; - virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; + virtual bool IsAction() const override; + virtual void MovAction(const Point& rPnt) override; + virtual void EndAction() override; + virtual void BrkAction() override; + virtual void BckAction() override; + virtual void TakeActionRect(Rectangle& rRect) const override; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual void ModelHasChanged() SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; + virtual void ModelHasChanged() override; // TextEdit over an outliner @@ -187,7 +187,7 @@ public: // (in place of SDRENDTEXTEDIT_BEDELETED), which says, the obj should be // deleted. virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); - virtual bool IsTextEdit() const SAL_OVERRIDE; + virtual bool IsTextEdit() const override; // This method returns sal_True, if the point rHit is inside the // objectspace or the OutlinerView. @@ -205,7 +205,7 @@ public: SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); } // info about TextEditPageView. Default is 0L. - virtual SdrPageView* GetTextEditPageView() const SAL_OVERRIDE; + virtual SdrPageView* GetTextEditPageView() const override; // Current window of the outliners. void SetTextEditWin(vcl::Window* pWin); @@ -217,11 +217,11 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) override; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) override; // #97766# make virtual to change implementation e.g. for SdOutlineView virtual SvtScriptType GetScriptType() const; @@ -234,8 +234,8 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); // Intern: at mounting new OutlinerView... - virtual void AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow) SAL_OVERRIDE; - virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) SAL_OVERRIDE; + virtual void AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow) override; + virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) override; sal_uInt16 GetSelectionLevel() const; @@ -257,7 +257,7 @@ public: Leaves the any untouched if there currently is no text selected */ void getTextSelection( ::com::sun::star::uno::Any& rSelection ); - virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void MarkListHasChanged() override; rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } |