summaryrefslogtreecommitdiff
path: root/sd/source/ui/animations
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 15:41:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 17:01:14 +0100
commit6f495a195b794257e8b1302d384148be43c04cee (patch)
treec0ef4b8eeed1b1bb2e8da0deffac0a74b2eb5467 /sd/source/ui/animations
parent74efa4f0e87e2b5fe7a577fa4673cb947c947c74 (diff)
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx8
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 032273a1a8b5..bb5e9890a61c 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 58892a0f9607..851ea6756d0f 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 7b626e2e23a3..9081eafde016 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 4bc66133af1d..c527ff52169a 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 )
{