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 /sw/source/uibase/docvw | |
| 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 'sw/source/uibase/docvw')
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 2c1fd60a5d28..f5316cce0f26 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1435,14 +1435,14 @@ void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView) SfxItemSet aDlgAttr(*pPool, EE_ITEMS_START, EE_ITEMS_END); aDlgAttr.Put(aEditAttr); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, SwCharDlgMode::Ann)); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, SwCharDlgMode::Ann)); sal_uInt16 nRet = pDlg->Execute(); if (RET_OK == nRet) { aDlgAttr.Put(*pDlg->GetOutputItemSet()); FormatAll(aDlgAttr); } - pDlg.reset(); + pDlg.disposeAndClear(); SetActiveSidebarWin(pOrigActiveWin); } |