[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara (via logerrit)]

 include/svx/sidebar/AreaPropertyPanelBase.hxx     |    4 +++-
 svx/source/sidebar/area/AreaPropertyPanel.cxx     |    1 -
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 95945a601b7b3310ba3a891f374cfb2cabe49226
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 7 15:40:12 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 8 09:50:33 2020 +0100

    AreaPropertyPanelBase::Initialize not called in chart sidebar
    
    AreaPropertyPanelBase::Initialize used to be called twice in
    the "normal" sidebar, the effort in
    
    commit 40fe5b93bc0838e04b46bfc7942d1ee6a2482ce0
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Thu Jan 2 14:45:32 2020 +0000
    
        weld AreaPropertyPanel
    
    to get it called once in the normal case caused it to get
    called 0 times in the chart case, fix it to get called once
    in either case
    
    Change-Id: I2c4acffb58ed3b45e86e3bf0ce91db52989a0e25
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86356
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index bc72b8b7c4aa..d6bde2831b80 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -97,6 +97,9 @@ public:
     void updateFillColor(bool bDefaultOrSet, const SfxPoolItem* pState);
     void updateFillBitmap(bool BDisabled, bool bDefaultOrSet, const SfxPoolItem* pState);
 
+private:
+    void Initialize();
+
 protected:
     sal_uInt16                                          meLastXFS;
 
@@ -158,7 +161,6 @@ protected:
     DECL_LINK(ClickImportBitmapHdl, weld::Button&, void);
     DECL_LINK(ToolbarHdl_Impl, const OString&, void);
 
-    void Initialize();
     void Update();
     void ImpUpdateTransparencies();
     void SetTransparency(sal_uInt16 nVal);
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index fbf52f3c42bb..4ed887fb1469 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -56,7 +56,6 @@ AreaPropertyPanel::AreaPropertyPanel(
       maFillFloatTransparenceController(SID_ATTR_FILL_FLOATTRANSPARENCE, *pBindings, *this),
       mpBindings(pBindings)
 {
-    Initialize();
 }
 
 AreaPropertyPanel::~AreaPropertyPanel()
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index e53bd5db11c2..e04a8f1532e1 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -112,6 +112,8 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       mpTransparanceItem()
 {
     mpPanel = dynamic_cast<sfx2::sidebar::Panel*>(pParent);
+
+    Initialize();
 }
 
 AreaPropertyPanelBase::~AreaPropertyPanelBase()