[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Fri Sep 25 14:09:55 PDT 2015
sd/source/ui/inc/TemplateScanner.hxx | 7 +++----
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 +-
sd/source/ui/view/DocumentRenderer.cxx | 7 +++----
sd/source/ui/view/drviews2.cxx | 25 ++++++++++++-------------
sd/source/ui/view/drviews4.cxx | 5 ++---
sd/source/ui/view/drviews9.cxx | 3 +--
sd/source/ui/view/drviewsf.cxx | 5 ++---
sd/source/ui/view/sdview3.cxx | 5 ++---
8 files changed, 26 insertions(+), 33 deletions(-)
New commits:
commit e678a8d8e5f1a178ab83da965b785d24b0a9cffb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 25 14:11:12 2015 +0100
boost->std
Change-Id: If0ca026bd63a921d4f258586231455aacee23b1f
Reviewed-on: https://gerrit.libreoffice.org/18870
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/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 6a11e00..d0b87d7 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -26,7 +26,6 @@
#include "com/sun/star/uno/Reference.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <vector>
namespace com { namespace sun { namespace star { namespace ucb {
@@ -75,7 +74,7 @@ class TemplateDir
public:
TemplateDir (const OUString& rsRegion, const OUString& rsUrl )
: msRegion(rsRegion), msUrl(rsUrl), maEntries(),
- mbSortingEnabled(false), mpEntryCompare(NULL) {}
+ mbSortingEnabled(false), mpEntryCompare(nullptr) {}
OUString msRegion;
OUString msUrl;
@@ -86,7 +85,7 @@ public:
private:
bool mbSortingEnabled;
- ::boost::scoped_ptr<TemplateEntryCompare> mpEntryCompare;
+ std::unique_ptr<TemplateEntryCompare> mpEntryCompare;
};
/** This class scans the template folders for impress templates. There are
@@ -183,7 +182,7 @@ private:
/** The folders that are collected by GatherFolderList().
*/
class FolderDescriptorList;
- ::boost::scoped_ptr<FolderDescriptorList> mpFolderDescriptors;
+ std::unique_ptr<FolderDescriptorList> mpFolderDescriptors;
/** Set of state variables used by the methods
InitializeFolderScanning(), GatherFolderList(), ScanFolder(),
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 13b7972..b1aa583 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -223,7 +223,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
}
// Setup the menu.
- ::boost::scoped_ptr<PopupMenu> pMenu (new PopupMenu(GetContextMenuResId()));
+ std::unique_ptr<PopupMenu> pMenu (new PopupMenu(GetContextMenuResId()));
FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow());
if (pMenuWindow != NULL)
pMenuWindow->SetPopupModeFlags(
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 0f78fda..86df457 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -52,7 +52,6 @@
#include <unotools/moduleoptions.hxx>
#include <vector>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1120,7 +1119,7 @@ namespace {
}
private:
- ::boost::scoped_ptr<OutlinerParaObject> mpParaObject;
+ std::unique_ptr<OutlinerParaObject> mpParaObject;
};
}
@@ -1323,9 +1322,9 @@ private:
bool mbIsDisposed;
VclPtr<Printer> mpPrinter;
Size maPrinterPageSizePixel;
- ::boost::scoped_ptr<PrintOptions> mpOptions;
+ std::unique_ptr<PrintOptions> mpOptions;
std::vector< std::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
- ::boost::scoped_ptr<DrawView> mpPrintView;
+ std::unique_ptr<DrawView> mpPrintView;
bool mbHasOrientationWarningBeenShown;
std::vector<sal_Int32> maSlidesPerPage;
awt::Size maPrintSize;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 7d4cc30..358d3ce 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -172,7 +172,6 @@
#include "ViewShellBase.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace {
const char CustomAnimationPanelId[] = "CustomAnimationPanel";
@@ -428,7 +427,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
+ std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
@@ -802,7 +801,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_SET_DEFAULT:
{
- boost::scoped_ptr<SfxItemSet> pSet;
+ std::unique_ptr<SfxItemSet> pSet;
if (mpDrawView->IsTextEdit())
{
@@ -877,7 +876,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
std::pair<SfxItemSet*,SdrObjUserCall*> &rAttr = aAttrList[j++];
- boost::scoped_ptr<SfxItemSet> pNewSet(rAttr.first);
+ std::unique_ptr<SfxItemSet> pNewSet(rAttr.first);
SdrObjUserCall* pUserCall = rAttr.second;
if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SfxItemState::SET )
@@ -1399,7 +1398,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
+ std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
@@ -1567,7 +1566,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
+ std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
@@ -1837,7 +1836,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_INSERT_FLD_FILE:
{
sal_uInt16 nMul = 1;
- boost::scoped_ptr<SvxFieldItem> pFieldItem;
+ std::unique_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -1977,12 +1976,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
+ std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
if( pDlg && pDlg->Execute() == RET_OK )
{
// To make a correct SetAttribs() call at the utlinerView
// it is necessary to split the actions here
- boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
+ std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
ESelection aSel = pOLV->GetSelection();
bool bSelectionWasModified(false);
@@ -2086,7 +2085,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -2119,7 +2118,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
@@ -2367,7 +2366,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
if( pDlg )
{
pDlg->Execute();
@@ -2881,7 +2880,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
GetActiveWindow(),
GetDoc()) : 0);
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 0f19ec7..7d073ae 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -64,7 +64,6 @@
#include <navigatr.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -564,7 +563,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
aMPos = Point( 20, 20 );
aFieldPopup.Execute( pWin, aMPos );
- boost::scoped_ptr<SvxFieldData> pField(aFieldPopup.GetField());
+ std::unique_ptr<SvxFieldData> pField(aFieldPopup.GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
@@ -897,7 +896,7 @@ void DrawViewShell::ShowSnapLineContextMenu (
const Point& rMouseLocation)
{
const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]);
- ::boost::scoped_ptr<PopupMenu> pMenu (new PopupMenu ());
+ std::unique_ptr<PopupMenu> pMenu (new PopupMenu ());
if (rHelpLine.GetKind() == SDRHELPLINE_POINT)
{
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 5685ba4..7623e4b 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -61,7 +61,6 @@
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -203,7 +202,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
CheckLineTo (rReq);
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- boost::scoped_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
+ std::unique_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
GetView()->GetAttributes( *pAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 2a41d2c..1e1e322 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -64,7 +64,6 @@
#include <svx/nbdtmgfact.hxx>
#include <svx/nbdtmg.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace svx::sidebar;
using namespace ::com::sun::star;
@@ -579,7 +578,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END );
aNewAttr.Put( aEditAttr, false );
- boost::scoped_ptr<SvxNumRule> pNumRule;
+ std::unique_ptr<SvxNumRule> pNumRule;
const SfxPoolItem* pTmpItem=NULL;
sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
sal_uInt16 nActNumLvl = mpDrawView->GetSelectionLevel();
@@ -677,7 +676,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
nWhich = aIter.NextWhich();
}
- boost::scoped_ptr<SfxItemSet> pSet;
+ std::unique_ptr<SfxItemSet> pSet;
if( bAttr )
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 0380bb9..d9a4211 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -77,7 +77,6 @@
#include <svx/sdrhittesthelper.hxx>
#include <svx/xbtmpit.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
// - Namespaces -
@@ -268,7 +267,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
TransferableDataHelper aDataHelper( rDataHelper );
SdrObject* pPickObj = NULL;
SdPage* pPage = NULL;
- boost::scoped_ptr<ImageMap> pImageMap;
+ std::unique_ptr<ImageMap> pImageMap;
bool bReturn = false;
bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 );
bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink );
@@ -1505,7 +1504,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool View::PasteRTFTable( ::tools::SvRef<SotStorageStream> xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
{
- boost::scoped_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
+ std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
pModel->NewOrLoadCompleted(NEW_DOC);
pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
pModel->InsertPage(pModel->AllocPage(false));
More information about the Libreoffice-commits
mailing list