summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-11-01 13:23:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-11-01 13:30:54 +0000
commit9e33ac4035442b48bcd2a58f42a279fe9855b6ce (patch)
tree9fa9ff9905f26868435f6a00155e20153e48de1e
parent9bdec0831afc45af45ea6d9350ef3372188b45cb (diff)
Resolves: tdf#103556 the implicit convert to bare pointer hurts us here
Change-Id: I2d91cf9b11027f76dbcbb5432f4cad71c56f53f2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 424b6c67e5f3..82569db0269c 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -199,18 +199,18 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
if (bCaption)
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- AbstractSvxCaptionDialog* pCaptionDlg =
+ VclPtr<AbstractSvxCaptionDialog> pCaptionDlg =
pFact->CreateCaptionDialog( nullptr, pSdrView, nAllowedAnchors );
- pCaptionDlg->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
pDlg.disposeAndReset(pCaptionDlg);
+ pCaptionDlg->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
}
else
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- AbstractSvxTransformTabDialog* pTransform =
+ VclPtr<AbstractSvxTransformTabDialog> pTransform =
pFact->CreateSvxTransformTabDialog( nullptr, nullptr, pSdrView, nAllowedAnchors );
- pTransform->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
pDlg.disposeAndReset(pTransform);
+ pTransform->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
}
SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked());