diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-03 09:02:30 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-03 09:19:59 +0200 |
| commit | 53e535821344549c2a1f5adf3d1bdbc2a0582492 (patch) | |
| tree | ac74126ea251b54e0aad6973006b09f12f1e0bd3 | |
| parent | 4a847bb4a2002d7f8f5854b7276ac67d369bdd3b (diff) | |
sw: boost::scoped_ptr -> std::unique_ptr in textsh
Change-Id: I60eb5e1bca50d0e35f0bec63f0e274bee68fc5f7
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 39d60ed1ed22..b479261f3cde 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -116,7 +116,6 @@ using namespace ::com::sun::star; #include <unomid.h> #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> -#include <boost/scoped_ptr.hpp> SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell) @@ -578,10 +577,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("FrameDialog", - GetView().GetViewFrame(), - &GetView().GetViewFrame()->GetWindow(), - aSet, true)); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("FrameDialog", + GetView().GetViewFrame(), + &GetView().GetViewFrame()->GetWindow(), + aSet, true)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet()) { @@ -631,7 +630,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); - boost::scoped_ptr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN)); + std::unique_ptr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN)); OSL_ENSURE(pColDlg, "Dialog creation failed!"); pColDlg->Execute(); } @@ -1034,7 +1033,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) aAllSet.Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aAllSet, + std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aAllSet, GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if( RET_OK == pDlg->Execute() ) { |