[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Sat Sep 26 03:00:10 PDT 2015
sd/source/ui/inc/framework/Configuration.hxx | 3 +--
sd/source/ui/inc/framework/ConfigurationController.hxx | 3 +--
sd/source/ui/inc/framework/ModuleController.hxx | 5 ++---
sd/source/ui/inc/tools/PropertySet.hxx | 3 +--
sd/source/ui/view/MediaObjectBar.cxx | 5 ++---
sd/source/ui/view/drtxtob1.cxx | 7 +++----
sd/source/ui/view/drviews3.cxx | 5 ++---
sd/source/ui/view/outlnvs2.cxx | 11 +++++------
sd/source/ui/view/outlnvsh.cxx | 5 ++---
sd/source/ui/view/sdview.cxx | 7 +++----
10 files changed, 22 insertions(+), 32 deletions(-)
New commits:
commit e31da9fc2f24bb448efaab7a74a8bd1308bf2428
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 25 14:48:27 2015 +0100
boost->std
Change-Id: I1696c0982533b9c1ccf66e8a729feeddd3c8d5df
Reviewed-on: https://gerrit.libreoffice.org/18871
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/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 8109df0..7bf486f 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -29,7 +29,6 @@
#include <cppuhelper/compbase.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace {
@@ -145,7 +144,7 @@ private:
/** The resource container holds the URLs of unique resource and of
resource linked to unique resources.
*/
- ::boost::scoped_ptr<ResourceContainer> mpResourceContainer;
+ std::unique_ptr<ResourceContainer> mpResourceContainer;
/** The broadcaster used for notifying listeners of requests for
configuration changes.
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 7a8fbd0..5cdbf0f 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -36,7 +36,6 @@
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <memory>
namespace {
@@ -195,7 +194,7 @@ public:
private:
class Implementation;
- ::boost::scoped_ptr<Implementation> mpImplementation;
+ std::unique_ptr<Implementation> mpImplementation;
bool mbIsDisposed;
/** When the called object has already been disposed this method throws
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 5f73ebd..2660011 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -30,7 +30,6 @@
#include <cppuhelper/compbase.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <set>
namespace {
@@ -91,9 +90,9 @@ private:
css::frame::XController> mxController;
class ResourceToFactoryMap;
- ::boost::scoped_ptr<ResourceToFactoryMap> mpResourceToFactoryMap;
+ std::unique_ptr<ResourceToFactoryMap> mpResourceToFactoryMap;
class LoadedFactoryContainer;
- ::boost::scoped_ptr<LoadedFactoryContainer> mpLoadedFactories;
+ std::unique_ptr<LoadedFactoryContainer> mpLoadedFactories;
ModuleController (
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index 1c419fee..e48a7ca 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <map>
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd { namespace tools {
@@ -118,7 +117,7 @@ protected:
private:
typedef ::std::multimap<OUString,
css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
- ::boost::scoped_ptr<ChangeListenerContainer> mpChangeListeners;
+ std::unique_ptr<ChangeListenerContainer> mpChangeListeners;
/** Call all listeners that are registered for the given property name.
Call this method with an empty property name to call listeners that
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 2ea5f24..7c191ae 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -40,7 +40,6 @@
#include "sdresid.hxx"
#include "drawdoc.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace sd;
@@ -87,7 +86,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
bool bDisable = true;
if( 1 == pMarkList->GetMarkCount() )
@@ -124,7 +123,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq )
if( pItem )
{
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index f0623d9..be7b3fc 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -73,7 +73,6 @@
#include "futext.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -88,7 +87,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
sal_uInt16 nSlot = rReq.GetSlot();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
@@ -155,7 +154,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aAttr.Get( EE_PARA_ULSPACE ) );
- boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -196,7 +195,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges());
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
- boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ea1b141..a6ec31e 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -85,7 +85,6 @@
#include <editeng/lspcitem.hxx>
#include <editeng/ulspitem.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
@@ -294,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_INSERT_DATE_TIME:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
+ std::unique_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
if( pDlg )
{
pDlg->Execute();
@@ -318,7 +317,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
pPage = static_cast<SdPage*>(&pPage->TRG_GetMasterPage());
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
if( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index c180b45..a12ac7b 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -64,7 +64,6 @@
#include "DrawViewShell.hxx"
#include "slideshow.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
@@ -313,7 +312,7 @@ void OutlineViewShell::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);
@@ -358,7 +357,7 @@ void OutlineViewShell::ShowSlideShow(SfxRequest& rReq)
void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if (nSId != SID_OUTLINE_BULLET && nSId != FN_SVX_SET_BULLET && nSId != FN_SVX_SET_NUMBER)
{
aGuard.reset( new OutlineViewModelChangeGuard(*pOlView) );
@@ -489,7 +488,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case SID_INSERT_FLD_PAGES:
case SID_INSERT_FLD_FILE:
{
- boost::scoped_ptr<SvxFieldItem> pFieldItem;
+ std::unique_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -584,10 +583,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
+ std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
- boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
+ std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 1767a01..e540acf 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -87,7 +87,6 @@
#include "framework/FrameworkHelper.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -426,7 +425,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
bool bPreviewState = false;
sal_uLong nSlot = rReq.GetSlot();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if( pOlView && (
(nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
(nSlot == SID_TRANSLITERATE_TITLE_CASE) ||
@@ -1273,7 +1272,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
{
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
- boost::scoped_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
+ std::unique_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
// limit area
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index cf0c6d04b..8b10092 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -95,7 +95,6 @@
#include <memory>
#include <numeric>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -1270,7 +1269,7 @@ bool View::ShouldToggleOn(
return false;
bool bToggleOn = false;
- boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount && !bToggleOn; ++nIndex)
{
@@ -1338,8 +1337,8 @@ void View::ChangeMarkedObjectsBulletsNumbering(
const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets );
- boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
- boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
+ std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ std::unique_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount; ++nIndex)
More information about the Libreoffice-commits
mailing list