[Libreoffice-commits] core.git: sd/source

Caolán McNamara caolanm at redhat.com
Thu Sep 24 23:14:17 PDT 2015


 sd/source/ui/app/sdmod1.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 835dacd27d2c925f4af2d85125445ac7b7a3253d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 25 02:05:02 2015 +0100

    sd/source/ui/app boost->std
    
    Change-Id: I08af815e1bec9cfbe5cac191de720a075391c43a
    Reviewed-on: https://gerrit.libreoffice.org/18835
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 3d431a3..81a72e9 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -555,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 )
@@ -625,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() );
 
@@ -643,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() );
                         }


More information about the Libreoffice-commits mailing list