diff options
| author | Adrien Ollier <adr.ollier@hotmail.fr> | 2019-11-26 20:17:11 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-07 15:13:59 +0100 |
| commit | 7ae70706ad3a3e3aa86fbc7cbd1fcc28f0d2e1b2 (patch) | |
| tree | 7122ee3eb57437f152cad0c6b3897a9498ee1a2f /include | |
| parent | 1de13cab5d38173975af13ed77c8091258be4c01 (diff) | |
Use virtual method instead of switch in parent class
Change-Id: I53129ed6b57eb13898a426de0a2ba72c7d6674de
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/83825
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/button.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index be4ccb334a6b..d0aa24757ae1 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -307,7 +307,6 @@ protected: public: SAL_DLLPRIVATE void ImplCallClick( bool bGrabFocus = false, GetFocusFlags nFocusFlags = GetFocusFlags::NONE ); - SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: virtual void FillLayoutData() const override; @@ -315,6 +314,7 @@ protected: GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; + void ImplAdjustNWFSizes() override; public: explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); @@ -418,6 +418,7 @@ protected: virtual void FillLayoutData() const override; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; + void ImplAdjustNWFSizes() override; virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE const tools::Rectangle& GetStateRect() const { return maStateRect; } @@ -425,7 +426,6 @@ protected: public: SAL_DLLPRIVATE void ImplCheck(); - SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 8c87a78510cb..8ea622a8898e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -748,7 +748,7 @@ protected: void ImplRefreshFontData(bool bNewFontLists) override; // FIXME: this is a hack to workaround missing layout functionality - SAL_DLLPRIVATE void ImplAdjustNWFSizes(); + virtual void ImplAdjustNWFSizes(); virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate) override; virtual void ClipToPaintRegion( tools::Rectangle& rDstRect ) override; |