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/fmview.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/fmview.hxx')
-rw-r--r-- | include/svx/fmview.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 2cef775e8dce..906e2f3b2a3c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -82,9 +82,9 @@ public: */ SdrObject* CreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ); - virtual void MarkListHasChanged() SAL_OVERRIDE; - virtual void AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow) SAL_OVERRIDE; - virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) SAL_OVERRIDE; + virtual void MarkListHasChanged() override; + virtual void AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow) override; + virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) override; static void createControlLabelPair( OutputDevice* _pOutDev, @@ -103,13 +103,13 @@ public: SdrUnoObj*& _rpControl ); - virtual SdrPageView* ShowSdrPage(SdrPage* pPage) SAL_OVERRIDE; - virtual void HideSdrPage() SAL_OVERRIDE; + virtual SdrPageView* ShowSdrPage(SdrPage* pPage) override; + virtual void HideSdrPage() override; // for copying complete form structures, not only control models - virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; + virtual SdrModel* GetMarkedObjModel() const override; - virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) override; /** grab the focus to the first form control on the view @param _bForceSync @@ -123,7 +123,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override; /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); @@ -144,8 +144,8 @@ public: void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); - virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) SAL_OVERRIDE; - virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) SAL_OVERRIDE; + virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) override; + virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) override; SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return mpActualOutDev;} SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource); |