summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r--sc/source/filter/excel/read.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xichart.cxx12
-rw-r--r--sc/source/filter/excel/xicontent.cxx16
4 files changed, 36 insertions, 0 deletions
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 6d7c36c56ecd..7900d85de7ae 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -95,8 +95,10 @@ FltError ImportExcel::Read( void )
OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
@@ -821,8 +823,10 @@ FltError ImportExcel8::Read( void )
FltError eLastErr = eERR_OK;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 528408ce3d35..15aaee4d5317 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -675,7 +675,9 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_CONDFMT, *xScTokArr );
if( bFmla2 )
@@ -1027,7 +1029,9 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
// formulas
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// first formula
xScTokArr.reset( pValData->CreateTokenArry( 0 ) );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index f2ffc76aca3f..d5b357f24769 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2074,7 +2074,9 @@ void XclImpChSeries::ReadChSerTrendLine( XclImpStream& rStrm )
void XclImpChSeries::ReadChSerErrorBar( XclImpStream& rStrm )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChSerErrorBar> pErrorBar(new XclImpChSerErrorBar(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pErrorBar->ReadChSerErrorBar(rStrm);
sal_uInt8 nBarType = pErrorBar->GetBarType();
maErrorBars.insert(nBarType, pErrorBar);
@@ -2775,13 +2777,17 @@ void XclImpChTypeGroup::ReadChDropBar( XclImpStream& rStrm )
{
if (maDropBars.find(EXC_CHDROPBAR_UP) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_UP));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_UP, p);
}
else if(maDropBars.find(EXC_CHDROPBAR_DOWN) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_DOWN));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_DOWN, p);
}
@@ -3817,7 +3823,9 @@ void XclImpChChart::ReadChDefaultText( XclImpStream& rStrm )
sal_uInt16 nTextId = rStrm.ReaduInt16();
if( (rStrm.GetNextRecId() == EXC_ID_CHTEXT) && rStrm.StartNextRecord() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChText> pText(new XclImpChText(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pText->ReadRecordGroup(rStrm);
maDefTexts.insert(nTextId, pText);
}
@@ -3967,12 +3975,16 @@ void XclImpChChart::Convert( const Reference<XChartDocument>& xChartDoc,
ScDocument& rDoc = GetRoot().GetDoc();
if( ScChartListenerCollection* pChartCollection = rDoc.GetChartListenerCollection() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::std::vector< ScTokenRef > > xRefTokens( new ::std::vector< ScTokenRef > );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for( XclImpChSeriesVec::const_iterator aIt = maSeries.begin(), aEnd = maSeries.end(); aIt != aEnd; ++aIt )
(*aIt)->FillAllSourceLinks( *xRefTokens );
if( !xRefTokens->empty() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScChartListener > xListener( new ScChartListener( rObjName, &rDoc, xRefTokens.release() ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xListener->SetUsed( true );
xListener->StartListeningTo();
pChartCollection->Insert( xListener.release() );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 243d6ad87443..e4f25cfe4257 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -206,7 +206,9 @@ void lclInsertUrl( const XclImpRoot& rRoot, const String& rUrl, SCCOL nScCol, SC
rEE.QuickSetAttribs( aItemSet, ESelection( 0, 0, 0xFFFF, 0 ) );
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > xTextObj( rEE.CreateTextObject() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScEditCell* pCell = new ScEditCell( xTextObj.get(), &rDoc, rEE.GetEditTextObjectPool() );
rDoc.PutCell( aScPos, pCell );
@@ -248,9 +250,11 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
OSL_ENSURE( aGuid == XclTools::maGuidStdLink, "XclImpHyperlink::ReadEmbeddedData - unknown header GUID" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< String > xLongName; // link / file name
::std::auto_ptr< String > xShortName; // 8.3-representation of file name
::std::auto_ptr< String > xTextMark; // text mark
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// description (ignore)
if( ::get_flag( nFlags, EXC_HLINK_DESCR ) )
@@ -600,7 +604,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
const ScAddress& rPos = maRanges.front()->aStart; // assured above that maRanges is not empty
ExcelToSc& rFmlaConv = GetOldFmlaConverter();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize1 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -611,7 +617,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
xTokArr1.reset( pTokArr->Clone() );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > pTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize2 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -743,7 +751,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
// first formula
// string list is single tStr token with NUL separators -> replace them with LF
rStrm.SetNulSubstChar( '\n' );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -758,7 +768,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
rStrm.SetNulSubstChar(); // back to default
// second formula
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -1170,7 +1182,9 @@ void XclImpDocProtectBuffer::Apply() const
// If neither is set then the document is not protected at all.
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDocProtection> pProtect(new ScDocProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
if (mnPassHash)
@@ -1273,7 +1287,9 @@ void XclImpSheetProtectBuffer::Apply() const
// This sheet is (for whatever reason) not protected.
continue;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
// 16-bit hash password
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 08:31:51 +0000