[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 1 20:20:30 UTC 2019


 compilerplugins/clang/constantparam.booleans.results |    8 --------
 include/vcl/button.hxx                               |    3 ---
 vcl/source/control/button.cxx                        |   16 ----------------
 3 files changed, 27 deletions(-)

New commits:
commit 3c498ff3de6b4fb0ccdebc19d1b4dc5452e6d70b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 17:49:04 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 1 22:19:41 2019 +0200

    drop newly unused EnableImageDisplay + EnableTextDisplay
    
    Change-Id: I534c5fcfe2e8b55d0f01075b62e7168a10e805a9
    Reviewed-on: https://gerrit.libreoffice.org/76819
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;


More information about the Libreoffice-commits mailing list