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 /cui/source/options | |
| 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 'cui/source/options')
| -rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optlingu.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optpath.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/tsaurls.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index cda0df95648f..43f76b4b6884 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1179,7 +1179,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton, + ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton, sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) )); DBG_ASSERT(aNameDlg, "Dialog creation failed!"); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 1172777d0a6b..599072104551 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1552,7 +1552,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this )); + ScopedVclPtr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this )); DBG_ASSERT(aDlg, "Dialog creation failed!"); uno::Reference< XDictionary > xNewDic; if ( aDlg->Execute() == RET_OK ) diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f3511513f88b..7c624a75cfb7 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -566,7 +566,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - std::unique_ptr<AbstractSvxMultiPathDialog> pMultiDlg( + ScopedVclPtr<AbstractSvxMultiPathDialog> pMultiDlg( pFact->CreateSvxMultiPathDialog( this )); DBG_ASSERT( pMultiDlg, "Dialog creation failed!" ); diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 505b8f66638b..fa678c71d2a9 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -98,7 +98,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl, Button*, void) OUString aDesc( get<FixedText>("enteraurl")->GetText() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc)); if ( pDlg->Execute() == RET_OK ) { |