1 files changed, 18 insertions, 35 deletions

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 876249873c38..2e9df086c7e8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -61,9 +61,9 @@ const sal_Int32 AreaPropertyPanelBase::DEFAULT_ENDVALUE = 16777215;
 const sal_Int32 AreaPropertyPanelBase::DEFAULT_BORDER = 0;
 
 AreaPropertyPanelBase::AreaPropertyPanelBase(
-    vcl::Window* pParent,
+    weld::Widget* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame)
-    : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
+    : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui"),
       meLastXFS(static_cast<sal_uInt16>(-1)),
       mnLastPosHatch(0),
       mnLastPosBitmap(0),
@@ -104,20 +104,11 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       mpFloatTransparenceItem(),
       mpTransparanceItem()
 {
-    mpPanel = dynamic_cast<sfx2::sidebar::Panel*>(pParent);
-
     Initialize();
-
-    m_pInitialFocusWidget = mxLbFillType.get();
 }
 
 AreaPropertyPanelBase::~AreaPropertyPanelBase()
 {
-    disposeOnce();
-}
-
-void AreaPropertyPanelBase::dispose()
-{
     mxTrGrPopup.reset();
     mxColorTextFT.reset();
     mxLbFillType.reset();
@@ -134,9 +125,6 @@ void AreaPropertyPanelBase::dispose()
     mxLbFillGradTo.reset();
     mxGradientStyle.reset();
     mxBmpImport.reset();
-    mpPanel.clear();
-
-    PanelLayout::dispose();
 }
 
 void AreaPropertyPanelBase::Initialize()
@@ -449,8 +437,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, weld::ComboBox&, void)
 
     meLastXFS = static_cast<sal_uInt16>(nPos);
 
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillColorHdl, ColorListBox&, void)
@@ -468,11 +456,6 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeGradientAngle, weld::MetricSpinButt
     SelectFillAttrHdl_Impl();
 }
 
-void AreaPropertyPanelBase::DataChanged(
-    const DataChangedEvent& /*rEvent*/)
-{
-}
-
 void AreaPropertyPanelBase::SelectFillAttrHdl_Impl()
 {
     sal_Int32 nPosFillStyle = static_cast<eFillStyle>(mxLbFillType->get_active());
@@ -613,8 +596,8 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl()
             break;
         }
     }
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::ImpUpdateTransparencies()
@@ -869,8 +852,8 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet,
     mxToolBoxColor->hide();
     meLastXFS = static_cast<sal_uInt16>(-1);
     mpStyleItem.reset();
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -910,8 +893,8 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSe
             mxLbFillGradTo->SetNoSelection();
         }
     }
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -943,8 +926,8 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet,
             mxLbFillAttr->set_active(-1);
         }
     }
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -962,8 +945,8 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolIte
         mxLbFillType->set_active(SOLID);
         Update();
     }
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -997,8 +980,8 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet,
             mxLbFillAttr->set_active(-1);
         }
     }
-    if(mpPanel)
-        mpPanel->TriggerDeckLayouting();
+    if (m_xPanel)
+        m_xPanel->TriggerDeckLayouting();
 }
 
 void AreaPropertyPanelBase::NotifyItemUpdate(
@@ -1265,8 +1248,8 @@ void AreaPropertyPanelBase::Update()
                 OSL_ENSURE(false, "Non supported FillType (!)");
             break;
         }
-        if(mpPanel)
-            mpPanel->TriggerDeckLayouting();
+        if (m_xPanel)
+            m_xPanel->TriggerDeckLayouting();
 }
 
 IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransSliderHdl, weld::Scale&, void)