summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/excimp8.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx4
-rw-r--r--sc/source/filter/excel/xistream.cxx8
-rw-r--r--sc/source/filter/html/htmlpars.cxx6
-rw-r--r--sc/source/filter/lotus/lotform.cxx4
-rw-r--r--sc/source/filter/lotus/op.cxx8
-rw-r--r--sc/source/filter/qpro/qpro.cxx4
-rw-r--r--sc/source/filter/starcalc/scflt.cxx4
8 files changed, 19 insertions, 21 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index cbcd43c4e6d7..ed8981afe66e 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -64,8 +64,6 @@
#include <unotools/charclass.hxx>
#include <drwlayer.hxx>
-#include <boost/scoped_array.hpp>
-
#include "formulacell.hxx"
#include "document.hxx"
#include "patattr.hxx"
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 42ceb6c20fc2..fa649ee3c89d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -57,7 +57,7 @@
#include <sfx2/app.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <boost/scoped_array.hpp>
+#include <memory>
#define DEBUG_XL_ENCRYPTION 0
@@ -286,7 +286,7 @@ void XclExpStream::CopyFromStream(SvStream& rInStrm, sal_uInt64 const nBytes)
if( nBytesLeft > 0 )
{
const sal_Size nMaxBuffer = 4096;
- boost::scoped_array<sal_uInt8> pBuffer(
+ std::unique_ptr<sal_uInt8[]> pBuffer(
new sal_uInt8[ ::std::min<sal_Size>(nBytesLeft, nMaxBuffer) ]);
bool bValid = true;
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index f5efccef8d7e..a5eda2c50d6b 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -26,7 +26,7 @@
#include "xiroot.hxx"
#include <vector>
-#include <boost/scoped_array.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -725,7 +725,7 @@ sal_Size XclImpStream::CopyToStream( SvStream& rOutStrm, sal_Size nBytes )
if( mbValid && (nBytes > 0) )
{
const sal_Size nMaxBuffer = 4096;
- boost::scoped_array<sal_uInt8> pnBuffer(new sal_uInt8[ ::std::min( nBytes, nMaxBuffer ) ]);
+ std::unique_ptr<sal_uInt8[]> pnBuffer(new sal_uInt8[ ::std::min( nBytes, nMaxBuffer ) ]);
sal_Size nBytesLeft = nBytes;
while( mbValid && (nBytesLeft > 0) )
@@ -814,7 +814,7 @@ OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit )
sal_uInt16 nCharsLeft = nChars;
sal_uInt16 nReadSize;
- boost::scoped_array<sal_Unicode> pcBuffer(new sal_Unicode[ nCharsLeft + 1 ]);
+ std::unique_ptr<sal_Unicode[]> pcBuffer(new sal_Unicode[ nCharsLeft + 1 ]);
while( IsValid() && (nCharsLeft > 0) )
{
@@ -921,7 +921,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars )
OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars )
{
nChars = GetMaxRawReadSize(nChars);
- boost::scoped_array<sal_Char> pcBuffer(new sal_Char[ nChars + 1 ]);
+ std::unique_ptr<sal_Char[]> pcBuffer(new sal_Char[ nChars + 1 ]);
sal_uInt16 nCharsRead = ReadRawData( pcBuffer.get(), nChars );
pcBuffer[ nCharsRead ] = '\0';
OUString aRet( pcBuffer.get(), strlen(pcBuffer.get()), mrRoot.GetTextEncoding() );
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index ae0ce8280b5f..32d5a1da12c5 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -68,7 +68,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <boost/scoped_array.hpp>
+#include <memory>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -686,9 +686,9 @@ void ScHTMLLayoutParser::SetWidths()
// Why actually no pE?
if ( nFirstTableCell < maList.size() )
{
- boost::scoped_array<sal_uInt16> pOffsets(new sal_uInt16[ nColsPerRow+1 ]);
+ std::unique_ptr<sal_uInt16[]> pOffsets(new sal_uInt16[ nColsPerRow+1 ]);
memset( pOffsets.get(), 0, (nColsPerRow+1) * sizeof(sal_uInt16) );
- boost::scoped_array<sal_uInt16> pWidths(new sal_uInt16[ nColsPerRow ]);
+ std::unique_ptr<sal_uInt16[]> pWidths(new sal_uInt16[ nColsPerRow ]);
memset( pWidths.get(), 0, nColsPerRow * sizeof(sal_uInt16) );
pOffsets[0] = nColOffsetStart;
for ( size_t i = nFirstTableCell, nListSize = maList.size(); i < nListSize; ++i )
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index d08715e5fc13..9ec3a5030d47 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -29,7 +29,7 @@
#include <math.h>
#include <comphelper/string.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
static const sal_Char* GetAddInName( const sal_uInt8 nIndex );
@@ -600,7 +600,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
if( nStrLen )
{
- boost::scoped_array<sal_Char> p(new (::std::nothrow) sal_Char[ nStrLen + 1 ]);
+ std::unique_ptr<sal_Char[]> p(new (::std::nothrow) sal_Char[ nStrLen + 1 ]);
if (p)
{
aIn.Read( p.get(), nStrLen );
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index fba14cd67f73..4cd5df25f558 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -50,7 +50,7 @@
#include <vector>
#include <map>
-#include <boost/scoped_array.hpp>
+#include <memory>
static sal_uInt16 nDefWidth = ( sal_uInt16 ) ( TWIPS_PER_CHAR * 10 );
@@ -117,7 +117,7 @@ void OP_Label(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= (n > 5) ? 5 : n;
- boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]);
+ std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
r.Read( pText.get(), n );
pText[n] = 0;
@@ -356,7 +356,7 @@ void OP_Label123(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= (n > 4) ? 4 : n;
- boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]);
+ std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
r.Read( pText.get(), n );
pText[ n ] = 0;
@@ -437,7 +437,7 @@ void OP_Note123(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= (n > 4) ? 4 : n;
- boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]);
+ std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
r.Read( pText.get(), n );
pText[ n ] = 0;
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 442a0adaf17c..8195b82efb89 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -33,7 +33,7 @@
#include "formulacell.hxx"
#include "biff.hxx"
#include <tools/stream.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pStyle )
{
@@ -223,7 +223,7 @@ bool ScQProReader::nextRecord()
void ScQProReader::readString( OUString &rString, sal_uInt16 nLength )
{
- boost::scoped_array<sal_Char> pText(new sal_Char[ nLength + 1 ]);
+ std::unique_ptr<sal_Char[]> pText(new sal_Char[ nLength + 1 ]);
nLength = mpStream->Read(pText.get(), nLength);
pText[ nLength ] = 0;
rString = OUString( pText.get(), strlen(pText.get()), mpStream->GetStreamCharSet() );
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index fbdbd01885d9..db6680129eca 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -67,7 +67,7 @@
#include "tabprotection.hxx"
#include "fprogressbar.hxx"
-#include <boost/scoped_array.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -1661,7 +1661,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
nNoteLen = nAvailable;
if (nNoteLen != 0)
{
- boost::scoped_array<sal_Char> xNote(new sal_Char[nNoteLen+1]);
+ std::unique_ptr<sal_Char[]> xNote(new sal_Char[nNoteLen+1]);
nNoteLen = rStream.Read(xNote.get(), nNoteLen);
xNote[nNoteLen] = 0;
OUString aNoteText( SC10TOSTRING(xNote.get()));
generated by cgit (git 2.34.1) at 2024-07-23 06:45:01 +0000