diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-27 20:55:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 09:08:50 +0000 |
commit | 117fc49c979d65e5479635eab3ce10d74d076679 (patch) | |
tree | 9dbfee8cc04b2bf6f5eab0522ed9270de0d14a5c /sd/source/ui/func/fucopy.cxx | |
parent | 8f0f5e0c709d01555a4069f8665889924ed181c7 (diff) |
ScopedVclPtr vs std::unique_ptr for VclAbstractDialog derivatives
Change-Id: I5e43312b6f42ce0c63946f366eaf1e6dcb9629b2
Reviewed-on: https://gerrit.libreoffice.org/30344
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/func/fucopy.cxx')
-rw-r--r-- | sd/source/ui/func/fucopy.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index d6bab1ad174c..a834258b78d2 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -102,7 +102,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); if( pFact ) { - std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(mpViewShell->GetActiveWindow(), aSet, mpDoc->GetColorList(), mpView )); + ScopedVclPtr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(mpViewShell->GetActiveWindow(), aSet, mpDoc->GetColorList(), mpView )); if (!pDlg) return; @@ -118,7 +118,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) default: { - pDlg.reset(); + pDlg.disposeAndClear(); mpView->EndUndo(); } return; // Cancel |