slideshow/inc/pch/precompiled_slideshow.hxx | 1 -
slideshow/source/engine/effectrewinder.hxx | 3 +--
slideshow/source/engine/shapes/shapeimporter.cxx | 4 ++--
slideshow/source/engine/shapes/viewmediashape.hxx | 1 -
slideshow/source/engine/sp_debug.cxx | 1 -
slideshow/source/inc/eventmultiplexer.hxx | 4 ++--
slideshow/source/inc/screenupdater.hxx | 4 ++--
7 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 64144c28fef385625b0edc95e1aceed82e028d40
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Sep 18 16:55:15 2015 +0100
boost->std
Change-Id: I787ff19fd41d5ecee56efa1aa7ee539f46650703
Reviewed-on: https://gerrit.libreoffice.org/18703
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx
b/slideshow/inc/pch/precompiled_slideshow.hxx
index e007ffb..07318fb 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -44,7 +44,6 @@
#include <boost/mem_fn.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp>
#include <boost/tuple/tuple.hpp>
diff --git a/slideshow/source/engine/effectrewinder.hxx
b/slideshow/source/engine/effectrewinder.hxx
index 7132376..97975d5 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -28,9 +28,8 @@
#include <com/sun/star/presentation/XSlideShow.hpp>
-#include <boost/scoped_ptr.hpp>
-
#include <functional>
+#include <memory>
#include <vector>
namespace slideshow { namespace internal {
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx
b/slideshow/source/engine/shapes/shapeimporter.cxx
index e3c70ff..c92e27a 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -52,7 +52,7 @@
#include "slideshowcontext.hxx"
#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -116,7 +116,7 @@ bool importShapeGraphic(
// no special string found, graphic must be
// external. Load via GraphicIm porter
INetURLObject aTmp( aURL );
- boost::scoped_ptr<SvStream> pGraphicStream(
+ std::unique_ptr<SvStream> pGraphicStream(
utl::UcbStreamHelper::CreateStream(
aTmp.GetMainURL( INetURLObject::NO_DECODE ),
StreamMode::READ ) );
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx
b/slideshow/source/engine/shapes/viewmediashape.hxx
index 7b73930..dc6d284 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -25,7 +25,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <vcl/vclptr.hxx>
#include "viewlayer.hxx"
diff --git a/slideshow/source/engine/sp_debug.cxx
b/slideshow/source/engine/sp_debug.cxx
index 2efb80e..0a68607 100644
--- a/slideshow/source/engine/sp_debug.cxx
+++ b/slideshow/source/engine/sp_debug.cxx
@@ -32,7 +32,6 @@
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
#include <boost/assert.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/detail/lightweight_mutex.hpp>
#include <canvas/debug.hxx>
diff --git a/slideshow/source/inc/eventmultiplexer.hxx
b/slideshow/source/inc/eventmultiplexer.hxx
index 1dde126..cd70cd9 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -27,7 +27,7 @@
#include "vieweventhandler.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -727,7 +727,7 @@ public:
bool notifyHyperlinkClicked( OUString const& hyperLink );
private:
- boost::scoped_ptr<EventMultiplexerImpl> mpImpl;
+ std::unique_ptr<EventMultiplexerImpl> mpImpl;
};
} // namespace internal
diff --git a/slideshow/source/inc/screenupdater.hxx
b/slideshow/source/inc/screenupdater.hxx
index ade4096..2fbf426 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -23,7 +23,7 @@
#include "viewupdate.hxx"
#include "unoviewcontainer.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
/* Definition of ScreenUpdater class */
@@ -128,7 +128,7 @@ namespace slideshow
private:
struct ImplScreenUpdater;
- boost::scoped_ptr<ImplScreenUpdater> mpImpl;
+ std::unique_ptr<ImplScreenUpdater> mpImpl;
};
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
