summaryrefslogtreecommitdiff
path: root/svx/source/sidebar/area
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/sidebar/area')
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx18
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx8
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx53
3 files changed, 25 insertions, 54 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index abe43abcd2c6..b4d22f6823ab 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -31,7 +31,7 @@ using namespace css::uno;
namespace svx::sidebar {
AreaPropertyPanel::AreaPropertyPanel(
- vcl::Window* pParent,
+ weld::Widget* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: AreaPropertyPanelBase(pParent, rxFrame),
@@ -52,11 +52,6 @@ AreaPropertyPanel::AreaPropertyPanel(
AreaPropertyPanel::~AreaPropertyPanel()
{
- disposeOnce();
-}
-
-void AreaPropertyPanel::dispose()
-{
maStyleControl.dispose();
maColorControl.dispose();
maGradientControl.dispose();
@@ -68,12 +63,10 @@ void AreaPropertyPanel::dispose()
maPatternListControl.dispose();
maFillTransparenceController.dispose();
maFillFloatTransparenceController.dispose();
-
- AreaPropertyPanelBase::dispose();
}
-VclPtr<PanelLayout> AreaPropertyPanel::Create (
- vcl::Window* pParent,
+std::unique_ptr<PanelLayout> AreaPropertyPanel::Create (
+ weld::Widget* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
@@ -84,10 +77,7 @@ VclPtr<PanelLayout> AreaPropertyPanel::Create (
if (pBindings == nullptr)
throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", nullptr, 2);
- return VclPtr<AreaPropertyPanel>::Create(
- pParent,
- rxFrame,
- pBindings);
+ return std::make_unique<AreaPropertyPanel>(pParent, rxFrame, pBindings);
}
void AreaPropertyPanel::setFillTransparence(const XFillTransparenceItem& rItem)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 581ac37224df..ec7c1223d108 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -43,10 +43,8 @@ class AreaTransparencyGradientControl;
class AreaPropertyPanel : public AreaPropertyPanelBase
{
public:
- virtual void dispose() override;
-
- static VclPtr<PanelLayout> Create(
- vcl::Window* pParent,
+ static std::unique_ptr<PanelLayout> Create(
+ weld::Widget* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
@@ -54,7 +52,7 @@ public:
// constructor/destructor
AreaPropertyPanel(
- vcl::Window* pParent,
+ weld::Widget* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 15:14:25 +0000