summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/pch/precompiled_msword.hxx2
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/pch/precompiled_swui.hxx2
-rw-r--r--sw/source/core/doc/doccomp.cxx6
-rw-r--r--sw/source/core/table/swnewtable.cxx6
-rw-r--r--sw/source/filter/ascii/parasc.cxx4
-rw-r--r--sw/source/filter/basflt/iodetect.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx5
-rw-r--r--sw/source/ui/envelp/envfmt.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx4
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx4
-rw-r--r--sw/source/uibase/table/swtablerep.cxx4
13 files changed, 26 insertions, 25 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 390d4493be1f..1d3b9c1b8c5e 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -19,7 +19,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basic/basmgr.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 44aa8cc86805..f14d1c9f54f9 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -50,7 +50,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_set.hpp>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index e03b3e9accd5..473c61c9abd3 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -17,7 +17,7 @@
#include <algorithm>
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/awt/PosSize.hpp>
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index fc01911fd83e..ad472e8ed2a3 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -48,7 +48,7 @@
#include <list>
#include <cctype>
-#include <boost/scoped_array.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -1583,8 +1583,8 @@ void CompareData::CheckForChangesInLine( const CompareData& rData,
rStt, rEnd );
int nMinLen = std::min( aCmp.GetLen1(), aCmp.GetLen2() );
- boost::scoped_array<int> pLcsDst(new int[ nMinLen ]);
- boost::scoped_array<int> pLcsSrc(new int[ nMinLen ]);
+ std::unique_ptr<int[]> pLcsDst(new int[ nMinLen ]);
+ std::unique_ptr<int[]> pLcsSrc(new int[ nMinLen ]);
FastCommonSubseq subseq( aCmp );
int nLcsLen = subseq.Find( pLcsDst.get(), pLcsSrc.get() );
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index c52209f895fd..152e35854801 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -35,7 +35,7 @@
#include <vector>
#include <set>
#include <list>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include <editeng/boxitem.hxx>
#include <editeng/protitem.hxx>
@@ -1097,10 +1097,10 @@ static void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt,
return;
if( nCnt > nCount )
nCnt = nCount;
- ::boost::scoped_array<size_t> const pSplitIdx(new size_t[nCnt]);
+ ::std::unique_ptr<size_t[]> const pSplitIdx(new size_t[nCnt]);
if( bSameHeight )
{
- ::boost::scoped_array<SwTwips> const pHeights(new SwTwips[nCount]);
+ ::std::unique_ptr<SwTwips[]> const pHeights(new SwTwips[nCount]);
SwTwips nHeight = 0;
for (size_t i = 0; i < nCount; ++i)
{
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");
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 906825a5a755..ed9e52e9d397 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -44,7 +44,7 @@
#include <vector>
#include <algorithm>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
#include "swabstdlg.hxx"
@@ -370,7 +370,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool bSende
std::vector<sal_uInt16> pVec = ::lcl_convertRangesToList(pRanges);
std::vector<sal_uInt16> aVec = ::lcl_convertRangesToList(aRanges);
pVec.insert(pVec.end(), aVec.begin(), aVec.end());
- boost::scoped_array<sal_uInt16> pNewRanges(::lcl_convertListToRanges(pVec));
+ std::unique_ptr<sal_uInt16[]> pNewRanges(::lcl_convertListToRanges(pVec));
pAddrSet = new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(),
pNewRanges.get());
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index cdebce3d2171..fb697963a42c 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -128,7 +128,7 @@
#include <vcl/GraphicNativeMetadata.hxx>
#include <comphelper/lok.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
extern bool g_bFrmDrag;
@@ -3706,7 +3706,7 @@ bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding));
const OString aName(OUStringToOString(sName, eEncoding));
- boost::scoped_array<sal_Char> pMem(new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ]);
+ std::unique_ptr<sal_Char[]> pMem(new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ]);
sal_Int32 nLen = aAppNm.getLength();
memcpy( pMem.get(), aAppNm.getStr(), nLen );
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 665e815f44b4..22293eb4c5d3 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -151,7 +151,7 @@
#include "../../core/inc/rootfrm.hxx"
#include <unotools/syslocaleoptions.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <boost/scoped_ptr.hpp>
using namespace sw::mark;
@@ -5479,7 +5479,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
}
else
{
- boost::scoped_array<Rectangle> aRects(new Rectangle[ nSize ]);
+ std::unique_ptr<Rectangle[]> aRects(new Rectangle[ nSize ]);
int nRectIndex = 0;
for ( SwIndex nIndex = rStart.nContent; nIndex < rEnd.nContent; ++nIndex )
{
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index 07cbad16a25c..5324aa866464 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -51,7 +51,7 @@
#include <cmdid.h>
#include <table.hrc>
#include "swtablerep.hxx"
-#include <boost/scoped_array.hpp>
+#include <memory>
SwTableRep::SwTableRep( const SwTabCols& rTabCol )
:
@@ -110,7 +110,7 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
{
// The invisible separators are taken from the old TabCols,
// the visible coming from pTColumns.
- boost::scoped_array<TColumn> pOldTColumns(new TColumn[nAllCols + 1]);
+ std::unique_ptr<TColumn[]> pOldTColumns(new TColumn[nAllCols + 1]);
SwTwips nStart = 0;
for ( sal_uInt16 i = 0; i < nAllCols - 1; ++i )
{
generated by cgit (git 2.34.1) at 2024-07-22 22:54:04 +0000