From 3c498ff3de6b4fb0ccdebc19d1b4dc5452e6d70b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 1 Aug 2019 17:49:04 +0100 Subject: drop newly unused EnableImageDisplay + EnableTextDisplay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I534c5fcfe2e8b55d0f01075b62e7168a10e805a9 Reviewed-on: https://gerrit.libreoffice.org/76819 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- compilerplugins/clang/constantparam.booleans.results | 8 -------- include/vcl/button.hxx | 3 --- vcl/source/control/button.cxx | 16 ---------------- 3 files changed, 27 deletions(-) diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index a39ccbc292a8..132e12df226d 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -1494,14 +1494,6 @@ include/vcl/alpha.hxx:58 void AlphaMask::Replace(unsigned char,unsigned char) unsigned char cSearchTransparency 0 -include/vcl/button.hxx:87 - void Button::EnableImageDisplay(_Bool) - _Bool bEnable - 1 -include/vcl/button.hxx:88 - void Button::EnableTextDisplay(_Bool) - _Bool bEnable - 1 include/vcl/combobox.hxx:120 void ComboBox::EnableMultiSelection(_Bool) _Bool bMulti diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 4e782aa7a437..d6f39bb6f8f2 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -84,9 +84,6 @@ public: void SetImageAlign( ImageAlign eAlign ); ImageAlign GetImageAlign() const; - void EnableImageDisplay( bool bEnable ); - void EnableTextDisplay( bool bEnable ); - bool IsSmallSymbol() const; void SetSmallSymbol(); virtual bool set_property(const OString &rKey, const OUString &rValue) override; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5f6194e52bd5..1c1b673770d3 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -531,22 +531,6 @@ void Button::SetSmallSymbol() mpButtonData->mbSmallSymbol = true; } -void Button::EnableImageDisplay( bool bEnable ) -{ - if( bEnable ) - mpButtonData->mnButtonState &= ~DrawButtonFlags::NoImage; - else - mpButtonData->mnButtonState |= DrawButtonFlags::NoImage; -} - -void Button::EnableTextDisplay( bool bEnable ) -{ - if( bEnable ) - mpButtonData->mnButtonState &= ~DrawButtonFlags::NoText; - else - mpButtonData->mnButtonState |= DrawButtonFlags::NoText; -} - bool Button::IsSmallSymbol () const { return mpButtonData->mbSmallSymbol; -- cgit