diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 202bad3582af..a43a7f60e38f 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/scoped_array.hpp> +#include <memory> #include <tools/stream.hxx> #include <hintids.hxx> #include <rtl/tencinfo.h> @@ -293,7 +293,7 @@ sal_uLong SwASCIIParser::ReadChars() bSwapUnicode = rInput.IsEndianSwap(); } - boost::scoped_array<sal_Unicode> aWork; + std::unique_ptr<sal_Unicode[]> aWork; sal_uLong nArrOffset = 0; do { diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 543dd4b8c592..a0a656931fb6 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -18,7 +18,7 @@ */ #include <iodetect.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #include <osl/endian.h> #include <sot/storage.hxx> #include <svtools/parhtml.hxx> @@ -268,7 +268,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, if (eCharSet != RTL_TEXTENCODING_DONTKNOW) { - boost::scoped_array<sal_Unicode> aWork(new sal_Unicode[rLen+1]); + std::unique_ptr<sal_Unicode[]> aWork(new sal_Unicode[rLen+1]); sal_Unicode *pNewBuf = aWork.get(); sal_Size nNewLen; if (eCharSet != RTL_TEXTENCODING_UCS2) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 0ed89171b3f1..b351a574f14a 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -21,7 +21,7 @@ #include <functional> #include <boost/noncopyable.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <com/sun/star/i18n/ScriptType.hpp> #include <rtl/tencinfo.h> @@ -80,7 +80,7 @@ using namespace nsHdFtFlags; /// For the output of sections. struct WW8_PdAttrDesc { - ::boost::scoped_array<sal_uInt8> m_pData; + ::std::unique_ptr<sal_uInt8[]> m_pData; sal_uInt16 m_nLen; WW8_FC m_nSepxFcPos; WW8_PdAttrDesc() : m_nLen(0), m_nSepxFcPos(0xffffffff) /*default: none*/ diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 9c4e50a615f0..6d60d9853619 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -94,6 +94,7 @@ #include <svx/hlnkitem.hxx> #include <svl/whiter.hxx> #include <o3tl/enumrange.hxx> +#include <memory> using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -417,7 +418,7 @@ SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) return 0; sal_uInt16 nCount = SVBT16ToShort( aPoly.aBits1 ) >> 1 & 0x7fff; - boost::scoped_array<SVBT16> xP(new SVBT16[nCount * 2]); + std::unique_ptr<SVBT16[]> xP(new SVBT16[nCount * 2]); bool bCouldRead = checkRead(*m_pStrm, xP.get(), nCount * 4); // Punkte einlesen OSL_ENSURE(bCouldRead, "Short PolyLine header"); @@ -1203,7 +1204,7 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) return 0; sal_uInt16 nCount = SVBT16ToShort( aCallB.dpPolyLine.aBits1 ) >> 1 & 0x7fff; - boost::scoped_array<SVBT16> xP(new SVBT16[nCount * 2]); + std::unique_ptr<SVBT16[]> xP(new SVBT16[nCount * 2]); bool bCouldRead = checkRead(*m_pStrm, xP.get(), nCount * 4); // Punkte einlesen OSL_ENSURE(bCouldRead, "Short CaptionBox header"); |