diff options
Diffstat (limited to 'sc/source')
26 files changed, 66 insertions, 69 deletions
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 6d0c89d8cab5..8b73c472e403 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -45,7 +45,7 @@ #include "tokenarray.hxx" #include "scmatrix.hxx" #include <tokenstringcontext.hxx> -#include <boost/scoped_array.hpp> +#include <memory> using namespace formula; @@ -1090,7 +1090,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB nThisCount = GetTableCount(); SCTAB nOtherCount = rOtherDoc.GetTableCount(); - boost::scoped_array<SCTAB> pOtherTabs(new SCTAB[nThisCount]); + std::unique_ptr<SCTAB[]> pOtherTabs(new SCTAB[nThisCount]); SCTAB nThisTab; // compare tables with identical names @@ -1175,9 +1175,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) aProText.makeStringAndClear(), 3*nThisEndRow ); // 2x FindOrder, 1x here long nProgressStart = 2*nThisEndRow; // start for here - boost::scoped_array<SCCOLROW> pTempRows(new SCCOLROW[nThisEndRow+1]); - boost::scoped_array<SCCOLROW> pOtherRows(new SCCOLROW[nThisEndRow+1]); - boost::scoped_array<SCCOLROW> pOtherCols(new SCCOLROW[nThisEndCol+1]); + std::unique_ptr<SCCOLROW[]> pTempRows(new SCCOLROW[nThisEndRow+1]); + std::unique_ptr<SCCOLROW[]> pOtherRows(new SCCOLROW[nThisEndRow+1]); + std::unique_ptr<SCCOLROW[]> pOtherCols(new SCCOLROW[nThisEndCol+1]); // find inserted/deleted columns/rows: // Two attempts: diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index b636aff4ba2f..1a850c35c8cc 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -78,7 +78,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/field.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #define DET_ARROW_OFFSET 1000 @@ -1250,7 +1250,7 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, size_t nDelCount = 0; Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab ); - boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]); + std::unique_ptr<SdrObject*[]> ppObj(new SdrObject*[nObjCount]); SdrObjListIter aIter( *pPage, IM_FLAT ); SdrObject* pObject = aIter.Next(); @@ -1307,7 +1307,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark ) aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), nTab ); - boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]); + std::unique_ptr<SdrObject*[]> ppObj(new SdrObject*[nObjCount]); SdrObjListIter aIter( *pPage, IM_FLAT ); SdrObject* pObject = aIter.Next(); diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index d93d1f4d7ed3..d1de9702ed40 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -53,7 +53,7 @@ #include <formula/vectortoken.hxx> #include <vector> -#include <boost/scoped_array.hpp> +#include <memory> using ::std::vector; @@ -1306,7 +1306,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, if ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) ) { - boost::scoped_array<SCsROW> pNextRows(new SCsROW[MAXCOL+1]); + std::unique_ptr<SCsROW[]> pNextRows(new SCsROW[MAXCOL+1]); SCCOL i; if ( nMovX > 0 ) // forward diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 5e2d1a469b3f..da2b0ebf19d2 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -71,7 +71,7 @@ #include <vector> #include <boost/checked_delete.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <boost/noncopyable.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <mdds/flat_segment_tree.hpp> @@ -3020,7 +3020,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub) bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam) { bool bValid = true; - boost::scoped_array<SCCOL> pFields(new SCCOL[nCol2-nCol1+1]); + std::unique_ptr<SCCOL[]> pFields(new SCCOL[nCol2-nCol1+1]); OUString aCellStr; SCCOL nCol = nCol1; OSL_ENSURE( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" ); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index ae647d046add..3e33537d69ff 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -90,7 +90,7 @@ const unsigned long __nan[2] = {0xffffffff, 0x7fffffff}; #include <rtl/digest.h> #include <boost/scoped_ptr.hpp> -#include <boost/scoped_array.hpp> +#include <memory> using namespace formula; @@ -1539,7 +1539,7 @@ public: if (dynamic_cast<OpAverage*>(mpCodeGen.get())) { /*average need more reduction kernel for count computing*/ - boost::scoped_array<double> pAllBuffer(new double[2 * w]); + std::unique_ptr<double[]> pAllBuffer(new double[2 * w]); double* resbuf = static_cast<double*>(clEnqueueMapBuffer(kEnv.mpkCmdQueue, mpClmem2, CL_TRUE, CL_MAP_READ, 0, diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index fd8571a600e4..cb64c1aee805 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -52,7 +52,7 @@ #include "funcdesc.hxx" #include <svl/sharedstring.hxx> #include "formulaopt.hxx" -#include <boost/scoped_array.hpp> +#include <memory> using namespace com::sun::star; @@ -490,7 +490,7 @@ void ScUnoAddInCollection::ReadConfiguration() // get argument info - boost::scoped_array<ScAddInArgDesc> pVisibleArgs; + std::unique_ptr<ScAddInArgDesc[]> pVisibleArgs; long nVisibleCount = 0; long nCallerPos = SC_CALLERPOS_NONE; @@ -897,7 +897,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& aDescription = "###"; } - boost::scoped_array<ScAddInArgDesc> pVisibleArgs; + std::unique_ptr<ScAddInArgDesc[]> pVisibleArgs; if ( nVisibleCount > 0 ) { ScAddInArgDesc aDesc; @@ -1087,7 +1087,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface } if (bValid) { - boost::scoped_array<ScAddInArgDesc> pVisibleArgs; + std::unique_ptr<ScAddInArgDesc[]> pVisibleArgs; if ( nVisibleCount > 0 ) { ScAddInArgDesc aDesc; diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index f43f3d9e824a..b1015806bd62 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -30,7 +30,7 @@ #include "sc.hrc" #include <formula/compiler.hrc> #include "miscuno.hxx" -#include <boost/scoped_array.hpp> +#include <memory> using namespace utl; using namespace com::sun::star::uno; @@ -139,7 +139,7 @@ static void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) if ( nCount < USHRT_MAX ) { const sal_Int32* pArray = aSeq.getConstArray(); - boost::scoped_array<sal_uInt16> pUShorts(new sal_uInt16[nCount]); + std::unique_ptr<sal_uInt16[]> pUShorts(new sal_uInt16[nCount]); for (long i=0; i<nCount; i++) pUShorts[i] = (sal_uInt16) pArray[i]; diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index 987194a99af9..9fd30aa20f1e 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -22,7 +22,7 @@ #include "rechead.hxx" #include <osl/diagnose.h> -#include <boost/scoped_array.hpp> +#include <memory> namespace { @@ -180,7 +180,7 @@ void ScChartPositioner::GlueState() const sal_uInt8 nFree = 2; const sal_uInt8 nGlue = 3; sal_uInt8* p; - boost::scoped_array<sal_uInt8> pA(new sal_uInt8[ nCR ]); + std::unique_ptr<sal_uInt8[]> pA(new sal_uInt8[ nCR ]); memset( pA.get(), 0, nCR * sizeof(sal_uInt8) ); SCCOL nCol, nCol1, nCol2; diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index e7ddd3825c72..99340963ef90 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -29,7 +29,7 @@ #include <math.h> #include <string.h> -#include <boost/scoped_array.hpp> +#include <memory> #define SC_CONS_NOTFOUND -1 @@ -499,8 +499,8 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, if (bColByName) ++nStartRow; if (bRowByName) ++nStartCol; OUString aTitle; - boost::scoped_array<SCCOL> pDestCols; - boost::scoped_array<SCROW> pDestRows; + std::unique_ptr<SCCOL[]> pDestCols; + std::unique_ptr<SCROW[]> pDestRows; if (bColByName) { pDestCols.reset(new SCCOL[nCol2-nStartCol+1]); diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index d21476f6e562..be0c53cf5c7b 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -70,7 +70,7 @@ #include "cellvalue.hxx" #include <vector> -#include <boost/scoped_array.hpp> +#include <memory> using ::std::vector; using namespace com::sun::star; @@ -672,7 +672,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt ) if (nObjCount) { size_t nDelCount = 0; - boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]); + std::unique_ptr<SdrObject*[]> ppObj(new SdrObject*[nObjCount]); SdrObjListIter aIter( *pPage, IM_FLAT ); SdrObject* pObject = aIter.Next(); @@ -735,7 +735,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR if (nObjCount) { size_t nDelCount = 0; - boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]); + std::unique_ptr<SdrObject*[]> ppObj(new SdrObject*[nObjCount]); SdrObjListIter aIter( *pPage, IM_FLAT ); SdrObject* pObject = aIter.Next(); @@ -1240,7 +1240,7 @@ bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat ) const size_t nObjCount = pPage->GetObjCount(); if (nObjCount) { - boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]); + std::unique_ptr<SdrObject*[]> ppObj(new SdrObject*[nObjCount]); SdrObjListIter aIter( *pPage, IM_FLAT ); SdrObject* pObject = aIter.Next(); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 7158224e9d68..04d777068baf 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -74,7 +74,7 @@ #include <basic/basmgr.hxx> #include <vbahelper/vbaaccesshelper.hxx> #include <memory> -#include <boost/scoped_array.hpp> +#include <memory> using namespace com::sun::star; using namespace formula; @@ -2599,7 +2599,7 @@ void ScInterpreter::ScExternal() break; case ParamType::PTR_STRING : { - boost::scoped_array<sal_Char> pcErg(new sal_Char[ADDIN_MAXSTRLEN]); + std::unique_ptr<sal_Char[]> pcErg(new sal_Char[ADDIN_MAXSTRLEN]); ppParam[0] = pcErg.get(); pFuncData->Call(ppParam); OUString aUni( pcErg.get(), strlen(pcErg.get()), osl_getThreadTextEncoding() ); 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())); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index e36c39f1e963..2b2ba2162a55 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -30,7 +30,7 @@ #include "subtdlg.hxx" #include "tpsubt.hxx" -#include <boost/scoped_array.hpp> +#include <memory> // Subtotals group tabpage: @@ -197,8 +197,8 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, theSubTotalData = static_cast<const ScSubTotalItem*>(pItem)->GetSubTotalData(); } - boost::scoped_array<ScSubTotalFunc> pFunctions; - boost::scoped_array<SCCOL> pSubTotals; + std::unique_ptr<ScSubTotalFunc[]> pFunctions; + std::unique_ptr<SCCOL[]> pSubTotals; sal_uInt16 nGroup = mpLbGroup->GetSelectEntryPos(); sal_uInt16 nEntryCount = (sal_uInt16)mpLbColumns->GetEntryCount(); sal_uInt16 nCheckCount = mpLbColumns->GetCheckedEntryCount(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index bbb6fd5ab174..ff9f8c2713dd 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -91,7 +91,6 @@ #include <memory> #include <utility> #include <basic/basmgr.hxx> -#include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <set> #include <vector> @@ -5103,7 +5102,7 @@ bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) rDoc.BeginDrawUndo(); // wegen Hoehenanpassung } - boost::scoped_array<ScRangeData*> ppSortArray(new ScRangeData* [ nValidCount ]); + std::unique_ptr<ScRangeData*[]> ppSortArray(new ScRangeData* [ nValidCount ]); sal_uInt16 j = 0; for (ScRangeName::iterator itr = itrLocalBeg; itr != itrLocalEnd; ++itr) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 09aa41a4b34f..edcb21c7dfa2 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <boost/scoped_array.hpp> +#include <memory> using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::lang::XMultiServiceFactory; @@ -285,7 +285,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS if ( nSourceCount == 0 ) return; // no source styles - boost::scoped_array<ScStylePair> pStyles(new ScStylePair[ nSourceCount ]); + std::unique_ptr<ScStylePair[]> pStyles(new ScStylePair[ nSourceCount ]); sal_uInt16 nFound = 0; // first create all new styles diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index dc188dd35d6d..bfe4be618bbc 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -24,7 +24,7 @@ #include "docsh.hxx" #include "crnrdlg.hxx" #include <vcl/msgbox.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #define ERRORBOX(s) ScopedVclPtr<MessageDialog>::Create(this, s)->Execute() #define QUERYBOX(m) ScopedVclPtr<QueryBox>::Create(this,WinBits(WB_YES_NO|WB_DEF_YES),m)->Execute() @@ -375,7 +375,7 @@ void ScColRowNameRangesDlg::UpdateNames() pLbRange->SetEntryData( nPos, reinterpret_cast<void*>(nEntryDataDelim) ); if ( (nCount = xColNameRanges->size()) > 0 ) { - boost::scoped_array<ScRangePair*> ppSortArray(xColNameRanges->CreateNameSortedArray( + std::unique_ptr<ScRangePair*[]> ppSortArray(xColNameRanges->CreateNameSortedArray( nCount, pDoc )); for ( j=0; j < nCount; j++ ) { @@ -418,7 +418,7 @@ void ScColRowNameRangesDlg::UpdateNames() pLbRange->SetEntryData( nPos, reinterpret_cast<void*>(nEntryDataDelim) ); if ( (nCount = xRowNameRanges->size()) > 0 ) { - boost::scoped_array<ScRangePair*> ppSortArray(xRowNameRanges->CreateNameSortedArray( + std::unique_ptr<ScRangePair*[]> ppSortArray(xRowNameRanges->CreateNameSortedArray( nCount, pDoc )); for ( j=0; j < nCount; j++ ) { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 14959c292c80..bc4463e300e5 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -38,7 +38,7 @@ #include "funcdesc.hxx" #include <com/sun/star/document/LinkUpdateModes.hpp> #include <com/sun/star/sheet/FunctionArgument.hpp> -#include <boost/scoped_array.hpp> +#include <memory> using namespace com::sun::star; @@ -501,7 +501,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( sal_uInt16 nCount = (sal_uInt16) std::min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX ); const sal_Int32* pAry = aRecentFunctionIds.getConstArray(); - boost::scoped_array<sal_uInt16> pFuncs(nCount ? new sal_uInt16[nCount] : NULL); + std::unique_ptr<sal_uInt16[]> pFuncs(nCount ? new sal_uInt16[nCount] : NULL); for (sal_uInt16 i=0; i<nCount; i++) pFuncs[i] = (sal_uInt16)pAry[i]; //! auf gueltige Werte testen? diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 247c7e19957c..b7922d608ee6 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -130,7 +130,7 @@ #include "condformatuno.hxx" #include <list> -#include <boost/scoped_array.hpp> +#include <memory> #include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -2688,7 +2688,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); - boost::scoped_array<const SfxItemPropertySimpleEntry*> pEntryArray(new const SfxItemPropertySimpleEntry*[nCount]); + std::unique_ptr<const SfxItemPropertySimpleEntry*[]> pEntryArray(new const SfxItemPropertySimpleEntry*[nCount]); sal_Int32 i; for(i = 0; i < nCount; i++) @@ -2831,7 +2831,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); - boost::scoped_array<const SfxItemPropertySimpleEntry*> pMapArray(new const SfxItemPropertySimpleEntry*[nCount]); + std::unique_ptr<const SfxItemPropertySimpleEntry*[]> pMapArray(new const SfxItemPropertySimpleEntry*[nCount]); sal_Int32 i; for(i = 0; i < nCount; i++) diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 0b826ff680c8..0de088ebe4e9 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -59,7 +59,7 @@ #include <svx/dataaccessdescriptor.hxx> #include <limits> -#include <boost/scoped_array.hpp> +#include <memory> using namespace com::sun::star; @@ -896,7 +896,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources( if (nCount) { const table::CellRangeAddress* pAry = aSources.getConstArray(); - boost::scoped_array<ScArea*> pNew(new ScArea*[nCount]); + std::unique_ptr<ScArea*[]> pNew(new ScArea*[nCount]); sal_uInt16 i; for (i=0; i<nCount; i++) pNew[i] = new ScArea( pAry[i].Sheet, |