From 09800956191c90035872cbc18cd304fee043c710 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Mon, 15 Jun 2015 17:58:15 +0900 Subject: Replace boost::scoped_array with std::unique_ptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may reduce some degree of dependency on boost. Done by running a script like: git grep -l '#include *.boost/scoped_array.hpp.' \ | xargs sed -i -e 's@#include *.boost/scoped_array.hpp.@#include @' git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \ | xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<\2[]>/' ... and then killing duplicate or unnecessary includes, while changing manually m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx, extensions/source/ole/unoconversionutilities.hxx, and extensions/source/ole/oleobjw.cxx. Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd Reviewed-on: https://gerrit.libreoffice.org/16289 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- slideshow/source/engine/sp_debug.cxx | 1 - slideshow/source/engine/transitions/randomwipe.hxx | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index a94980958199..660df09203b2 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 -#include #include #include #include diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index c7100e733694..bafde24edd1b 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" @@ -39,7 +39,7 @@ public: false: generates a dissolve wipe */ ); virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; private: - ::boost::scoped_array< ::basegfx::B2DPoint > m_positions; + ::std::unique_ptr< ::basegfx::B2DPoint []> m_positions; sal_Int32 m_nElements; ::basegfx::B2DPolygon m_rect; }; -- cgit