[Libreoffice-commits] core.git: sd/inc sd/source sd/workben
Caolán McNamara
caolanm at redhat.com
Wed Sep 23 04:19:48 PDT 2015
sd/inc/CustomAnimationEffect.hxx | 13 -
sd/inc/CustomAnimationPreset.hxx | 6
sd/inc/Outliner.hxx | 6
sd/inc/OutlinerIterator.hxx | 8
sd/inc/TransitionPreset.hxx | 4
sd/inc/pch/precompiled_sd.hxx | 5
sd/inc/pch/precompiled_sdui.hxx | 1
sd/inc/sdpage.hxx | 14 -
sd/inc/stlsheet.hxx | 1
sd/inc/undoanim.hxx | 1
sd/source/core/EffectMigration.cxx | 4
sd/source/core/stlsheet.cxx | 4
sd/source/core/undoanim.cxx | 4
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/pptexanimations.hxx | 4
sd/source/filter/eppt/text.hxx | 4
sd/source/filter/html/HtmlOptionsDialog.cxx | 1
sd/source/filter/html/buttonset.cxx | 6
sd/source/filter/html/htmlex.hxx | 3
sd/source/filter/ppt/pptin.hxx | 4
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 8
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 4
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/app/sdmod1.cxx | 7
sd/source/ui/app/sdxfer.cxx | 6
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 10 -
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 10 -
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/docshell/docshel3.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 6
sd/source/ui/framework/configuration/ConfigurationController.cxx | 12 -
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 4
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx | 10 -
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 8
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 12 -
sd/source/ui/framework/factories/BasicPaneFactory.hxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 32 +--
sd/source/ui/framework/factories/BasicViewFactory.hxx | 18 +-
sd/source/ui/framework/factories/FullScreenPane.hxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4
sd/source/ui/framework/module/CenterViewFocusModule.cxx | 2
sd/source/ui/framework/module/ResourceManager.hxx | 1
sd/source/ui/framework/module/ShellStackGuard.hxx | 2
sd/source/ui/framework/module/ToolBarModule.cxx | 6
sd/source/ui/framework/module/ToolBarModule.hxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 24 +-
sd/source/ui/func/fuarea.cxx | 2
sd/source/ui/func/fubullet.cxx | 2
sd/source/ui/func/fuchar.cxx | 2
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconnct.cxx | 2
sd/source/ui/func/fucopy.cxx | 2
sd/source/ui/func/fucushow.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 2
sd/source/ui/func/fuline.cxx | 2
sd/source/ui/func/fulinend.cxx | 2
sd/source/ui/func/fulink.cxx | 2
sd/source/ui/func/fumeasur.cxx | 2
sd/source/ui/func/fumorph.cxx | 2
sd/source/ui/func/fuoaprms.cxx | 2
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/fuoltext.cxx | 2
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/func/fuprlout.cxx | 4
sd/source/ui/func/fuprobjs.cxx | 2
sd/source/ui/func/fuscale.cxx | 2
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/func/fusnapln.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futransf.cxx | 2
sd/source/ui/func/futxtatt.cxx | 2
sd/source/ui/func/fuvect.cxx | 2
sd/source/ui/inc/DocumentRenderer.hxx | 2
sd/source/ui/inc/OutlinerIteratorImpl.hxx | 16 -
sd/source/ui/inc/PaneDockingWindow.hxx | 3
sd/source/ui/inc/RemoteServer.hxx | 11 -
sd/source/ui/inc/SlideSorter.hxx | 16 -
sd/source/ui/inc/SlideSorterViewShell.hxx | 14 -
sd/source/ui/inc/TemplateScanner.hxx | 8
sd/source/ui/inc/ToolBarManager.hxx | 16 -
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/ViewShellBase.hxx | 13 -
sd/source/ui/inc/ViewShellImplementation.hxx | 12 -
sd/source/ui/inc/ViewShellManager.hxx | 7
sd/source/ui/inc/ViewTabBar.hxx | 3
sd/source/ui/inc/framework/Configuration.hxx | 1
sd/source/ui/inc/framework/ConfigurationController.hxx | 4
sd/source/ui/inc/framework/FrameworkHelper.hxx | 15 -
sd/source/ui/inc/framework/ModuleController.hxx | 1
sd/source/ui/inc/framework/Pane.hxx | 3
sd/source/ui/inc/framework/PresentationFactory.hxx | 3
sd/source/ui/inc/framework/ResourceId.hxx | 1
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 10 -
sd/source/ui/inc/pubdlg.hxx | 3
sd/source/ui/inc/sdtreelb.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 6
sd/source/ui/inc/slideshow.hxx | 4
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5
sd/source/ui/inc/tools/PropertySet.hxx | 3
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 3
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx | 16 -
sd/source/ui/presenter/CanvasUpdateRequester.cxx | 4
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 6
sd/source/ui/presenter/PresenterCanvas.hxx | 4
sd/source/ui/presenter/PresenterPreviewCache.cxx | 6
sd/source/ui/presenter/PresenterPreviewCache.hxx | 6
sd/source/ui/presenter/PresenterTextView.hxx | 2
sd/source/ui/remotecontrol/BluetoothServer.cxx | 3
sd/source/ui/remotecontrol/BluetoothServer.hxx | 4
sd/source/ui/remotecontrol/Server.cxx | 14 -
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 4
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 12 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 4
sd/source/ui/sidebar/DocumentHelper.hxx | 6
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 83 ++++------
sd/source/ui/sidebar/MasterPageContainer.hxx | 8
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 10 -
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 6
sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 8
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 6
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 12 -
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/sidebar/MasterPagesSelector.hxx | 4
sd/source/ui/sidebar/PanelBase.hxx | 2
sd/source/ui/sidebar/PanelFactory.hxx | 5
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 6
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx | 4
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 6
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2
sd/source/ui/slideshow/SlideShowRestarter.cxx | 2
sd/source/ui/slideshow/SlideShowRestarter.hxx | 6
sd/source/ui/slideshow/slideshow.cxx | 12 -
sd/source/ui/slideshow/slideshowimpl.hxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 10 -
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 16 -
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 12 -
sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 2
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 8
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 8
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 7
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 2
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 4
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 40 ++--
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 6
sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 2
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 1
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 12 -
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 27 +--
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 4
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 2
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 4
sd/source/ui/slidesorter/controller/SlsListener.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.hxx | 4
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 10 -
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 20 +-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 10 -
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 10 -
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 6
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 3
sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 25 +--
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 22 +-
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx | 10 -
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 2
sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx | 4
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 17 --
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx | 6
sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 12 -
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 9 -
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 12 -
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 5
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 34 ++--
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 12 -
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 28 +--
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 14 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 6
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 6
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 16 -
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 6
sd/source/ui/slidesorter/view/SlsTheme.cxx | 8
sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 4
sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 2
sd/source/ui/table/TableDesignPane.cxx | 12 -
sd/source/ui/table/TableDesignPane.hxx | 2
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 2
sd/source/ui/tools/SdGlobalResourceContainer.cxx | 4
sd/source/ui/tools/TimerBasedTaskExecution.cxx | 18 +-
sd/source/ui/unoidl/DrawController.cxx | 10 -
sd/source/ui/unoidl/facreg.cxx | 8
sd/source/ui/view/DocumentRenderer.cxx | 66 +++----
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/Outliner.cxx | 74 ++++----
sd/source/ui/view/OutlinerIterator.cxx | 30 +--
sd/source/ui/view/ToolBarManager.cxx | 42 ++---
sd/source/ui/view/ViewShellBase.cxx | 38 ++--
sd/source/ui/view/ViewShellImplementation.cxx | 10 -
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews2.cxx | 2
sd/source/ui/view/drviews3.cxx | 2
sd/source/ui/view/drviews4.cxx | 2
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/drviews9.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/drviewsf.cxx | 2
sd/source/ui/view/outlnvs2.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 2
sd/source/ui/view/viewshel.cxx | 4
sd/workben/custompanel/ctp_panel.hxx | 2
240 files changed, 855 insertions(+), 888 deletions(-)
New commits:
commit 177ea7a2818ee64de3eaa9b587d70fe461468005
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 18 09:09:12 2015 +0100
boost::shared_ptr->std::shared_ptr
Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8
Reviewed-on: https://gerrit.libreoffice.org/18678
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/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index c4f892b..97f1ccf 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -26,14 +26,13 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
-#include <boost/shared_ptr.hpp>
-
#include <vcl/timer.hxx>
#include <sddllapi.h>
#include <list>
#include <map>
+#include <memory>
class SdrPathObj;
@@ -44,9 +43,9 @@ enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
class CustomAnimationEffect;
class CustomAnimationPreset;
-typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
+typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
typedef std::list< CustomAnimationEffectPtr > EffectSequence;
@@ -259,7 +258,7 @@ private:
sal_Int32 mnGroupId;
};
-typedef boost::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
+typedef std::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
typedef std::map< sal_Int32, CustomAnimationTextGroupPtr > CustomAnimationTextGroupMap;
class SD_DLLPUBLIC EffectSequenceHelper
@@ -362,7 +361,7 @@ private:
MainSequence* mpMainSequence;
};
-typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
+typedef std::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
typedef std::list< InteractiveSequencePtr > InteractiveSequenceList;
class MainSequence : public EffectSequenceHelper, public ISequenceListener
@@ -435,7 +434,7 @@ protected:
sal_Int32 mbIgnoreChanges;
};
-typedef boost::shared_ptr< MainSequence > MainSequencePtr;
+typedef std::shared_ptr< MainSequence > MainSequencePtr;
class MainSequenceRebuildGuard
{
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1c447f0..1f7abce 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -22,9 +22,9 @@
#include <sal/config.h>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
@@ -71,7 +71,7 @@ private:
EffectsSubTypeMap maSubTypes;
};
-typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
typedef std::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
@@ -83,7 +83,7 @@ struct PresetCategory
PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects )
: maLabel( rLabel ), maEffects( rEffects ) {}
};
-typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr;
+typedef std::shared_ptr< PresetCategory > PresetCategoryPtr;
typedef std::vector< PresetCategoryPtr > PresetCategoryList;
class SD_DLLPUBLIC CustomAnimationPresets
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index a97d209..fda3206 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -26,8 +26,6 @@
#include "OutlinerIterator.hxx"
#include <editeng/SpellPortions.hxx>
#include <memory>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/noncopyable.hpp>
class Dialog;
@@ -183,7 +181,7 @@ private:
pointer to avoid keeping it alive when the view is changed
during searching.
*/
- ::boost::weak_ptr<ViewShell> mpWeakViewShell;
+ std::weak_ptr<ViewShell> mpWeakViewShell;
/// This window contains the view.
VclPtr< ::sd::Window> mpWindow;
/// The document on whose objects and pages this class operates.
@@ -504,7 +502,7 @@ private:
It handles i.e. registering at the associated view as selection
change listener.
*/
- void SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell);
+ void SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell);
/** Activate or deactivate the search in the current selection. Call
this method whenever the selection has changed. This method creates
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 43c47b3..6d9b918 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -24,8 +24,8 @@
#include "pres.hxx"
#include "sal/types.h"
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
class SdDrawDocument;
@@ -244,7 +244,7 @@ private:
static Iterator CreateSelectionIterator (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
@@ -261,7 +261,7 @@ private:
*/
static Iterator CreateDocumentIterator (
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
@@ -284,7 +284,7 @@ private:
*/
static sal_Int32 GetPageIndex (
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
PageKind ePageKind,
EditMode eEditMode,
bool bDirectionIsForward,
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7420fc8..7c4054d 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_SD_INC_TRANSITIONPRESET_HXX
#define INCLUDED_SD_INC_TRANSITIONPRESET_HXX
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <list>
+#include <memory>
#include <unordered_map>
namespace com { namespace sun { namespace star {
@@ -36,7 +36,7 @@ class SdPage;
namespace sd {
class TransitionPreset;
-typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
+typedef std::shared_ptr< TransitionPreset > TransitionPresetPtr;
typedef std::list< TransitionPresetPtr > TransitionPresetList;
typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e8ac76a..05d49c8 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -68,16 +68,11 @@
#include <basic/sbstar.hxx>
#include <basic/sbx.hxx>
#include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include <boost/limits.hpp>
-#include <boost/make_shared.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/elapsedtime.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 63f5bd6..10a15b4 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -29,7 +29,6 @@
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 08d49af..bd065a5 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -20,14 +20,13 @@
#ifndef INCLUDED_SD_INC_SDPAGE_HXX
#define INCLUDED_SD_INC_SDPAGE_HXX
-#include <boost/shared_ptr.hpp>
-
-#include <functional>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/presentation/FadeEffect.hpp>
#include <com/sun/star/office/XAnnotation.hpp>
+#include <functional>
#include <list>
+#include <memory>
#include <vector>
#include <svx/svdobj.hxx>
#include <svx/fmpage.hxx>
@@ -59,11 +58,6 @@ namespace sd
class MainSequence;
}
-namespace boost
-{
- template<class X> class shared_ptr;
-}
-
namespace sd {
struct SD_DLLPUBLIC HeaderFooterSettings
@@ -138,7 +132,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
/** a helper class to manipulate effects inside the main sequence */
- boost::shared_ptr< sd::MainSequence > mpMainSequence;
+ std::shared_ptr< sd::MainSequence > mpMainSequence;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
@@ -307,7 +301,7 @@ public:
void setAnimationNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) throw (::com::sun::star::uno::RuntimeException);
/// @return a helper class to manipulate effects inside the main sequence
- boost::shared_ptr< sd::MainSequence > getMainSequence();
+ std::shared_ptr< sd::MainSequence > getMainSequence();
/** quick check if this slide has an animation node.
This can be used to have a cost free check if there are no animations ad this slide.
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 9e05c2e..a9a49d3 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -37,6 +37,7 @@
#include <editeng/unoipset.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include "prlayout.hxx"
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index d08f640..be2eea8 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/animations/XAnimationNode.hpp>
#include <svx/svdundo.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include "sdundo.hxx"
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 4261b7e..f77f5d4 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1292,7 +1292,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj )
SdPage* pPage = dynamic_cast< SdPage* >(pPathObj->GetPage());
if( pPage )
{
- boost::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
+ std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
if( pMainSequence.get() )
CustomAnimationEffectPtr pCreated( pMainSequence->append( *pPathObj, makeAny( xShape ), -1.0 ) );
}
@@ -1372,7 +1372,7 @@ void EffectMigration::CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage)
if(aIter.Count())
{
- boost::shared_ptr< sd::MainSequence > pMainSequence(rPage.getMainSequence());
+ std::shared_ptr< sd::MainSequence > pMainSequence(rPage.getMainSequence());
if(pMainSequence.get())
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index bc1e296..107137d 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -54,7 +54,7 @@
#include "../ui/inc/ViewShellBase.hxx"
#include <editeng/boxitem.hxx>
-#include <boost/make_shared.hpp>
+#include <memory>
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -932,7 +932,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw
OUString const name(GetName());
sal_Int32 const sep(name.indexOf(SD_LT_SEPARATOR));
OUString const master((sep == -1) ? OUString() : name.copy(0, sep));
- boost::shared_ptr<SfxStyleSheetIterator> aSSSI = boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily);
+ std::shared_ptr<SfxStyleSheetIterator> aSSSI = std::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily);
for (SfxStyleSheetBase *pStyle = aSSSI->First(); pStyle; pStyle = aSSSI->Next())
{
// we hope that we have only sd style sheets
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index f27e9c7..b948a25 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -125,7 +125,7 @@ struct UndoAnimationPathImpl: private boost::noncopyable
{
if( mpPage && xNode.is() )
{
- boost::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
+ std::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
if( pMainSequence.get() )
{
CustomAnimationEffectPtr pEffect( pMainSequence->findEffect( xNode ) );
@@ -143,7 +143,7 @@ struct UndoAnimationPathImpl: private boost::noncopyable
CustomAnimationEffectPtr pEffect;
if( mpPage && (mnEffectOffset >= 0) )
{
- boost::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
+ std::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
if( pMainSequence.get() )
pEffect = pMainSequence->getEffectFromOffset( mnEffectOffset );
}
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 6c84b8e..7a5ab07 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -135,7 +135,7 @@ private:
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
+ std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
::sax_fastparser::FSHelperPtr mPresentationFS;
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index d79aedc..155ee5a 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#endif
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <list>
@@ -51,7 +51,7 @@ namespace ppt
: mxNode( xNode ), mxMaster( xMaster ) {}
};
- typedef boost::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
+ typedef std::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
typedef sal_uInt32 TranslateMode;
#define TRANSLATE_NONE 0
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index c321669..fce5f12 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <editeng/svxenum.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star {
namespace awt { struct FontDescriptor; }
@@ -244,7 +244,7 @@ struct ImplTextObj;
class TextObj
{
- boost::shared_ptr<ImplTextObj> mpImplTextObj;
+ std::shared_ptr<ImplTextObj> mpImplTextObj;
void ImplCalculateTextPositions();
public:
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 4fb08f5..12165da 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -47,6 +47,7 @@ using namespace com::sun::star::ui::dialogs;
#include "pres.hxx"
#include "sdabstdlg.hxx"
+#include <memory>
#include <boost/scoped_ptr.hpp>
class SdHtmlOptionsDialog : public cppu::WeakImplHelper
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 8ab49ff..51b52bf 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -34,7 +34,7 @@
#include <vcl/image.hxx>
#include <unotools/pathoptions.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "buttonset.hxx"
@@ -147,7 +147,7 @@ public:
Reference< XGraphicProvider > getGraphicProvider();
- std::vector< boost::shared_ptr< ButtonsImpl > > maButtons;
+ std::vector< std::shared_ptr< ButtonsImpl > > maButtons;
Reference< XGraphicProvider > mxGraphicProvider;
};
@@ -177,7 +177,7 @@ void ButtonSetImpl::scanForButtonSets( const OUString& rPath )
{
OUString sFileName( aStatus.getFileName() );
if( sFileName.endsWithIgnoreAsciiCase( ".zip" ) )
- maButtons.push_back( boost::shared_ptr< ButtonsImpl >( new ButtonsImpl( aStatus.getFileURL() ) ) );
+ maButtons.push_back( std::shared_ptr< ButtonsImpl >( new ButtonsImpl( aStatus.getFileURL() ) ) );
}
}
}
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index d4a0399..34b6caa3 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -37,8 +37,9 @@
#include "sdresid.hxx"
#include "htmlpublishmode.hxx"
-#include <vector>
+#include <memory>
#include <boost/scoped_ptr.hpp>
+#include <vector>
#define PUB_LOWRES_WIDTH 640
#define PUB_MEDRES_WIDTH 800
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 0d3d8d2..703e77b 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -25,7 +25,7 @@
#include <diadef.h>
#include <svx/svdtypes.hxx>
#include <com/sun/star/uno/Any.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SdDrawDocument;
class SfxMedium;
@@ -41,7 +41,7 @@ class SdAnimationInfo;
struct PptInteractiveInfoAtom;
class Ppt97Animation;
-typedef boost::shared_ptr< Ppt97Animation > Ppt97AnimationPtr;
+typedef std::shared_ptr< Ppt97Animation > Ppt97AnimationPtr;
typedef ::std::map < SdrObject*, Ppt97AnimationPtr > tAnimationMap;
typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVector;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 3aa3461..c9a46c1 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -66,9 +66,9 @@
#include "pptin.hxx"
#include "randomnode.hxx"
-#include <boost/scoped_ptr.hpp>
-
#include <algorithm>
+#include <memory>
+#include <boost/scoped_ptr.hpp>
using ::std::map;
using ::com::sun::star::beans::NamedValue;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 032273a..bb5e989 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/media/XManager.hpp>
#include <com/sun/star/media/XPlayer.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <comphelper/processfactory.hxx>
#include <i18nutil/unicode.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 58892a0..851ea67 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -29,7 +29,7 @@
namespace sd {
class CustomAnimationEffect;
-typedef boost::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
+typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
class ICustomAnimationListController
{
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 7b626e2..9081eaf 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -76,12 +76,12 @@
#include "drawdoc.hxx"
#include "app.hrc"
-#include <algorithm>
-
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/range/b2drange.hxx>
-#include <boost/scoped_ptr.hpp>
+
+#include <algorithm>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::animations;
@@ -741,7 +741,7 @@ void CustomAnimationPane::updateMotionPathTags()
if( mxView.is() )
{
- ::boost::shared_ptr<ViewShell> xViewShell( mrBase.GetMainViewShell() );
+ std::shared_ptr<ViewShell> xViewShell( mrBase.GetMainViewShell() );
if( xViewShell.get() )
pView = xViewShell->GetView();
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 4bc6613..c527ff5 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -528,7 +528,7 @@ void SlideTransitionPane::onChangeCurrentPage()
{
::sd::slidesorter::SlideSorterViewShell * pSlideSorterViewShell
= ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(mrBase);
- ::boost::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> pSelection;
+ std::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> pSelection;
if( pSlideSorterViewShell )
{
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index a93d010..beb7d16 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -81,7 +81,7 @@
#include "textapi.hxx"
#include "optsitem.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -668,7 +668,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
if( pPage && !pPage->getAnnotations().empty() )
{
// switch to next/previous slide with annotations
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ std::shared_ptr<DrawViewShell> pDrawViewShell(std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
if (pDrawViewShell.get() != NULL)
{
pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, false);
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index afc114c..73dd9e8 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -85,7 +85,7 @@
#include "textapi.hxx"
#include "sdresid.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::sd;
using namespace ::com::sun::star;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 83e5f40..99dfffd 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -59,7 +59,6 @@
#include "FrameView.hxx"
#include "FactoryIds.hxx"
#include "sdabstdlg.hxx"
-#include <boost/shared_ptr.hpp>
#include <memory>
#include "slideshow.hxx"
@@ -85,7 +84,7 @@ public:
private:
::sd::ViewShellBase& mrBase;
SdDrawDocument& mrDocument;
- ::boost::shared_ptr<SvMemoryStream> mpStream;
+ std::shared_ptr<SvMemoryStream> mpStream;
};
} //end of anonymous namespace
@@ -294,7 +293,7 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest)
= dynamic_cast< ::sd::ViewShellBase*>(pViewFrame->GetViewShell());
if (pBase != NULL)
{
- ::boost::shared_ptr<FrameworkHelper> pHelper (
+ std::shared_ptr<FrameworkHelper> pHelper (
FrameworkHelper::Instance(*pBase));
pHelper->RequestView(
FrameworkHelper::msOutlineViewURL,
@@ -660,7 +659,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if (pDoc && pBase)
{
- ::boost::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell();
+ std::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell();
SdOptions* pOptions = GetSdOptions(pDoc->GetDocumentType());
if (pOptions && pViewSh.get())
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 27c72a3..f82d9da 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -751,7 +751,7 @@ sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Se
return nRet;
}
-void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData)
+void SdTransferable::AddUserData (const std::shared_ptr<UserData>& rpData)
{
maUserData.push_back(rpData);
}
@@ -761,12 +761,12 @@ sal_Int32 SdTransferable::GetUserDataCount() const
return maUserData.size();
}
-::boost::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal_Int32 nIndex) const
+std::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal_Int32 nIndex) const
{
if (nIndex>=0 && nIndex<sal_Int32(maUserData.size()))
return maUserData[nIndex];
else
- return ::boost::shared_ptr<UserData>();
+ return std::shared_ptr<UserData>();
}
namespace
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 527ef58..c4679e6 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -41,7 +41,7 @@ namespace sd {
// struct ClientBoxEntry
-ClientBoxEntry::ClientBoxEntry( ::boost::shared_ptr<ClientInfo> pClientInfo ) :
+ClientBoxEntry::ClientBoxEntry( std::shared_ptr<ClientInfo> pClientInfo ) :
m_bActive( false ),
m_pClientInfo( pClientInfo )
{
@@ -632,7 +632,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
return true;
}
-long ClientBox::addEntry( ::boost::shared_ptr<ClientInfo> pClientInfo )
+long ClientBox::addEntry( std::shared_ptr<ClientInfo> pClientInfo )
{
long nPos = 0;
@@ -691,11 +691,11 @@ void ClientBox::populateEntries()
#ifdef ENABLE_SDREMOTE
RemoteServer::ensureDiscoverable();
- vector< ::boost::shared_ptr< ClientInfo > > aClients( RemoteServer::getClients() );
+ vector< std::shared_ptr< ClientInfo > > aClients( RemoteServer::getClients() );
- const vector< ::boost::shared_ptr<ClientInfo > >::const_iterator aEnd( aClients.end() );
+ const vector< std::shared_ptr<ClientInfo > >::const_iterator aEnd( aClients.end() );
- for ( vector< ::boost::shared_ptr< ClientInfo > >::const_iterator aIt( aClients.begin() );
+ for ( vector< std::shared_ptr< ClientInfo > >::const_iterator aIt( aClients.begin() );
aIt != aEnd; ++aIt )
{
addEntry( *aIt );
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index d3d9b1b..0cc6df4 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -34,7 +34,7 @@
#include "com/sun/star/lang/XEventListener.hpp"
#include "com/sun/star/deployment/XPackage.hpp"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "sdresid.hxx"
@@ -52,14 +52,14 @@ namespace sd {
struct ClientBoxEntry;
struct ClientInfo;
-typedef boost::shared_ptr<ClientBoxEntry> TClientBoxEntry;
+typedef std::shared_ptr<ClientBoxEntry> TClientBoxEntry;
struct ClientBoxEntry
{
bool m_bActive :1;
- boost::shared_ptr<ClientInfo> m_pClientInfo;
+ std::shared_ptr<ClientInfo> m_pClientInfo;
- ClientBoxEntry(boost::shared_ptr<ClientInfo> pClientInfo);
+ ClientBoxEntry(std::shared_ptr<ClientInfo> pClientInfo);
~ClientBoxEntry();
};
@@ -158,7 +158,7 @@ public:
void RemoveUnlocked();
void selectEntry( const long nPos );
- long addEntry(boost::shared_ptr<ClientInfo> pClientInfo);
+ long addEntry(std::shared_ptr<ClientInfo> pClientInfo);
void clearEntries();
void prepareChecking();
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 0776519..c8a5177 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -29,7 +29,7 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "DrawDocShell.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
vcl::Window* pWindow, const SfxItemSet& rInAttrs)
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index a04069b..042d38e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1586,7 +1586,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
if (pBase->GetDocShell() != &rDocShell)
continue;
- const ::boost::shared_ptr<sd::ViewShell> pViewShell (pBase->GetMainViewShell());
+ const std::shared_ptr<sd::ViewShell> pViewShell (pBase->GetMainViewShell());
if (pViewShell)
return pViewShell.get();
}
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 567bcdb..eb4ad85 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -56,7 +56,7 @@
#include "View.hxx"
#include "slideshow.hxx"
#include "fuhhconv.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 93de709..e80bb89 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -768,7 +768,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
}
if (!sViewURL.isEmpty())
{
- ::boost::shared_ptr<FrameworkHelper> pHelper (
+ std::shared_ptr<FrameworkHelper> pHelper (
FrameworkHelper::Instance(rBase));
pHelper->RequestView(
sViewURL,
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index b936ca7..5be6ef9 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -444,7 +444,7 @@ void DrawDocShell::ClearUndoBuffer()
ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pSfxViewFrame->GetViewShell() );
if( pViewShellBase )
{
- ::boost::shared_ptr<ViewShell> pViewSh( pViewShellBase->GetMainViewShell() );
+ std::shared_ptr<ViewShell> pViewSh( pViewShellBase->GetMainViewShell() );
if( pViewSh.get() )
{
::sd::View* pView = pViewSh->GetView();
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 975e593..7db8da3 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -52,7 +52,7 @@ namespace sd { namespace framework {
ChangeRequestQueueProcessor::ChangeRequestQueueProcessor (
const ::rtl::Reference<ConfigurationController>& rpConfigurationController,
- const ::boost::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
+ const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
: maMutex(),
maQueue(),
mnUserEventId(0),
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index 696635d..fa0263a 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -29,7 +29,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <tools/link.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
struct ImplSVEvent;
@@ -56,7 +56,7 @@ public:
*/
ChangeRequestQueueProcessor (
const ::rtl::Reference<ConfigurationController>& rxController,
- const ::boost::shared_ptr<ConfigurationUpdater>& rpUpdater);
+ const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
~ChangeRequestQueueProcessor();
/** Sets the configuration who will be changed by subsequent change
@@ -112,7 +112,7 @@ private:
::rtl::Reference<ConfigurationController> mpConfigurationController;
- ::boost::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
+ std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
/** Initiate the processing of the entries in the queue. The actual
processing starts asynchronously.
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 54f526e..7d62e76 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -58,7 +58,7 @@ public:
/** The Broadcaster class implements storing and calling of listeners.
*/
- ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
/** The requested configuration which is modified (asynchronously) by
calls to requestResourceActivation() and
@@ -70,18 +70,18 @@ public:
ViewShellBase* mpBase;
- ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
+ std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
- ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
+ std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
- ::boost::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
+ std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
/** The queue processor ownes the queue of configuration change request
objects and processes the objects.
*/
::boost::scoped_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
- ::boost::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
+ std::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
sal_Int32 mnLockCount;
};
@@ -420,7 +420,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration (
// We will probably be making a couple of activation and deactivation
// requests so lock the configuration controller and let it later update
// all changes at once.
- ::boost::shared_ptr<ConfigurationUpdaterLock> pLock (
+ std::shared_ptr<ConfigurationUpdaterLock> pLock (
mpImplementation->mpConfigurationUpdater->GetLock());
// Get lists of resources that are to be activated or deactivated.
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 5e0e92864..9d23701 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -35,8 +35,8 @@ namespace sd { namespace framework {
//===== ConfigurationControllerResourceManager ================================
ConfigurationControllerResourceManager::ConfigurationControllerResourceManager (
- const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster)
+ const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
+ const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster)
: maResourceMap(ResourceComparator()),
mpResourceFactoryContainer(rpResourceFactoryContainer),
mpBroadcaster(rpBroadcaster)
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index 7273655..063aec3a 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -26,8 +26,8 @@
#include <osl/mutex.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
#include <vector>
namespace sd { namespace framework {
@@ -58,8 +58,8 @@ public:
resources.
*/
ConfigurationControllerResourceManager (
- const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
+ const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
+ const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
~ConfigurationControllerResourceManager();
@@ -108,12 +108,12 @@ private:
ResourceComparator> ResourceMap;
ResourceMap maResourceMap;
- ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
+ std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
/** This broadcaster is used to notify the activation and deactivation
of resources.
*/
- ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
void ActivateResource (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 298924f..e9e23f0 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -60,8 +60,8 @@ private:
//===== ConfigurationUpdater ==================================================
ConfigurationUpdater::ConfigurationUpdater (
- const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
+ const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
+ const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
const Reference<XControllerManager>& rxControllerManager)
: mxControllerManager(),
mpBroadcaster(rpBroadcaster),
@@ -355,9 +355,9 @@ void ConfigurationUpdater::UnlockUpdates()
}
}
-::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock()
+std::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock()
{
- return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this));
+ return std::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this));
}
void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 07f34c4..fb7209e 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -25,8 +25,8 @@
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <vcl/timer.hxx>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
namespace sd { namespace framework {
@@ -49,8 +49,8 @@ public:
changes and the start and end of updates via the given broadcaster.
*/
ConfigurationUpdater (
- const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
+ const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
+ const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
const css::uno::Reference<
css::drawing::framework::XControllerManager>& rxControllerManager);
~ConfigurationUpdater();
@@ -79,7 +79,7 @@ public:
returned object exists no update of the current configuration is
made.
*/
- ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock();
+ std::shared_ptr<ConfigurationUpdaterLock> GetLock();
private:
/** A reference to the XControllerManager is kept so that
@@ -88,7 +88,7 @@ private:
css::uno::Reference<
css::drawing::framework::XControllerManager> mxControllerManager;
- ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
/** The current configuration holds the resources that are currently
active. It is modified during an update.
@@ -139,7 +139,7 @@ private:
*/
sal_Int32 mnFailedUpdateCount;
- ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
+ std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
/** This method does the main work of an update. It calls the sub
controllers that are responsible for the various types of resources
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index aeaf9b6..5d1a454 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -32,8 +32,8 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
namespace {
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 065499b..dee1ae7 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -58,10 +58,10 @@ class BasicViewFactory::ViewDescriptor
{
public:
Reference<XResource> mxView;
- ::boost::shared_ptr<sd::ViewShell> mpViewShell;
+ std::shared_ptr<sd::ViewShell> mpViewShell;
ViewShellWrapper* mpWrapper;
Reference<XResourceId> mxViewId;
- static bool CompareView (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
+ static bool CompareView (const std::shared_ptr<ViewDescriptor>& rpDescriptor,
const Reference<XResource>& rxView)
{ return rpDescriptor->mxView.get() == rxView.get(); }
};
@@ -69,14 +69,14 @@ public:
//===== BasicViewFactory::ViewShellContainer ==================================
class BasicViewFactory::ViewShellContainer
- : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
+ : public ::std::vector<std::shared_ptr<ViewDescriptor> >
{
public:
ViewShellContainer() {};
};
class BasicViewFactory::ViewCache
- : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
+ : public ::std::vector<std::shared_ptr<ViewDescriptor> >
{
public:
ViewCache() {};
@@ -164,7 +164,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource (
if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL)
{
// Try to get the view from the cache.
- ::boost::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane));
+ std::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane));
// When the requested view is not in the cache then create a new view.
if (pDescriptor.get() == NULL)
@@ -201,7 +201,7 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV
::boost::bind(&ViewDescriptor::CompareView, _1, rxView)));
if (iViewShell != mpViewShellContainer->end())
{
- ::boost::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell);
+ std::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell);
if ((*iViewShell)->mxViewId->isBoundToURL(
FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
@@ -278,7 +278,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
}
}
-::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
+std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
const Reference<XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -286,7 +286,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
FrameView* pFrameView,
const bool bIsCenterPane)
{
- ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor());
+ std::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor());
pDescriptor->mpViewShell = CreateViewShell(
rxViewId,
@@ -323,14 +323,14 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
return pDescriptor;
}
-::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
+std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
const Reference<XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
FrameView* pFrameView,
const bool bIsCenterPane)
{
- ::boost::shared_ptr<ViewShell> pViewShell;
+ std::shared_ptr<ViewShell> pViewShell;
const OUString& rsViewURL (rxViewId->getResourceURL());
if (rsViewURL.equals(FrameworkHelper::msImpressViewURL))
{
@@ -403,7 +403,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
}
void BasicViewFactory::ReleaseView (
- const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
+ const std::shared_ptr<ViewDescriptor>& rpDescriptor,
bool bDoNotCache)
{
bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor));
@@ -441,7 +441,7 @@ void BasicViewFactory::ReleaseView (
}
}
-bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor)
+bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDescriptor)
{
bool bIsCacheable (false);
@@ -451,7 +451,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
static ::std::vector<Reference<XResourceId> > maCacheableResources;
if (maCacheableResources.empty() )
{
- ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
+ std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
// The slide sorter and the task panel are cacheable and relocatable.
maCacheableResources.push_back(FrameworkHelper::CreateResourceId(
@@ -474,11 +474,11 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
return bIsCacheable;
}
-::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache (
+std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache (
const Reference<XResourceId>& rxViewId,
const Reference<XPane>& rxPane)
{
- ::boost::shared_ptr<ViewDescriptor> pDescriptor;
+ std::shared_ptr<ViewDescriptor> pDescriptor;
// Search for the requested view in the cache.
ViewCache::iterator iEntry;
@@ -515,7 +515,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
}
void BasicViewFactory::ActivateCenterView (
- const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor)
+ const std::shared_ptr<ViewDescriptor>& rpDescriptor)
{
mpBase->GetDocShell()->Connect(rpDescriptor->mpViewShell.get());
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 440bf74..7b1530c 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -32,9 +32,9 @@
#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
#include <vcl/vclptr.hxx>
+#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
class ViewShell;
@@ -106,11 +106,11 @@ private:
class ViewCache;
ScopedVclPtr<vcl::Window> mpWindow;
- ::boost::shared_ptr<ViewCache> mpViewCache;
+ std::shared_ptr<ViewCache> mpViewCache;
css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;
- ::boost::shared_ptr<ViewDescriptor> CreateView (
+ std::shared_ptr<ViewDescriptor> CreateView (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -118,7 +118,7 @@ private:
FrameView* pFrameView,
const bool bIsCenterView);
- ::boost::shared_ptr<ViewShell> CreateViewShell (
+ std::shared_ptr<ViewShell> CreateViewShell (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -126,16 +126,16 @@ private:
const bool bIsCenterView);
void ActivateCenterView (
- const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor);
+ const std::shared_ptr<ViewDescriptor>& rpDescriptor);
void ReleaseView (
- const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
+ const std::shared_ptr<ViewDescriptor>& rpDescriptor,
bool bDoNotCache = false);
bool IsCacheable (
- const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor);
+ const std::shared_ptr<ViewDescriptor>& rpDescriptor);
- ::boost::shared_ptr<ViewDescriptor> GetViewFromCache (
+ std::shared_ptr<ViewDescriptor> GetViewFromCache (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
const css::uno::Reference<css::drawing::framework::XPane>& rxPane);
};
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 02d1670..3f5f130 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/vclevent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class WorkWindow;
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 68ebb2a..2b3e805 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -55,13 +55,13 @@ using ::com::sun::star::lang::DisposedException;
namespace sd { namespace framework {
ViewShellWrapper::ViewShellWrapper (
- ::boost::shared_ptr<ViewShell> pViewShell,
+ std::shared_ptr<ViewShell> pViewShell,
const Reference<XResourceId>& rxViewId,
const Reference<awt::XWindow>& rxWindow)
: ViewShellWrapperInterfaceBase(MutexOwner::maMutex),
mpViewShell(pViewShell),
mpSlideSorterViewShell(
- ::boost::dynamic_pointer_cast< ::sd::slidesorter::SlideSorterViewShell >( pViewShell )),
+ std::dynamic_pointer_cast< ::sd::slidesorter::SlideSorterViewShell >( pViewShell )),
mxViewId(rxViewId),
mxWindow(rxWindow)
{
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index a0f2c54f..986f6fb 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -142,7 +142,7 @@ void CenterViewFocusModule::HandleNewView (
xTunnel->getSomething(ViewShellWrapper::getUnoTunnelId()));
if (pViewShellWrapper != NULL)
{
- ::boost::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell();
+ std::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell();
if (pViewShell.get() != NULL)
mpBase->GetViewShellManager()->MoveToTop(*pViewShell);
}
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index e675951..418979b 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 63cb56b..7842bbc 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -31,7 +31,7 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace {
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index 51e4b6b..3e66583 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -141,7 +141,7 @@ void ToolBarModule::HandleUpdateStart()
// stack.
if (mpBase != NULL)
{
- ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+ std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
mpToolBarManagerLock.reset(new ToolBarManager::UpdateLock(pToolBarManager));
pToolBarManager->LockViewShellManager();
}
@@ -156,8 +156,8 @@ void ToolBarModule::HandleUpdateEnd()
// no longer visible. This is done before the old view shell is
// destroyed in order to avoid unnecessary updates of those tool
// bars.
- ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
- ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper (
+ std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+ std::shared_ptr<FrameworkHelper> pFrameworkHelper (
FrameworkHelper::Instance(*mpBase));
ViewShell* pViewShell
= pFrameworkHelper->GetViewShell(FrameworkHelper::msCenterPaneURL).get();
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 67ec89e..3215a75 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -28,7 +28,7 @@
#include <osl/mutex.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index a34d3430..c35a470 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -230,9 +230,9 @@ const OUString FrameworkHelper::msConfigurationControllerService("com.sun.star.d
//----- helper ----------------------------------------------------------------
namespace
{
- static ::boost::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper )
+ static ::std::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper )
{
- ::boost::shared_ptr< ViewShell > pViewShell;
+ ::std::shared_ptr< ViewShell > pViewShell;
if ( !i_rViewShellWrapper.is() )
return pViewShell;
@@ -295,7 +295,7 @@ class FrameworkHelper::DisposeListener
public FrameworkHelperDisposeListenerInterfaceBase
{
public:
- DisposeListener (const ::boost::shared_ptr<FrameworkHelper>& rpHelper);
+ DisposeListener (const ::std::shared_ptr<FrameworkHelper>& rpHelper);
virtual ~DisposeListener();
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -304,7 +304,7 @@ public:
throw(RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::boost::shared_ptr<FrameworkHelper> mpHelper;
+ ::std::shared_ptr<FrameworkHelper> mpHelper;
};
//----- FrameworkHelper::Deleter ----------------------------------------------
@@ -324,10 +324,10 @@ public:
FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
-::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase)
+::std::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase)
{
- ::boost::shared_ptr<FrameworkHelper> pHelper;
+ ::std::shared_ptr<FrameworkHelper> pHelper;
InstanceMap::const_iterator iHelper (maInstanceMap.find(&rBase));
if (iHelper == maInstanceMap.end())
@@ -336,7 +336,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
::osl::MutexGuard aGuard (aMutexFunctor());
if (iHelper == maInstanceMap.end())
{
- pHelper = ::boost::shared_ptr<FrameworkHelper>(
+ pHelper = ::std::shared_ptr<FrameworkHelper>(
new FrameworkHelper(rBase),
FrameworkHelper::Deleter());
pHelper->Initialize();
@@ -405,16 +405,16 @@ bool FrameworkHelper::IsValid()
return mxConfigurationController.is();
}
-::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL)
+::std::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL)
{
if ( !mxConfigurationController.is() )
- return ::boost::shared_ptr<ViewShell>();
+ return ::std::shared_ptr<ViewShell>();
Reference<XResourceId> xPaneId( CreateResourceId( rsPaneURL ) );
return lcl_getViewShell( lcl_getFirstViewInPane( mxConfigurationController, xPaneId ) );
}
-::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView)
+::std::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView)
{
return lcl_getViewShell( rxView.get() );
}
@@ -556,7 +556,7 @@ void FrameworkHelper::HandleModeChangeSlot (
Reference<XResourceId> xPaneId (
CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
Reference<XView> xView (GetView(xPaneId));
- ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView));
+ ::std::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView));
OUString sRequestedView;
if (bIsActive)
@@ -775,7 +775,7 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
//----- FrameworkHelper::DisposeListener --------------------------------------
FrameworkHelper::DisposeListener::DisposeListener (
- const ::boost::shared_ptr<FrameworkHelper>& rpHelper)
+ const ::std::shared_ptr<FrameworkHelper>& rpHelper)
: FrameworkHelperDisposeListenerInterfaceBase(maMutex),
mpHelper(rpHelper)
{
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index ef48a6c..33d9476 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -34,7 +34,7 @@
#include "app.hrc"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
TYPEINIT1( FuArea, FuPoor );
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 4ef4f2c..42482d3 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -38,7 +38,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include "drawview.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "app.hrc"
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index b8166c2..7ae1866 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -34,7 +34,7 @@
#include "ViewShell.hxx"
#include "DrawDocShell.hxx"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index f8dbe85..8be8252 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -180,7 +180,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
SdPage* pPage = dynamic_cast< SdPage* >( pPathObj ? pPathObj->GetPage() : 0 );
if( pPage )
{
- boost::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
+ std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
if( pMainSequence.get() )
{
Sequence< Any > aTargets;
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index 7a640cc..1ce1bc3 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -25,7 +25,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 5f6ee2c..30501b5 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -38,7 +38,7 @@
#include <svx/xfillit0.hxx>
#include <sfx2/request.hxx>
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 3c898a2..b1843c4 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -31,7 +31,7 @@
#include <sfx2/viewfrm.hxx>
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 2d3c532..f7f1622 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -82,7 +82,7 @@
#include "sdxfer.hxx"
#include <vcl/svapp.hxx>
#include "undo/undoobjects.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "glob.hrc"
#include <config_features.h>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 991d4f8..bcbcabb 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -62,7 +62,7 @@
#include "unmovss.hxx"
#include "Outliner.hxx"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index f16a9d5..e95a0e8 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -36,7 +36,7 @@
#include "app.hrc"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index b963b06..788b518 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -32,7 +32,7 @@
#include "drawdoc.hxx"
#include "View.hxx"
#include "Window.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 0350b2c..920f8b6 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -29,7 +29,7 @@
#include "drawdoc.hxx"
#include "ViewShell.hxx"
#include "app.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class SfxRequest;
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 22bc96e..aa8fcc9 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -25,7 +25,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 6eac885..0ed4ee9 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -43,8 +43,8 @@
#include <svx/svditer.hxx>
#include <basegfx/color/bcolor.hxx>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <memory>
using namespace com::sun::star;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 1959915..bc066e4 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -44,7 +44,7 @@
#include "sdresid.hxx"
#include <tools/helpers.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index e653856..fdfaa12 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -38,7 +38,7 @@
#include <svx/nbdtmg.hxx>
#include <svx/nbdtmgfact.hxx>
#include <svx/svdoutl.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace svx::sidebar;
namespace sd {
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index b7fbe74..b8bd183 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -35,7 +35,7 @@
#include "ViewShell.hxx"
#include "OutlineViewShell.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <stdio.h>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 518f356..52140e6 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -67,7 +67,7 @@
#include "sdundogr.hxx"
#include "helpids.h"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index fc4031d..7d8a313 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -34,7 +34,7 @@
#include "drawdoc.hxx"
#include "sdabstdlg.hxx"
#include "sdattr.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index f087ad9..d4748e1 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -52,7 +52,7 @@
#include <editeng/outliner.hxx>
#include <editeng/editdata.hxx>
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd
{
@@ -110,7 +110,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
= slidesorter::SlideSorterViewShell::GetSlideSorter(mpViewShell->GetViewShellBase());
if (pSlideSorterViewShell)
{
- boost::shared_ptr<slidesorter::SlideSorterViewShell::PageSelection> xSelection(
+ std::shared_ptr<slidesorter::SlideSorterViewShell::PageSelection> xSelection(
pSlideSorterViewShell->GetPageSelection());
if (xSelection)
{
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 46988bf..07bccea 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -39,7 +39,7 @@
#include "prlayout.hxx"
#include "unchss.hxx"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 9729951..d832610 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -39,7 +39,7 @@
#include <sfx2/zoomitem.hxx>
#include <sfx2/request.hxx>
#include <svx/svxdlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 02804b7..3daffe3 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -32,7 +32,7 @@
#include "Window.hxx"
#include "optsitem.hxx"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 4014137..c455db2 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -35,7 +35,7 @@
#include "sdabstdlg.hxx"
#include "app.hrc"
#include <svx/svdpagv.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 445feef..3d42212 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -65,7 +65,7 @@
#include "strings.hrc"
#include "helpids.h"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 24f6a82..5bcc17a 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -31,7 +31,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 4c61d4d..367b1ec 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -26,7 +26,7 @@
#include "View.hxx"
#include "ViewShell.hxx"
#include "drawdoc.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index 798639c..1beb9ce 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -29,7 +29,7 @@
#include "strings.hrc"
#include "sdresid.hxx"
#include "sdabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd
{
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index fae3d8d..8852c04 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/view/XRenderable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index df8ef82..946bba0 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -22,7 +22,7 @@
#include <svx/svdobj.hxx>
#include "OutlinerIterator.hxx"
-#include <boost/weak_ptr.hpp>
+#include <memory>
class SdDrawDocument;
class SdPage;
@@ -55,10 +55,10 @@ public:
the direction is forwards otherwise it is backwards.
*/
IteratorImplBase (SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
IteratorImplBase (SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode);
virtual ~IteratorImplBase();
@@ -115,7 +115,7 @@ protected:
/// The document on whose data the iterator operates.
SdDrawDocument* mpDocument;
/// Necessary secondary source of information.
- ::boost::weak_ptr<ViewShell> mpViewShellWeak;
+ std::weak_ptr<ViewShell> mpViewShellWeak;
/// Specifies the search direction.
bool mbDirectionIsForward;
};
@@ -137,7 +137,7 @@ public:
const ::std::vector< SdrObjectWeakRef >& rObjectList,
sal_Int32 nObjectIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
SelectionIteratorImpl (const SelectionIteratorImpl& rObject);
virtual ~SelectionIteratorImpl();
@@ -179,12 +179,12 @@ public:
ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward,
PageKind ePageKind,
EditMode eEditMode);
@@ -234,7 +234,7 @@ public:
PageKind ePageKind,
EditMode eEditMode,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
virtual ~DocumentIteratorImpl();
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx
index a8d3b21..528adf9 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -23,8 +23,7 @@
#include <sfx2/titledockwin.hxx>
#include <sfx2/viewfrm.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SplitWindow;
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 91718f9..531554f 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -16,10 +16,9 @@
#include <unistd.h>
#endif
#include <sys/types.h>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
#include <osl/mutex.hxx>
#include <osl/socket.hxx>
#include <rtl/ref.hxx>
@@ -73,10 +72,10 @@ namespace sd
static void presentationStopped();
// For the control dialog
- SD_DLLPUBLIC static std::vector< ::boost::shared_ptr< ClientInfo > > getClients();
- SD_DLLPUBLIC static bool connectClient( ::boost::shared_ptr< ClientInfo > pClient,
+ SD_DLLPUBLIC static std::vector< std::shared_ptr< ClientInfo > > getClients();
+ SD_DLLPUBLIC static bool connectClient( std::shared_ptr< ClientInfo > pClient,
const OUString& aPin );
- SD_DLLPUBLIC static void deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient );
+ SD_DLLPUBLIC static void deauthoriseClient( std::shared_ptr< ClientInfo > pClient );
/// ensure that discoverability (eg. for Bluetooth) is enabled
SD_DLLPUBLIC static void ensureDiscoverable();
@@ -93,7 +92,7 @@ namespace sd
static ::std::vector<Communicator*> sCommunicators;
osl::AcceptorSocket mSocket;
- ::std::vector< ::boost::shared_ptr< ClientInfoInternal > > mAvailableClients;
+ ::std::vector< std::shared_ptr< ClientInfoInternal > > mAvailableClients;
void execute() SAL_OVERRIDE;
};
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 42dc811..c2f302c 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -26,10 +26,10 @@
#include <cppuhelper/weakref.hxx>
#include <sfx2/viewfrm.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/current_function.hpp>
#include <vcl/scrbar.hxx>
+#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScrollBar;
class ScrollBarBox;
@@ -95,7 +95,7 @@ public:
The little square enclosed by the two scroll bars. Typically
the one from the ViewShell.
*/
- static ::boost::shared_ptr<SlideSorter> CreateSlideSorter (
+ static std::shared_ptr<SlideSorter> CreateSlideSorter (
ViewShell& rViewShell,
sd::Window* pContentWindow,
ScrollBar* pHorizontalScrollBar,
@@ -112,7 +112,7 @@ public:
The parent window of the internally created content window and
scroll bars.
*/
- static ::boost::shared_ptr<SlideSorter> CreateSlideSorter (
+ static std::shared_ptr<SlideSorter> CreateSlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
vcl::Window& rParentWindow);
@@ -179,11 +179,11 @@ public:
/** Return a collection of properties that are used throughout the slide
sorter.
*/
- ::boost::shared_ptr<controller::Properties> GetProperties() const;
+ std::shared_ptr<controller::Properties> GetProperties() const;
/** Return the active theme which gives access to colors and fonts.
*/
- ::boost::shared_ptr<view::Theme> GetTheme() const;
+ std::shared_ptr<view::Theme> GetTheme() const;
protected:
/** This virtual method makes it possible to create a specialization of
@@ -234,8 +234,8 @@ private:
/** Some slide sorter wide properties that are used in different
classes.
*/
- ::boost::shared_ptr<controller::Properties> mpProperties;
- ::boost::shared_ptr<view::Theme> mpTheme;
+ std::shared_ptr<controller::Properties> mpProperties;
+ std::shared_ptr<view::Theme> mpTheme;
SlideSorter (
ViewShell& rViewShell,
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 1b38842..4b655fc 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -24,7 +24,7 @@
#include "glob.hxx"
#include <sfx2/shell.hxx>
#include <sfx2/viewfac.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace sd { namespace slidesorter { namespace controller {
@@ -49,7 +49,7 @@ private:
static void InitInterface_Impl();
public:
- static ::boost::shared_ptr<SlideSorterViewShell> Create(
+ static std::shared_ptr<SlideSorterViewShell> Create(
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
@@ -151,9 +151,9 @@ public:
/** Return the set of selected pages.
*/
- ::boost::shared_ptr<PageSelection> GetPageSelection() const;
+ std::shared_ptr<PageSelection> GetPageSelection() const;
- void SetPageSelection (const ::boost::shared_ptr<PageSelection>& rSelection);
+ void SetPageSelection (const std::shared_ptr<PageSelection>& rSelection);
/** Add a listener that is called when the selection of the slide sorter
changes.
@@ -202,7 +202,7 @@ protected:
virtual ::svl::IUndoManager* ImpGetUndoManager() const SAL_OVERRIDE;
private:
- ::boost::shared_ptr<SlideSorter> mpSlideSorter;
+ std::shared_ptr<SlideSorter> mpSlideSorter;
bool mbIsArrangeGUIElementsPending;
SlideSorterViewShell (
@@ -218,10 +218,10 @@ private:
*/
virtual void UpdateScrollBars() SAL_OVERRIDE;
- void PostMoveSlidesActions(const ::boost::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection);
+ void PostMoveSlidesActions(const std::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection);
};
-typedef ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection;
+typedef std::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection;
} } // end of namespace ::sd::slidesorter
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 1a066ee..6a11e00 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -25,9 +25,9 @@
#include <ucbhelper/content.hxx>
#include "com/sun/star/uno/Reference.hxx"
-#include <vector>
+#include <memory>
#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <vector>
namespace com { namespace sun { namespace star { namespace ucb {
class XContent;
@@ -65,7 +65,7 @@ public:
bool operator()(TemplateEntry* pA, TemplateEntry* pB) const;
private:
- ::boost::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
+ std::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
};
/** Representation of a template or layout folder.
@@ -137,7 +137,7 @@ public:
/** Return the TemplateDir object that was last added to
mpTemplateDirectory.
@return
- <NULL/> is returned either before the template scanning is
+ <nullptr/> is returned either before the template scanning is
started or after it has ended.
*/
const TemplateEntry* GetLastAddedEntry() const { return mpLastAddedEntry;}
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 5263dd0..d3501c4 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -26,9 +26,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <sal/types.h>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
class SdrView;
@@ -63,16 +61,16 @@ class ViewShellManager;
in a short time on a view shell switch.
*/
class ToolBarManager
- : public ::boost::enable_shared_from_this<ToolBarManager>
+ : public std::enable_shared_from_this<ToolBarManager>
{
public:
/** Use this method instead of the constructor to create new objects of
this class.
*/
- static ::boost::shared_ptr<ToolBarManager> Create (
+ static std::shared_ptr<ToolBarManager> Create (
ViewShellBase& rBase,
- const ::boost::shared_ptr<tools::EventMultiplexer>& rpMultiplexer,
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager);
+ const std::shared_ptr<tools::EventMultiplexer>& rpMultiplexer,
+ const std::shared_ptr<ViewShellManager>& rpViewShellManager);
~ToolBarManager();
@@ -243,11 +241,11 @@ public:
bar operations are made in a row.
*/
class UpdateLock { public:
- UpdateLock(const ::boost::shared_ptr<ToolBarManager>& rpManager)
+ UpdateLock(const std::shared_ptr<ToolBarManager>& rpManager)
: mpManager(rpManager) { mpManager->LockUpdate(); }
~UpdateLock() { mpManager->UnlockUpdate(); }
private:
- ::boost::shared_ptr<ToolBarManager> mpManager;
+ std::shared_ptr<ToolBarManager> mpManager;
};
friend class UpdateLock;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 24fe233..3c0215f 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/drawing/XDrawSubController.hpp>
#include <memory>
-#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class SdPage;
class SvxRuler;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 832add5..9975cbe 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -27,8 +27,7 @@
#include "glob.hxx"
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfac.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class SdDrawDocument;
class SfxRequest;
@@ -85,13 +84,13 @@ public:
*/
void LateInit (const OUString& rsDefaultView);
- ::boost::shared_ptr<ViewShellManager> GetViewShellManager() const;
+ std::shared_ptr<ViewShellManager> GetViewShellManager() const;
/** Return the main view shell stacked on the called ViewShellBase
object. This is usually the view shell displayed in the center
pane.
*/
- ::boost::shared_ptr<ViewShell> GetMainViewShell() const;
+ std::shared_ptr<ViewShell> GetMainViewShell() const;
/** When given a view frame this static method returns the
corresponding sd::ViewShellBase object.
@@ -201,15 +200,15 @@ public:
events from various sources. This method must not be called before
LateInit() has terminated.
*/
- ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer();
+ std::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer();
/** returns the complete area of the current view relative to the frame
window
*/
const Rectangle& getClientRectangle() const;
- ::boost::shared_ptr<ToolBarManager> GetToolBarManager() const;
- ::boost::shared_ptr<FormShellManager> GetFormShellManager() const;
+ std::shared_ptr<ToolBarManager> GetToolBarManager() const;
+ std::shared_ptr<FormShellManager> GetFormShellManager() const;
DrawController& GetDrawController() const;
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index e4a7d26..291fb201 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -24,8 +24,6 @@
#include "ViewShellManager.hxx"
#include "ToolBarManager.hxx"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <memory>
class SvxIMapDlg;
@@ -64,8 +62,8 @@ public:
/** Create a new instance. This allows the mpSelf member to be set
automatically.
*/
- static ::boost::shared_ptr<ToolBarManagerLock> Create (
- const ::boost::shared_ptr<ToolBarManager>& rpManager);
+ static std::shared_ptr<ToolBarManagerLock> Create (
+ const std::shared_ptr<ToolBarManager>& rpManager);
/** Release the lock. When the UI is captured
(Application::IsUICaptured() returns <TRUE/>) then the lock is
released later asynchronously.
@@ -87,8 +85,8 @@ public:
its own lifetime. This, of course, does work only when no one
holds another shared_ptr longer than only temporary.
*/
- ::boost::shared_ptr<ToolBarManagerLock> mpSelf;
- ToolBarManagerLock (const ::boost::shared_ptr<sd::ToolBarManager>& rpManager);
+ std::shared_ptr<ToolBarManagerLock> mpSelf;
+ ToolBarManagerLock (const std::shared_ptr<sd::ToolBarManager>& rpManager);
~ToolBarManagerLock();
class Deleter;
@@ -96,7 +94,7 @@ public:
};
// The member is not a unqiue_ptr because it takes over its own life time
// control.
- ::boost::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse;
+ std::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse;
Implementation (ViewShell& rViewShell);
~Implementation();
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index 66eb593..3b30fcc 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -22,7 +22,6 @@
#include "ShellFactory.hxx"
#include <memory>
-#include <boost/shared_ptr.hpp>
class FmFormShell;
class SfxShell;
@@ -54,7 +53,7 @@ class ViewShellBase;
class ViewShellManager
{
public:
- typedef ::boost::shared_ptr<ShellFactory<SfxShell> > SharedShellFactory;
+ typedef std::shared_ptr<ShellFactory<SfxShell> > SharedShellFactory;
ViewShellManager (ViewShellBase& rBase);
@@ -173,11 +172,11 @@ public:
class UpdateLock
{
public:
- UpdateLock (const ::boost::shared_ptr<ViewShellManager>& rpManager)
+ UpdateLock (const std::shared_ptr<ViewShellManager>& rpManager)
: mpManager(rpManager) {mpManager->LockUpdate();}
~UpdateLock() {mpManager->UnlockUpdate();};
private:
- ::boost::shared_ptr<ViewShellManager> mpManager;
+ std::shared_ptr<ViewShellManager> mpManager;
};
friend class UpdateLock;
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index d298fd5..67c4899 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -32,9 +32,8 @@
#include <cppuhelper/compbase.hxx>
#include "MutexOwner.hxx"
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index c5b60e2..8109df0 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <cppuhelper/compbase.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index c9802c7..7a8fbd0 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -35,9 +35,9 @@
#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace {
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 8407203..d0d4b04 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -28,12 +28,9 @@
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
#include <functional>
#include <map>
+#include <memory>
namespace sd {
class ViewShell;
@@ -54,7 +51,7 @@ namespace sd { namespace framework {
controllers called by it throws a DisposedException.
*/
class FrameworkHelper
- : public ::boost::enable_shared_from_this<FrameworkHelper>,
+ : public std::enable_shared_from_this<FrameworkHelper>,
public SdGlobalResource
{
public:
@@ -108,7 +105,7 @@ public:
ViewShellBase. If such an object does not yet exist, a new one is
created.
*/
- static ::boost::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase);
+ static ::std::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase);
/** Mark the FrameworkHelper object for the given ViewShellBase as
disposed. A following ReleaseInstance() call will destroy the
@@ -144,7 +141,7 @@ public:
When the ViewShell pointer can not be inferred from the given
reference then an empty pointer is returned.
*/
- static ::boost::shared_ptr<ViewShell> GetViewShell (
+ static ::std::shared_ptr<ViewShell> GetViewShell (
const css::uno::Reference<css::drawing::framework::XView>& rxView);
typedef ::std::function<bool (const css::drawing::framework::ConfigurationChangeEvent&)>
@@ -171,7 +168,7 @@ public:
of the involved objects does not support XUnoTunnel (where
necessary).
*/
- ::boost::shared_ptr<ViewShell> GetViewShell (const OUString& rsPaneURL);
+ ::std::shared_ptr<ViewShell> GetViewShell (const OUString& rsPaneURL);
/** Return a reference to the view that is displayed in the specified
pane. See GetViewShell () for a variant that returns a ViewShell
@@ -303,7 +300,7 @@ public:
private:
typedef ::std::map<
ViewShellBase*,
- ::boost::shared_ptr<FrameworkHelper> > InstanceMap;
+ ::std::shared_ptr<FrameworkHelper> > InstanceMap;
/** The instance map holds (at least) one FrameworkHelper instance for
every ViewShellBase object.
*/
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index d9541a9..5f73ebd 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include <set>
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index 1fb4586..2bd3ea1 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -27,9 +27,8 @@
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <vcl/vclptr.hxx>
+#include <memory>
namespace vcl { class Window; }
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 94a6eb0..80d0ec4 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -31,8 +31,7 @@
#include <osl/mutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace {
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index 9c6bf20..e9ab84c 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/implbase.hxx>
+#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 39ece98..f988b62 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace {
@@ -68,7 +68,7 @@ public:
to the ViewShell object.
*/
ViewShellWrapper (
- ::boost::shared_ptr<ViewShell> pViewShell,
+ ::std::shared_ptr<ViewShell> pViewShell,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XResourceId>& rxViewId,
const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow);
@@ -83,7 +83,7 @@ public:
to obtain a pointer to the wrapped ViewShell object for a given
XView object.
*/
- ::boost::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;}
+ ::std::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;}
// XUnoTunnel
@@ -140,8 +140,8 @@ public:
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::boost::shared_ptr< ViewShell > mpViewShell;
- ::boost::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell;
+ ::std::shared_ptr< ViewShell > mpViewShell;
+ ::std::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell;
const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId > mxViewId;
::com::sun::star::uno::Reference<com::sun::star::awt::XWindow > mxWindow;
};
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index a4bb07f..9d04829 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -31,8 +31,9 @@
#include "pres.hxx"
#include "assclass.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/scoped_ptr.hpp>
class FixedText;
class RadioButton;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index b68ff7e..3931481 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -29,8 +29,8 @@
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
#include "sdxfer.hxx"
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
class SdDrawDocument;
class SfxMedium;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 6d78cfb..5390311 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -90,7 +90,7 @@ public:
/** Add a user data object. When it was added before (and not
removed) then this call is ignored.
*/
- void AddUserData (const ::boost::shared_ptr<UserData>& rpData);
+ void AddUserData (const std::shared_ptr<UserData>& rpData);
/** Return the number of user data objects.
*/
@@ -100,7 +100,7 @@ public:
valid, ie not in the range [0,count) then an empty pointer is
returned.
*/
- ::boost::shared_ptr<UserData> GetUserData (const sal_Int32 nIndex) const;
+ std::shared_ptr<UserData> GetUserData (const sal_Int32 nIndex) const;
protected:
@@ -136,7 +136,7 @@ private:
bool mbPageTransferable : 1;
bool mbPageTransferablePersistent : 1;
bool mbIsUnoObj : 1;
- ::std::vector<boost::shared_ptr<UserData> > maUserData;
+ ::std::vector<std::shared_ptr<UserData> > maUserData;
SdTransferable( const SdTransferable& ) SAL_DELETED_FUNCTION;
SdTransferable& operator=( const SdTransferable& ) SAL_DELETED_FUNCTION;
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 67ce818..5b5f7dc 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -32,7 +32,7 @@
#include <editeng/unoipset.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star {
@@ -214,7 +214,7 @@ private:
bool mbIsInStartup;
SdDrawDocument* mpDoc;
- boost::shared_ptr< PresentationSettingsEx > mxCurrentSettings;
+ std::shared_ptr< PresentationSettingsEx > mxCurrentSettings;
ViewShellBase* mpCurrentViewShellBase;
ViewShellBase* mpFullScreenViewShellBase;
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 4260f07..ebc0b4d 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -29,8 +29,7 @@
#include <sfx2/viewfac.hxx>
#include <sfx2/dockwin.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class PopupMenu;
@@ -86,7 +85,7 @@ public:
private:
::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl;
- ::boost::shared_ptr<TaskPaneShellManager> mpSubShellManager;
+ std::shared_ptr<TaskPaneShellManager> mpSubShellManager;
/** The id of the menu in the menu bar/tool box of the parent docking
window.
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index 67ce409..1c419fee 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -23,8 +23,9 @@
#include <cppuhelper/basemutex.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list