[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/svx svx/source svx/uiconfig

[Katarina Behrens]

 include/svx/sidebar/AreaPropertyPanelBase.hxx     |    2 --
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |   13 +------------
 svx/uiconfig/ui/sidebararea.ui                    |    2 --
 3 files changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 171edd9af0a99c76a65b1ab05858bc3a2e298b51
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Oct 14 11:39:19 2016 +0200

    tdf#100180: Band-aid fix for non-editable chart sidebar
    
    no way should sfx2 sidebar controller be used in a base class, it
    just wreaks havoc in chart which inherits from this class, but
    uses its own controller.
    
    Since those NotifyResize calls were introduced to prevent cropped
    widgets on switching between different shape fills, try to make up
    for that with other means in .ui file
    
    (cherry picked from commit 70eac30606402fe6ec628038041433c0e107a87e)
    
    Change-Id: I5a40e4d413b583b1de1e3f751493d65d41ff8465
    Reviewed-on: https://gerrit.libreoffice.org/30000
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index e4ec0df..ef653bd 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -157,8 +157,6 @@ protected:
 
     css::uno::Reference<css::frame::XFrame>                 mxFrame;
 
-    sfx2::sidebar::SidebarController* mpSidebarController;
-
     DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void );
     DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void );
     DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5a7374f..ee63cd9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -84,8 +84,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       maTrGrPopup(this, [this] (PopupContainer *const pContainer) { return this->CreateTransparencyGradientControl(pContainer); }),
       mpFloatTransparenceItem(),
       mpTransparanceItem(),
-      mxFrame(rxFrame),
-      mpSidebarController()
+      mxFrame(rxFrame)
 {
     get(mpColorTextFT,    "filllabel");
     get(mpLbFillType,     "fillstyle");
@@ -175,8 +174,6 @@ void AreaPropertyPanelBase::Initialize()
     mpBTNGradient->SetSelectHdl( aLink2 );
     mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
     mpBTNGradient->Hide();
-    mpSidebarController = sfx2::sidebar::SidebarController::GetSidebarControllerForFrame(mxFrame);
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::SetTransparency(sal_uInt16 nVal)
@@ -392,8 +389,6 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
             mpLbFillType->Selected();
         }
     }
-
-    mpSidebarController->NotifyResize();
 }
 
 IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void)
@@ -496,7 +491,6 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void)
         }
         default: break;
     }
-    mpSidebarController->NotifyResize();
 }
 
 VclPtr<PopupControl> AreaPropertyPanelBase::CreateTransparencyGradientControl (PopupContainer* pParent)
@@ -732,7 +726,6 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefault, const
     mpToolBoxColor->Hide();
     meLastXFS = static_cast<sal_uInt16>(-1);
     mpStyleItem.reset();
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefault, const XFillGradientItem* pItem)
@@ -770,7 +763,6 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefault, co
             mpLbFillGradTo->SetNoSelection();
         }
     }
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefault, const XFillHatchItem* pItem)
@@ -800,7 +792,6 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefault, const
             mpLbFillAttr->SetNoSelection();
         }
     }
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::updateFillColor(bool bDefault, const XFillColorItem* pItem)
@@ -817,7 +808,6 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefault, const XFillColorItem*
 
         Update();
     }
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefault, const XFillBitmapItem* pItem)
@@ -847,7 +837,6 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefault, cons
             mpLbFillAttr->SetNoSelection();
         }
     }
-    mpSidebarController->NotifyResize();
 }
 
 void AreaPropertyPanelBase::NotifyItemUpdate(
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 8d03ca3..b762d6d 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -102,7 +102,6 @@
                 </child>
                 <child>
                   <object class="svxlo-ColorLB" id="fillgrad1">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Fill gradient from.</property>
@@ -219,7 +218,6 @@
             </child>
             <child>
               <object class="svxlo-ColorLB" id="fillgrad2">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_markup" translatable="yes">Fill gradient to.</property>