diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-06-15 17:58:15 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-17 15:50:45 +0000 |
| commit | 09800956191c90035872cbc18cd304fee043c710 (patch) | |
| tree | 9d255ad7629fedc181e8b5cf965a3075a328caaf /sd | |
| parent | 9cc52266bd1a4d01552675f151ce2da8c5210f84 (diff) | |
Replace boost::scoped_array<T> with std::unique_ptr<T[]>
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 <memory>@'
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/assclass.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 0873a0a0d715..3429aeec4660 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -75,7 +75,7 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index e6af0be68110..9613ea63befb 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -60,7 +60,7 @@ #include "FactoryIds.hxx" #include "sdabstdlg.hxx" #include <boost/shared_ptr.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include "slideshow.hxx" #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> @@ -916,7 +916,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer ( // the original stream. mpStream.reset(new SvMemoryStream()); static const sal_Size nBufferSize = 4096; - ::boost::scoped_array<sal_Int8> pBuffer (new sal_Int8[nBufferSize]); + ::std::unique_ptr<sal_Int8[]> pBuffer (new sal_Int8[nBufferSize]); sal_uInt64 nReadPosition(0); bool bLoop (true); diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 6a0709da717a..c7b4cff7d909 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX #include <vector> -#include <boost/scoped_array.hpp> +#include <memory> #include "sddllapi.h" @@ -40,7 +40,7 @@ class SD_DLLPUBLIC Assistent int mnCurrentPage; - boost::scoped_array<bool> mpPageStatus; + std::unique_ptr<bool[]> mpPageStatus; public: |