[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Fri Sep 25 08:14:17 PDT 2015
sd/source/ui/func/fuarea.cxx | 3 +--
sd/source/ui/func/fubullet.cxx | 3 +--
sd/source/ui/func/fuchar.cxx | 3 +--
sd/source/ui/func/fuconnct.cxx | 3 +--
sd/source/ui/func/fucopy.cxx | 5 ++---
sd/source/ui/func/fucushow.cxx | 3 +--
sd/source/ui/func/fuinsert.cxx | 5 ++---
sd/source/ui/func/fuinsfil.cxx | 11 +++++------
sd/source/ui/func/fuline.cxx | 5 ++---
sd/source/ui/func/fulinend.cxx | 3 +--
sd/source/ui/func/fulink.cxx | 3 +--
sd/source/ui/func/fumeasur.cxx | 3 +--
sd/source/ui/func/fumorph.cxx | 3 +--
sd/source/ui/func/fuoaprms.cxx | 3 +--
sd/source/ui/func/fuolbull.cxx | 7 +++----
sd/source/ui/func/fuoltext.cxx | 3 +--
sd/source/ui/func/fupage.cxx | 5 ++---
sd/source/ui/func/fuparagr.cxx | 3 +--
sd/source/ui/func/fuprlout.cxx | 3 +--
sd/source/ui/func/fuprobjs.cxx | 3 +--
sd/source/ui/func/fuscale.cxx | 5 ++---
sd/source/ui/func/fusldlg.cxx | 3 +--
sd/source/ui/func/fusnapln.cxx | 3 +--
sd/source/ui/func/futempl.cxx | 5 ++---
sd/source/ui/func/futransf.cxx | 5 ++---
sd/source/ui/func/futxtatt.cxx | 3 +--
sd/source/ui/func/fuvect.cxx | 3 +--
27 files changed, 40 insertions(+), 67 deletions(-)
New commits:
commit 7de2777bff9afeacb872c6425d36dc93310302c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 25 11:59:51 2015 +0100
sd/source/ui/func boost->std
Change-Id: I67874a8bad1549fd98e22a816d9fa52a17629a1e
Reviewed-on: https://gerrit.libreoffice.org/18850
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 9b3164d..5c351f5 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -35,7 +35,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
TYPEINIT1( FuArea, FuPoor );
@@ -62,7 +61,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
mpView->GetAttributes( aNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog( NULL,
+ std::unique_ptr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog( NULL,
&aNewAttr,
mpDoc,
true) : 0);
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 0295ef3..cc989a3 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -39,7 +39,6 @@
#include <svx/dialogs.hrc>
#include "drawview.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "app.hrc"
@@ -191,7 +190,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
aSet.Put( *pFontItem );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
mpView->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(),
RID_SVXDLG_CHARMAP ) : 0);
if( !pDlg )
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 5dca0ec..5b5227c 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -35,7 +35,6 @@
#include "DrawDocShell.hxx"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -72,7 +71,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
aNewAttr.Put( aEditAttr, false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0);
sal_uInt16 nResult = RET_CANCEL;
if( pDlg )
{
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index f9f445d..494fc75 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -26,7 +26,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -59,7 +58,7 @@ void FuConnectionDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
+ std::unique_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 8c47464..e7cd23f 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -39,7 +39,6 @@
#include <sfx2/request.hxx>
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -103,7 +102,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- boost::scoped_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorList(), mpView ));
+ std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorList(), mpView ));
if (!pDlg)
return;
@@ -170,7 +169,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// remove handles
//HMHmpView->HideMarkHdl();
- boost::scoped_ptr<SfxProgress> pProgress;
+ std::unique_ptr<SfxProgress> pProgress;
bool bWaiting = false;
if( nNumber > 1 )
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 3f62a81..78548c3 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -32,7 +32,6 @@
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -58,7 +57,7 @@ rtl::Reference<FuPoor> FuCustomShowDlg::Create( ViewShell* pViewSh, ::sd::Window
void FuCustomShowDlg::DoExecute( SfxRequest& )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0);
+ std::unique_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0);
if( pDlg )
{
sal_uInt16 nRet = pDlg->Execute();
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index b4c2755..f2c1432 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -83,7 +83,6 @@
#include <vcl/svapp.hxx>
#include "undo/undoobjects.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "glob.hrc"
#include <config_features.h>
@@ -203,7 +202,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
SotClipboardFormatId nFormatId;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ));
+ std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ));
if ( pDlg )
{
::com::sun::star::datatransfer::DataFlavor aFlavor;
@@ -458,7 +457,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractInsertObjectDialog> pDlg(
+ std::unique_ptr<SfxAbstractInsertObjectDialog> pDlg(
pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(),
xStorage, &aServerLst ));
if ( pDlg )
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d93e58d..281155e 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -63,7 +63,6 @@
#include "Outliner.hxx"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -330,7 +329,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0);
+ std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0);
if( !pDlg )
return false;
@@ -422,7 +421,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0);
+ std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0);
if( !pDlg )
return;
@@ -447,7 +446,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
- boost::scoped_ptr<SdrOutliner> pOutliner(new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ));
+ std::unique_ptr<SdrOutliner> pOutliner(new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ));
// set reference device
pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
@@ -597,7 +596,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
- boost::scoped_ptr< ::Outliner> pOutliner(new ::Outliner( &mpDoc->GetItemPool(), OUTLINERMODE_OUTLINEOBJECT ));
+ std::unique_ptr< ::Outliner> pOutliner(new ::Outliner( &mpDoc->GetItemPool(), OUTLINERMODE_OUTLINEOBJECT ));
pOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
// set reference device
@@ -632,7 +631,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
- boost::scoped_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
+ std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
if( pProgress )
pProgress->SetState( 0, 100 );
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 74d224d..6b97442 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -37,7 +37,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -73,11 +72,11 @@ void FuLine::DoExecute( SfxRequest& rReq )
if( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- boost::scoped_ptr<SfxItemSet> pNewAttr(new SfxItemSet( mpDoc->GetPool() ));
+ std::unique_ptr<SfxItemSet> pNewAttr(new SfxItemSet( mpDoc->GetPool() ));
mpView->GetAttributes( *pNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr.get(),mpDoc,pObj,bHasMarked) : 0);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr.get(),mpDoc,pObj,bHasMarked) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 034109a..985824f 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -33,7 +33,6 @@
#include "View.hxx"
#include "Window.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -115,7 +114,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0);
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0);
if( pDlg )
{
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index a1e9b12..245004a 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -30,7 +30,6 @@
#include "ViewShell.hxx"
#include "app.hrc"
#include <memory>
-#include <boost/scoped_ptr.hpp>
class SfxRequest;
@@ -60,7 +59,7 @@ void FuLink::DoExecute( SfxRequest& )
sfx2::LinkManager* pLinkManager = mpDoc->GetLinkManager();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ));
+ std::unique_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ));
if ( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 69de5a5..7b5bbb2 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -26,7 +26,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -59,7 +58,7 @@ void FuMeasureDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
+ std::unique_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index c34e6cf..a1e25ba 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -45,7 +45,6 @@
#include <basegfx/color/bcolor.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -97,7 +96,7 @@ void FuMorph::DoExecute( SfxRequest& )
SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(false, false);
SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(false, false);
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0);
+ std::unique_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0);
if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK))
{
B2DPolyPolygonList_impl aPolyPolyList;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 061f690..8c0b708 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -45,7 +45,6 @@
#include <tools/helpers.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -447,7 +446,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0);
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0);
short nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 06d76b1..653562a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -39,7 +39,6 @@
#include <svx/nbdtmgfact.hxx>
#include <svx/svdoutl.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace svx::sidebar;
namespace sd {
@@ -83,7 +82,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
// create and execute dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0);
if( pDlg )
{
if ( pPageItem )
@@ -98,7 +97,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
@@ -235,7 +234,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
}
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
{
if (mpView->ISA(OutlineView))
{
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 6938a4b..a3dceff 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -36,7 +36,6 @@
#include "OutlineViewShell.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <stdio.h>
@@ -190,7 +189,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
{
mpWindow->GrabFocus();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if( (nKeyGroup != KEYGROUP_CURSOR) && (nKeyGroup != KEYGROUP_FKEYS) )
aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index bf4fcef..f652f82 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -68,7 +68,6 @@
#include "helpids.h"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -281,7 +280,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
}
}
- boost::scoped_ptr< SfxItemSet > pTempSet;
+ std::unique_ptr< SfxItemSet > pTempSet;
if( GetSlotID() == SID_SELECT_BACKGROUND )
{
@@ -311,7 +310,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
// create the dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(NULL, &aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : 0 );
+ std::unique_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(NULL, &aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : 0 );
if( pDlg.get() && pDlg->Execute() == RET_OK )
pTempSet.reset( new SfxItemSet(*pDlg->GetOutputItemSet()) );
}
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index f5c872c..e349856 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -35,7 +35,6 @@
#include "sdabstdlg.hxx"
#include "sdattr.hrc"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -92,7 +91,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
}
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index cbab83f..b782e6f 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -53,7 +53,6 @@
#include <editeng/editdata.hxx>
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd
{
@@ -176,7 +175,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0);
+ std::unique_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0);
sal_uInt16 nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index bdafd22..e49c967 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -40,7 +40,6 @@
#include "unchss.hxx"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -141,7 +140,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
SfxStyleSheetBase& rStyleSheet = *pStyleSheet;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), rStyleSheet, ePO, pStyleSheetPool ) : 0);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), rStyleSheet, ePO, pStyleSheetPool ) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 6697f6f..2c2db01 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -40,7 +40,6 @@
#include <sfx2/request.hxx>
#include <svx/svxdlg.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -72,7 +71,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
- boost::scoped_ptr<SvxZoomItem> pZoomItem;
+ std::unique_ptr<SvxZoomItem> pZoomItem;
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
nValue = (sal_Int16) mpWindow->GetZoom();
@@ -111,7 +110,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
pZoomItem->SetValueSet( nZoomValues );
aNewAttr.Put( *pZoomItem );
- boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
+ std::unique_ptr<AbstractSvxZoomDialog> pDlg;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 633eac1..c7b563f 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -33,7 +33,6 @@
#include "optsitem.hxx"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -111,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
aDlgSet.Put( SfxInt32Item( ATTR_PRESENT_DISPLAY, pOptions->GetDisplay() ) );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdStartPresDlg> pDlg(pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0);
+ std::unique_ptr<AbstractSdStartPresDlg> pDlg(pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
OUString aPage;
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index cca0a5d..dc522af 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -36,7 +36,6 @@
#include "app.hrc"
#include <svx/svdpagv.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -112,7 +111,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
aNewAttr.Put(SfxInt32Item(ATTR_SNAPLINE_Y, aLinePos.Y()));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( NULL, aNewAttr, mpView ) : 0);
+ std::unique_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( NULL, aNewAttr, mpView ) : 0);
OSL_ASSERT(pDlg);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 199a260..2b46247 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -66,7 +66,6 @@
#include "helpids.h"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
@@ -297,8 +296,8 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pStyleSheet )
{
- boost::scoped_ptr<SfxAbstractTabDialog> pStdDlg;
- boost::scoped_ptr<SfxAbstractTabDialog> pPresDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pStdDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pPresDlg;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false;
SfxItemSet aOriSet( pStyleSheet->GetItemSet() );
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 671b23a..16a07a9 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -32,7 +32,6 @@
#include <svx/svxdlg.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -75,7 +74,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
+ std::unique_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -95,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
+ std::unique_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
rReq.Done( *( pDlg->GetOutputItemSet() ) );
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 60f0bb5..7342f7b 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -27,7 +27,6 @@
#include "ViewShell.hxx"
#include "drawdoc.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -60,7 +59,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ));
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index abe47ca..2ceda3b 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -30,7 +30,6 @@
#include "sdresid.hxx"
#include "sdabstdlg.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd
{
@@ -65,7 +64,7 @@ void FuVectorize::DoExecute( SfxRequest& )
if( pObj && pObj->ISA( SdrGrafObj ) )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdVectorizeDlg> pDlg(pFact ? pFact->CreateSdVectorizeDlg( mpWindow, static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0);
+ std::unique_ptr<AbstractSdVectorizeDlg> pDlg(pFact ? pFact->CreateSdVectorizeDlg( mpWindow, static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0);
if( pDlg && pDlg->Execute() == RET_OK )
{
const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile();
More information about the Libreoffice-commits
mailing list