diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-28 21:12:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-29 08:37:19 +0200 |
| commit | 47ccda36fc80b40928b0e12e7dc1052ff0f98654 (patch) | |
| tree | 63f683c06882c564532cd672cbf6f0762fcce9d8 /sc | |
| parent | 57871f98d30c0283969de1a41e72f5838d6c0eb0 (diff) | |
loplugin:virtualdown in sfx2
Change-Id: I51e79a4a3d2c799e69bc13c66b5b84056bee6206
Reviewed-on: https://gerrit.libreoffice.org/52034
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 197ca4684c4e..dd0c026e8726 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -295,7 +295,11 @@ public: void ReloadTabLinks(); void SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading = false ); - virtual void CheckConfigOptions() override; + /** + * Called when the Options dialog is dismissed with the OK button, to + * handle potentially conflicting option settings. + */ + virtual void CheckConfigOptions(); void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 14d2f613b464..fd484a619bab 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -62,7 +62,7 @@ private: protected: virtual void Activate(bool bMDI) override; - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index ae283f238735..8db44ce95f01 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -190,7 +190,7 @@ protected: virtual void Move() override; // notification - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; // old + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // old virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; // new virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; |