diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 15:41:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:01:14 +0100 |
| commit | 6f495a195b794257e8b1302d384148be43c04cee (patch) | |
| tree | c0ef4b8eeed1b1bb2e8da0deffac0a74b2eb5467 /sd/source/ui/app/sdmod1.cxx | |
| parent | 74efa4f0e87e2b5fe7a577fa4673cb947c947c74 (diff) | |
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
Diffstat (limited to 'sd/source/ui/app/sdmod1.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 9613ea63befb..1456939a2007 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -59,7 +59,6 @@ #include "FrameView.hxx" #include "FactoryIds.hxx" #include "sdabstdlg.hxx" -#include <boost/shared_ptr.hpp> #include <memory> #include "slideshow.hxx" @@ -85,7 +84,7 @@ public: private: ::sd::ViewShellBase& mrBase; SdDrawDocument& mrDocument; - ::boost::shared_ptr<SvMemoryStream> mpStream; + std::shared_ptr<SvMemoryStream> mpStream; }; } //end of anonymous namespace @@ -294,7 +293,7 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest) = dynamic_cast< ::sd::ViewShellBase*>(pViewFrame->GetViewShell()); if (pBase != NULL) { - ::boost::shared_ptr<FrameworkHelper> pHelper ( + std::shared_ptr<FrameworkHelper> pHelper ( FrameworkHelper::Instance(*pBase)); pHelper->RequestView( FrameworkHelper::msOutlineViewURL, @@ -556,7 +555,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) else { SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - boost::scoped_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 ); + std::unique_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 ); // Open the Pilot if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) @@ -626,7 +625,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) pOpt->SetStartWithTemplate(bStartWithTemplate); if(bNewDocDirect && !bStartWithTemplate) { - boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) ); + std::unique_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) ); if(pRet.get()) ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() ); @@ -644,7 +643,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if(bNewDocDirect && !bStartWithTemplate) { - boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) ); + std::unique_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) ); if(pRet.get()) ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() ); } @@ -661,7 +660,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if (pDoc && pBase) { - ::boost::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell(); + std::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell(); SdOptions* pOptions = GetSdOptions(pDoc->GetDocumentType()); if (pOptions && pViewSh.get()) |