diff options
Diffstat (limited to 'svx/source/sidebar/possize/PosSizePropertyPanel.cxx')
-rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 50 |
1 files changed, 42 insertions, 8 deletions
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index b9c3c3cd5b6f..1c459d47d1ba 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -115,12 +115,46 @@ PosSizePropertyPanel::PosSizePropertyPanel( mpBindings->Update( SID_ATTR_METRIC ); } - - PosSizePropertyPanel::~PosSizePropertyPanel() { + disposeOnce(); +} + +void PosSizePropertyPanel::dispose() +{ + mpFtPosX.clear(); + mpMtrPosX.clear(); + mpFtPosY.clear(); + mpMtrPosY.clear(); + mpFtWidth.clear(); + mpMtrWidth.clear(); + mpFtHeight.clear(); + mpMtrHeight.clear(); + mpCbxScale.clear(); + mpFtAngle.clear(); + mpMtrAngle.clear(); + mpDial.clear(); + mpFtFlip.clear(); + mpFlipTbx.clear(); + + maTransfPosXControl.dispose(); + maTransfPosYControl.dispose(); + maTransfWidthControl.dispose(); + maTransfHeightControl.dispose(); + + maSvxAngleControl.dispose(); + maRotXControl.dispose(); + maRotYControl.dispose(); + maProPosControl.dispose(); + maProSizeControl.dispose(); + maAutoWidthControl.dispose(); + maAutoHeightControl.dispose(); + m_aMetricCtl.dispose(); + + PanelLayout::dispose(); } + namespace { bool hasText(const SdrView& rSdrView) @@ -213,7 +247,7 @@ void PosSizePropertyPanel::SetupIcons() -PosSizePropertyPanel* PosSizePropertyPanel::Create ( +VclPtr<vcl::Window> PosSizePropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, @@ -226,11 +260,11 @@ PosSizePropertyPanel* PosSizePropertyPanel::Create ( if (pBindings == NULL) throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2); - return new PosSizePropertyPanel( - pParent, - rxFrame, - pBindings, - rxSidebar); + return VclPtr<PosSizePropertyPanel>::Create( + pParent, + rxFrame, + pBindings, + rxSidebar); } |