[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/source

[Samuel Mehrbrodt (via logerrit)]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |   19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 8f0d52d122024d1ed0bd5f59d36e3ade5b7b5629
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Nov 3 10:56:47 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Nov 4 12:38:01 2022 +0100

    tdf#151174 Hide transparency widgets when not needed
    
    Regression from adc536e9efc77690df62177aa722f9252bdbf96b
    
    Change-Id: I42d64fafe170d08e14bb4fe087a3e628ac862e49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142221
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    (cherry picked from commit 490c2fc6080aa652b9b31385517aaf536f5bbd57)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142198
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index cd3a484e7bb0..283eeaf476e4 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -412,11 +412,6 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
     bool bShowMTRAngle = false;
     bool bShowToolBoxColor = false;
     bool bShowBmpImport = false;
-    // Transparency widgets are shown by default
-    bool bShowLBTransType = true;
-    bool bShowTrspTextFT = true;
-    bool bShowMTRTransparent = true;
-    bool bShowSldTransparent = true;
 
     // #i122676# Do no longer trigger two Execute calls, one for 
SID_ATTR_FILL_STYLE
     // and one for setting the fill attribute itself, but add two SfxPoolItems 
to the
@@ -633,10 +628,12 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
         }
         case USE_BACKGROUND:
         {
-            bShowLBTransType = false;
-            bShowTrspTextFT = false;
-            bShowMTRTransparent = false;
-            bShowSldTransparent = false;
+            // No transparencies here
+            mxLBTransType->hide();
+            mxTrspTextFT->hide();
+            mxMTRTransparent->hide();
+            mxSldTransparent->hide();
+            mxBTNGradient->hide();
             if (bUpdateModel)
             {
                 const XFillStyleItem aXFillStyleItem(drawing::FillStyle_NONE);
@@ -654,10 +651,6 @@ void AreaPropertyPanelBase::FillStyleChanged(bool 
bUpdateModel)
     mxMTRAngle->set_visible(bShowMTRAngle);
     mxToolBoxColor->set_visible(bShowToolBoxColor);
     mxBmpImport->set_visible(bShowBmpImport);
-    mxLBTransType->set_visible(bShowLBTransType);
-    mxTrspTextFT->set_visible(bShowTrspTextFT);
-    mxMTRTransparent->set_visible(bShowMTRTransparent);
-    mxSldTransparent->set_visible(bShowSldTransparent);
 
     meLastXFS = static_cast<sal_uInt16>(nPos);