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