diff options
| -rw-r--r-- | basctl/source/inc/basidesh.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 1 | ||||
| -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 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 10 | ||||
| -rw-r--r-- | starmath/inc/view.hxx | 2 |
9 files changed, 9 insertions, 27 deletions
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 0362ad0bbcea..7d8398e4e0bc 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -104,7 +104,7 @@ private: static unsigned nShellCount; private: - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; + void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); virtual void OuterResizePixel( const Point &rPos, const Size &rSize ) override; sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin); virtual bool PrepareClose( bool bUI = true ) override; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 1f3f085f85ac..a749d842ac2f 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -332,11 +332,6 @@ public: const css::uno::Reference< css::embed::XStorage >& xStorage ); virtual void UpdateLinks(); virtual bool LoadExternal( SfxMedium& rMedium ); - /** - * Called when the Options dialog is dismissed with the OK button, to - * handle potentially conflicting option settings. - */ - virtual void CheckConfigOptions(); bool IsConfigOptionsChecked() const; void SetConfigOptionsChecked( bool bChecked ); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 416b177a662b..19356714b329 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -235,7 +235,6 @@ public: vcl::Window* GetWindow() const { return pWindow; } weld::Window* GetFrameWeld() const; void SetWindow( vcl::Window *pViewPort ); - virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; void SetBorderPixel( const SvBorder &rBorder ); void InvalidateBorder(); 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; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index e36a3c949c5b..f6c6e42b706a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3521,12 +3521,6 @@ bool SfxObjectShell::InsertGeneratedStream(SfxMedium&, return false; } -void SfxObjectShell::CheckConfigOptions() -{ - // not handled. Each app's shell needs to overwrite this method to add handler. - SetConfigOptionsChecked(true); -} - bool SfxObjectShell::IsConfigOptionsChecked() const { return pImpl->m_bConfigOptionsChecked; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index defb4a6d9f91..681b24258a58 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -858,16 +858,6 @@ void SfxViewShell::Deactivate(bool /*bMDI*/) } -void SfxViewShell::AdjustPosSizePixel -( - const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window - const Size& /*rSize*/ // All available sizes. -) - -{ -} - - void SfxViewShell::Move() /* [Description] diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index e530b47d839f..376de8a552ba 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -255,7 +255,7 @@ protected: const SfxItemSet &rOptions) override; virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) 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; virtual void QueryObjAreaPixel( tools::Rectangle& rRect ) const override; |