diff options
Diffstat (limited to 'cui/source/tabpages/transfrm.cxx')
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 76 |
1 files changed, 64 insertions, 12 deletions
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 5658f7aba4a8..2da50ac83e69 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -116,12 +116,6 @@ SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxIte -SvxTransformTabDialog::~SvxTransformTabDialog() -{ -} - - - void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) { if (nId==nPosSize) @@ -203,6 +197,23 @@ SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr m_pCtlAngle->SetLinkedField( m_pNfAngle, 2 ); } +SvxAngleTabPage::~SvxAngleTabPage() +{ + disposeOnce(); +} + +void SvxAngleTabPage::dispose() +{ + m_pFlPosition.clear(); + m_pMtrPosX.clear(); + m_pMtrPosY.clear(); + m_pCtlRect.clear(); + m_pFlAngle.clear(); + m_pNfAngle.clear(); + m_pCtlAngle.clear(); + SvxTabPage::dispose(); +} + void SvxAngleTabPage::Construct() { DBG_ASSERT(pView, "No valid view (!)"); @@ -313,9 +324,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { - return new SvxAngleTabPage(pWindow, *rSet); + return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet); } @@ -428,6 +439,20 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr ePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X ); } +SvxSlantTabPage::~SvxSlantTabPage() +{ + disposeOnce(); +} + +void SvxSlantTabPage::dispose() +{ + m_pFlRadius.clear(); + m_pMtrRadius.clear(); + m_pFlAngle.clear(); + m_pMtrAngle.clear(); + SvxTabPage::dispose(); +} + void SvxSlantTabPage::Construct() { // get the range @@ -540,9 +565,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return new SvxSlantTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxSlantTabPage>::Create( pWindow, *rOutAttrs ); } @@ -643,6 +668,33 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt } +SvxPositionSizeTabPage::~SvxPositionSizeTabPage() +{ + disposeOnce(); +} + +void SvxPositionSizeTabPage::dispose() +{ + m_pFlPosition.clear(); + m_pMtrPosX.clear(); + m_pMtrPosY.clear(); + m_pCtlPos.clear(); + m_pFlSize.clear(); + m_pFtWidth.clear(); + m_pMtrWidth.clear(); + m_pFtHeight.clear(); + m_pMtrHeight.clear(); + m_pCbxScale.clear(); + m_pCtlSize.clear(); + m_pFlProtect.clear(); + m_pTsbPosProtect.clear(); + m_pTsbSizeProtect.clear(); + m_pFlAdjust.clear(); + m_pTsbAutoGrowWidth.clear(); + m_pTsbAutoGrowHeight.clear(); + SvxTabPage::dispose(); +} + void SvxPositionSizeTabPage::Construct() { // get range and work area @@ -972,9 +1024,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return new SvxPositionSizeTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs ); } |