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 /lotuswordpro | |
| 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 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/inc/pch/precompiled_lwpft.hxx | 2 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/lwpobjstrm.cxx | 4 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/lwptblformula.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx b/lotuswordpro/inc/pch/precompiled_lwpft.hxx index b2ed5cefbbe9..ae9daf31e3d1 100644 --- a/lotuswordpro/inc/pch/precompiled_lwpft.hxx +++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx @@ -18,7 +18,7 @@ #include "string.h" #include <assert.h> #include <boost/cast.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <boost/scoped_ptr.hpp> #include <cassert> #include <com/sun/star/document/XFilter.hpp> diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 7f61cdfb509d..5fb09b8e68e9 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -60,7 +60,7 @@ #include "lwpobjstrm.hxx" #include "lwptools.hxx" -#include <boost/scoped_array.hpp> +#include <memory> /** * @descr ctor() from LwpSvStream @@ -100,7 +100,7 @@ void LwpObjectStream::Read2Buffer() if( m_bCompressed ) { - boost::scoped_array<sal_uInt8> xCompressBuf(new sal_uInt8[m_nBufSize]); + std::unique_ptr<sal_uInt8[]> xCompressBuf(new sal_uInt8[m_nBufSize]); sal_uInt8* pCompressBuffer = xCompressBuf.get(); memset(pCompressBuffer, 0, m_nBufSize); diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index eda2b45fa55e..b038af6878c1 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -70,7 +70,7 @@ #include "lwptablelayout.hxx" #include <osl/thread.h> #include <rtl/ustrbuf.hxx> -#include <boost/scoped_array.hpp> +#include <memory> LwpFormulaArg::~LwpFormulaArg() { @@ -124,7 +124,7 @@ bool LwpFormulaInfo::ReadText() m_pObjStrm->QuickReadInt16(); //Disk Size sal_uInt16 nStrLen = m_pObjStrm->QuickReadInt16(); - boost::scoped_array<char> pBuf(new char[nStrLen+1]); + std::unique_ptr<char[]> pBuf(new char[nStrLen+1]); m_pObjStrm->QuickRead( pBuf.get(), nStrLen ); *(pBuf.get()+nStrLen)='\0'; OUString aText; |