diff options
Diffstat (limited to 'sc')
52 files changed, 272 insertions, 1 deletions
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 705a7c328c6e..a670f10d3d35 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -448,9 +448,11 @@ private: sal_Bool m_bIncludeHiddenCells; // internals + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< ::std::vector<ScTokenRef> > TokenListPtr; typedef ::std::auto_ptr< ::std::vector<sal_uInt32> > RangeIndexMapPtr; typedef ::std::auto_ptr<ExternalRefListener> ExtRefListenerPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP sal_Int64 m_nObjectId; ScDocument* m_pDocument; @@ -460,7 +462,9 @@ private: com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; SfxItemPropertySet m_aPropSet; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<HiddenRangeListener> m_pHiddenListener; + SAL_WNODEPRECATED_DECLARATIONS_POP ScLinkListener* m_pValueListener; XModifyListenerArr_Impl m_aValueListeners; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 0458332d1e3d..e17c5c3901eb 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -62,7 +62,9 @@ class ScDPSaveMember { private: ::rtl::OUString aName; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. + SAL_WNODEPRECATED_DECLARATIONS_POP sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; @@ -106,8 +108,10 @@ class SC_DLLPUBLIC ScDPSaveDimension private: ::rtl::OUString aName; ::rtl::OUString* pSelectedPage; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP bool bIsDataLayout; bool bDupFlag; sal_uInt16 nOrientation; @@ -251,7 +255,9 @@ private: * created. */ bool mbDimensionMembersBuilt; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpGrandTotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP public: SC_DLLPUBLIC ScDPSaveData(); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c19bdfaf426f..0519bd20b1ac 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -133,7 +133,9 @@ private: std::vector<ScDPLevel*> aRowLevelList; sal_Bool bResultOverflow; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpGrandTotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP void CreateRes_Impl(); void FillMemberResults(); @@ -337,8 +339,10 @@ private: long nUsedHier; sal_uInt16 nFunction; // enum GeneralFunction String aName; // if empty, take from source + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" @@ -748,7 +752,9 @@ private: SCROW mnDataId; // String aCaption; // visible name (changeable by user) + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; + SAL_WNODEPRECATED_DECLARATIONS_POP sal_Int32 nPosition; // manual sorting sal_Bool bVisible; diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 15ed5ba554dc..b8c8180c4cec 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -176,10 +176,14 @@ public: class ScAccessibilityEditSource : public SvxEditSource { private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > mpAccessibleTextData; + SAL_WNODEPRECATED_DECLARATIONS_POP public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScAccessibilityEditSource(); virtual SvxEditSource* Clone() const; diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index 1c6b36c57950..667e80c20e1f 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -86,7 +86,9 @@ public: SCROW findLastNotOf(bool bValue) const; private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; class ScFlatBoolColSegments @@ -109,7 +111,9 @@ public: void insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipStartBoundary); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; class ScFlatUInt16SegmentsImpl; @@ -156,7 +160,9 @@ public: void enableTreeSearch(bool bEnable); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatUInt16SegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; #endif diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index e213e797a76f..8f68d0762db4 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -150,7 +150,9 @@ public: class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj { public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler); + SAL_WNODEPRECATED_DECLARATIONS_POP }; // ============================================================================ diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 126e220c0303..ff18497c72e1 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2425,7 +2425,9 @@ const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange& rRange) // already cached. return itr->second; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc)); + SAL_WNODEPRECATED_DECLARATIONS_POP pCache->InitFromDoc(mpDoc, rRange); const ScDPCache* p = pCache.get(); maCaches.insert(rRange, pCache); @@ -2448,7 +2450,9 @@ const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString& rName, con // already cached. return itr->second; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc)); + SAL_WNODEPRECATED_DECLARATIONS_POP pCache->InitFromDoc(mpDoc, rRange); const ScDPCache* p = pCache.get(); maCaches.insert(rName, pCache); @@ -2533,7 +2537,9 @@ const ScDPCache* ScDPCollection::DBCaches::getCache(sal_Int32 nSdbType, const OU return NULL; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc)); + SAL_WNODEPRECATED_DECLARATIONS_POP SvNumberFormatter aFormat(mpDoc->GetServiceManager(), ScGlobal::eLnge); pCache->InitFromDataBase(xRowSet, *aFormat.GetNullDate()); ::comphelper::disposeComponent(xRowSet); diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 0c46a3504a91..fb9f1e1114f5 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -391,7 +391,9 @@ ScFunctionList::ScFunctionList() : for (sal_uInt16 k = 0; k < SAL_N_ELEMENTS(nDescBlock); ++k) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP // Browse for all possible OpCodes. This is not the fastest method, but // otherwise the sub resources within the resource blocks and the // resource blocks themselfs would had to be ordered according to @@ -784,7 +786,9 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula:: return ::rtl::OUString(); } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP return ResId::toString(ScResId(static_cast<sal_uInt16>(_nCategoryNumber))); } diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 43dfd04dc70b..b6144ab119ab 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -801,7 +801,9 @@ bool ScValidationData::FillSelectionList( TypedScStrCollection& rStrColl, const if( HasSelectionList() ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP // *** try if formula is a string list *** @@ -854,7 +856,9 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c 5) A formula resulting in a cell/range reference or matrix/array. */ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP // *** try if formula is a string list *** diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index f4881f61da25..609fc52f7bb0 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -726,7 +726,9 @@ ScDBData* ScDBCollection::NamedDBs::findByUpperName(const ::rtl::OUString& rName bool ScDBCollection::NamedDBs::insert(ScDBData* p) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBData> pData(p); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pData->GetIndex()) pData->SetIndex(mrParent.nEntryIndex++); @@ -806,9 +808,11 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange) { // Insert a new db data. They all have identical names. rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pNew(new ScDBData( aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row(), true, false)); + SAL_WNODEPRECATED_DECLARATIONS_POP pData = pNew.get(); maDBs.push_back(pNew); } @@ -818,7 +822,9 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange) void ScDBCollection::AnonDBs::insert(ScDBData* p) { rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pNew(p); + SAL_WNODEPRECATED_DECLARATIONS_POP maDBs.push_back(pNew); } diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 8257afad926c..8f5328386483 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6256,7 +6256,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) if ( GetByte() == 3 ) { // First, get the query criteria range. + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDBDoubleRef() ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pQueryRef.get()) return NULL; @@ -6314,7 +6316,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) SetError( errIllegalParameter ); } + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBRangeBase> pDBRef( PopDBDoubleRef() ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (nGlobalError || !pDBRef.get()) return NULL; @@ -6346,7 +6350,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) if (!ValidCol(nField)) return NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pParam.get()) { @@ -6387,7 +6393,9 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) bool bNull = true; sal_uLong nCount = 0; bool bMissingField = false; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pQueryParam.get()) { if (!pQueryParam->IsValidFieldIndex()) @@ -6456,7 +6464,9 @@ void ScInterpreter::ScDBCount() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" ); bool bMissingField = true; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pQueryParam.get()) { sal_uLong nCount = 0; @@ -6516,7 +6526,9 @@ void ScInterpreter::ScDBCount2() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" ); bool bMissingField = true; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pQueryParam.get()) { if (!pQueryParam->IsValidFieldIndex()) @@ -6582,7 +6594,9 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) rValCount = 0.0; double fSum = 0.0; bool bMissingField = false; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pQueryParam.get()) { if (!pQueryParam->IsValidFieldIndex()) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 5a3e81dcd9fe..261403e6ed90 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2442,7 +2442,9 @@ void ScInterpreter::ScDBGet() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" ); bool bMissingField = false; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) ); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pQueryParam.get()) { // Failed to create query param. diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 6ba9c26628ea..d3ded0cef664 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -186,7 +186,9 @@ void ScRangeData::CompileRangeData( const String& rSymbol, bool bSetError ) if (bSetError) aComp.SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_NO_BREAK); ScTokenArray* pNewCode = aComp.CompileString( rSymbol ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted + SAL_WNODEPRECATED_DECLARATIONS_POP pCode = pNewCode; if( !pCode->GetCodeError() ) { @@ -280,7 +282,9 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eG void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() ); + SAL_WNODEPRECATED_DECLARATIONS_POP ScCompiler aComp( pDoc, rPos, *pTemp.get()); aComp.SetGrammar(eGrammar); aComp.MoveRelWrap(GetMaxCol(), GetMaxRow()); @@ -413,7 +417,9 @@ bool ScRangeData::IsReference( ScRange& rRange, const ScAddress& rPos ) const { if ( (eType & ( RT_ABSAREA | RT_REFAREA | RT_ABSPOS ) ) && pCode ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() ); + SAL_WNODEPRECATED_DECLARATIONS_POP ScCompiler aComp( pDoc, rPos, *pTemp); aComp.SetGrammar(pDoc->GetGrammar()); aComp.MoveRelWrap(MAXCOL, MAXROW); 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 diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index d85d83fcfeb0..ec64e46d2c78 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -90,7 +90,9 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla if (itrElem == maElemProps.end()) { // new element + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<NamePropsType> p(new NamePropsType); + SAL_WNODEPRECATED_DECLARATIONS_POP std::pair<ElemsType::iterator, bool> r = maElemProps.insert(aElem, p); if (!r.second) // insertion failed. @@ -174,7 +176,9 @@ void ScHTMLStyles::insertProp( if (itr == rStore.end()) { // new element + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<PropsType> p(new PropsType); + SAL_WNODEPRECATED_DECLARATIONS_POP std::pair<NamePropsType::iterator, bool> r = rStore.insert(aName, p); if (!r.second) // insertion failed. @@ -2182,7 +2186,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) { // read needed options from the <td> tag ScHTMLSize aSpanSize( 1, 1 ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> pValStr, pNumStr; + SAL_WNODEPRECATED_DECLARATIONS_POP const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions(); HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; @@ -2413,6 +2419,7 @@ void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo ) mxCurrEntry->aSel = rInfo.aSelection; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rxEntry ) { // HTML entry list does not own the entries @@ -2420,7 +2427,9 @@ void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryP // mrEEParseList (reference to member of ScEEParser) owns the entries mrEEParseList.push_back( rxEntry.release() ); } +SAL_WNODEPRECATED_DECLARATIONS_POP +SAL_WNODEPRECATED_DECLARATIONS_PUSH bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry ) { bool bPushed = false; @@ -2448,6 +2457,7 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry ) } return bPushed; } +SAL_WNODEPRECATED_DECLARATIONS_POP bool ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell ) { diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 55f33b6033e4..df7c09d7fd63 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -56,8 +56,10 @@ private: virtual SvStream* ImplQueryPictureStream(); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::utl::TempFile > mxPicTempFile; ::std::auto_ptr< SvStream > mxPicStrm; + SAL_WNODEPRECATED_DECLARATIONS_POP }; // ============================================================================ diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 1e1b9f39b4a1..10b245f61e66 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -70,7 +70,9 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< XclExpSstImpl > XclExpSstImplPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP XclExpSstImplPtr mxImpl; }; @@ -128,8 +130,10 @@ private: virtual void WriteBody( XclExpStream& rStrm ); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< String > StringPtr; typedef ::std::auto_ptr< SvStream > SvStreamPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP ScAddress maScPos; /// Position of the hyperlink. StringPtr mxRepr; /// Cell representation text. @@ -183,7 +187,9 @@ private: virtual void WriteBody( XclExpStream& rStrm ); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< XclExpCFImpl > XclExpCFImplPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP XclExpCFImplPtr mxImpl; }; diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 6f43a38d02e6..c978e774bef4 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -68,7 +68,9 @@ public: void Progress(); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< ScfProgressBar > ScfProgressBarPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP ScfProgressBarPtr mxProgress; /// Progress bar implementation. ScfProgressBar* mpSubProgress; /// Current sub progress bar. diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 560e18a19a2b..f162f8f7f18a 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -637,7 +637,9 @@ struct XclPTFieldExtInfo sal_uInt16 mnSortField; /// Index to data field sorting bases on. sal_uInt16 mnShowField; /// Index to data field AutoShow bases on. sal_uInt16 mnNumFmt; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpFieldTotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP explicit XclPTFieldExtInfo(); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index c12a421f741b..12153486dade 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -94,7 +94,9 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, if (!pCollection) return; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pRefTokens(new vector<ScTokenRef>); + SAL_WNODEPRECATED_DECLARATIONS_POP const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); ScRefTokenHelper::compileRangeRepresentation( *pRefTokens, aRangeStr, pDoc, cSep, formula::FormulaGrammar::GRAM_ENGLISH); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 44430d5ce758..9fe2a64c5dea 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -275,7 +275,9 @@ void ScXMLBodyContext::EndElement() // #i37959# handle document protection after the sheet settings if (bProtected) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> pProtection(new ScDocProtection); + SAL_WNODEPRECATED_DECLARATIONS_POP pProtection->setProtected(true); uno::Sequence<sal_Int8> aPass; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index d79dbed730e0..19066e0c5178 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -297,8 +297,10 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) if (!ScRangeStringConverter::GetRangeFromString(aRange, sRangeAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset)) return NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData( new ScDBData(rName, aRange.aStart.Tab(), aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row())); + SAL_WNODEPRECATED_DECLARATIONS_POP pData->SetAutoFilter(bAutoFilter); pData->SetKeepFmt(bKeepFormats); @@ -480,7 +482,9 @@ void ScXMLDatabaseRangeContext::EndElement() if (meRangeType == ScDBCollection::SheetAnonymous) { OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pData.get()) { @@ -495,7 +499,9 @@ void ScXMLDatabaseRangeContext::EndElement() else if (meRangeType == ScDBCollection::GlobalAnonymous) { OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pData.get()) { @@ -511,7 +517,9 @@ void ScXMLDatabaseRangeContext::EndElement() } else if (meRangeType == ScDBCollection::GlobalNamed) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(sDatabaseRangeName)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pData.get()) { diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index c40f93692aa2..f70ed4a34bbf 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -666,7 +666,9 @@ void ScMyTables::DeleteTable() uno::Sequence<sal_Int8> aHash; SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTableProtection> pProtect(new ScTableProtection); + SAL_WNODEPRECATED_DECLARATIONS_POP pProtect->setProtected(maProtectionData.mbProtected); pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2); pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS, maProtectionData.mbSelectProtectedCells); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 83a7fb511cd7..881a895f5404 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -358,6 +358,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell) return pDoc; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos) { ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData @@ -366,6 +367,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell) return pEditSource; } +SAL_WNODEPRECATED_DECLARATIONS_POP void ScAccessibleCell::FillDependends(utl::AccessibleRelationSetHelper* pRelationSet) { diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 742bc9112dc8..cbe5c701f508 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -1645,6 +1645,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const return aRect; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SvxEditSource > ScAccessibleCsvCell::implCreateEditSource() { ScCsvGrid& rGrid = implGetGrid(); @@ -1657,7 +1658,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const ::std::auto_ptr< SvxEditSource > pEditSource( new ScAccessibilityEditSource( pCsvTextData ) ); return pEditSource; } - +SAL_WNODEPRECATED_DECLARATIONS_POP // ============================================================================ diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f8ef24858d6a..41db2d6e5576 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -150,9 +150,11 @@ ScNotesChilds::~ScNotesChilds() { ::accessibility::AccessibleTextHelper* pTextHelper = NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData (new ScAccessibleNoteTextData(mpViewShell, rString, aCellPos, bMarkNote)); ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); + SAL_WNODEPRECATED_DECLARATIONS_POP pTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource); diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 9bedb9126725..7d06a69fdb5b 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -316,7 +316,9 @@ void ScAccessibleEditObject::CreateTextHelper() { if (!mpTextHelper) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessibleTextData; + SAL_WNODEPRECATED_DECLARATIONS_POP if (meObjectType == CellInEditMode || meObjectType == EditControl) { pAccessibleTextData.reset @@ -328,7 +330,9 @@ void ScAccessibleEditObject::CreateTextHelper() (new ScAccessibleEditLineTextData(NULL, mpWindow)); } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleTextData)); + SAL_WNODEPRECATED_DECLARATIONS_POP mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); mpTextHelper->SetEventSource(this); mpTextHelper->SetFocus(mbHasFocus); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 452acbabb153..42e86b70daab 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -312,9 +312,11 @@ void ScAccessiblePageHeaderArea::CreateTextHelper() { if (!mpTextHelper) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessibleHeaderTextData (new ScAccessibleHeaderTextData(mpViewShell, mpEditObj, mbHeader, meAdjust)); ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleHeaderTextData)); + SAL_WNODEPRECATED_DECLARATIONS_POP mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); mpTextHelper->SetEventSource(this); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index d7fd8b64202e..38b9d7b57d36 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -298,9 +298,11 @@ void ScAccessiblePreviewCell::CreateTextHelper() { if (!mpTextHelper) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewCellTextData (new ScAccessiblePreviewCellTextData(mpViewShell, maCellAddress)); ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewCellTextData)); + SAL_WNODEPRECATED_DECLARATIONS_POP mpTextHelper = new ::accessibility::AccessibleTextHelper( pEditSource ); mpTextHelper->SetEventSource( this ); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 8e9af0dc45af..5c1abf1a9210 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -414,9 +414,11 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper() { if (!mpTextHelper) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData (new ScAccessiblePreviewHeaderCellTextData(mpViewShell, String(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader)); ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); + SAL_WNODEPRECATED_DECLARATIONS_POP mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); mpTextHelper->SetEventSource(this); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 2e85f48b44bc..36e90728b912 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -970,7 +970,9 @@ IMPL_LINK(ScAccessibleCellTextData, NotifyHdl, EENotify*, aNotify) { if( aNotify ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify ); + SAL_WNODEPRECATED_DECLARATIONS_POP if( aHint.get() ) GetBroadcaster().Broadcast( *aHint.get() ); @@ -1082,7 +1084,9 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify) { if( aNotify ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify ); + SAL_WNODEPRECATED_DECLARATIONS_POP if( aHint.get() ) GetBroadcaster().Broadcast( *aHint.get() ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 6dad099859a0..a1d52140b79d 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3409,7 +3409,9 @@ void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoTabProtect(&rDocShell, nTab, p) ); @@ -3439,7 +3441,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScDocProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> p(new ScDocProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDocProtect(&rDocShell, p) ); @@ -3461,7 +3465,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoTabProtect(&rDocShell, nTab, p) ); @@ -3491,7 +3497,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp return true; // save the protection state before unprotect (for undo). + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> pProtectCopy(new ScDocProtection(*pDocProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pDocProtect->verifyPassword(rPassword)) { @@ -3522,7 +3530,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp return true; // save the protection state before unprotect (for undo). + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> pProtectCopy(new ScTableProtection(*pTabProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pTabProtect->verifyPassword(rPassword)) { if (!bApi) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index c2d2958590db..a2d5ba50bcd4 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -920,8 +920,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s if (bRecord) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab)); auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab)); + SAL_WNODEPRECATED_DECLARATIONS_POP GetUndoManager()->AddUndoAction( new ScUndoCopyTab(this, pSrcList.release(), pDestList.release())); } @@ -984,8 +986,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s } else if (bRecord) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab)); auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab)); + SAL_WNODEPRECATED_DECLARATIONS_POP GetUndoManager()->AddUndoAction( new ScUndoMoveTab(this, pSrcList.release(), pDestList.release())); } diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 62fe0dd6c288..c80653193daf 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1388,7 +1388,9 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange& ::boost::scoped_ptr<ScRange> pUsedRange; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTokenArray> pArray(new ScTokenArray); + SAL_WNODEPRECATED_DECLARATIONS_POP bool bFirstTab = true; vector<ScExternalRefCache::SingleRangeData>::iterator itrCache = rCacheData.begin(), itrCacheEnd = rCacheData.end(); @@ -1503,7 +1505,9 @@ static ScTokenArray* lcl_fillEmptyMatrix(const ScRange& rRange) xMat->PutEmpty(i, j); ScMatrixToken aToken(xMat); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTokenArray> pArray(new ScTokenArray); + SAL_WNODEPRECATED_DECLARATIONS_POP pArray->AddToken(aToken); return pArray.release(); } @@ -2228,7 +2232,9 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt // make medium hidden to prevent assertion from progress bar pSet->Put( SfxBoolItem(SID_HIDDEN, true) ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, false, pFilter, pSet)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pMedium->GetError() != ERRCODE_NONE) return NULL; diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index a5a18aa408e3..1c76505c01ec 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -333,7 +333,9 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) { sal_Bool bResult = sal_True; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFormulaCell> pFCell( new ScFormulaCell( pDoc, aCursorPos, rStrExp ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP // HACK! um bei ColRowNames kein #REF! zu bekommen, // wenn ein Name eigentlich als Bereich in die Gesamt-Formel @@ -668,11 +670,13 @@ table::CellAddress ScFormulaDlg::getReferencePosition() const return table::CellAddress(aCursorPos.Tab(),aCursorPos.Col(),aCursorPos.Row()); } +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { ::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray()); pArray->Fill( _aTokenList, pDoc->GetExternalRefManager()); return pArray; } +SAL_WNODEPRECATED_DECLARATIONS_POP /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index ae8042e3ab2d..b3d61a32a97e 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -83,8 +83,10 @@ private: Edit maEdSepArrayRow; PushButton maBtnSepReset; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocOptions> mpOldOptions; ::std::auto_ptr<ScDocOptions> mpNewOptions; + SAL_WNODEPRECATED_DECLARATIONS_POP /** Stores old separator value of currently focused separator edit box. This value is used to revert undesired value change. */ diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 0d26ac84f9f9..fece9f914c08 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -376,7 +376,9 @@ private: class ScUndoDocProtect : public ScSimpleUndo { public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScUndoDocProtect(); virtual void Undo(); @@ -387,7 +389,9 @@ public: virtual String GetComment() const; private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> mpProtectSettings; + SAL_WNODEPRECATED_DECLARATIONS_POP void DoProtect(bool bProtect); }; @@ -399,8 +403,10 @@ private: class ScUndoTabProtect : public ScSimpleUndo { public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, ::std::auto_ptr<ScTableProtection> pProtectSettings); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScUndoTabProtect(); virtual void Undo(); @@ -412,7 +418,9 @@ public: private: SCTAB mnTab; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> mpProtectSettings; + SAL_WNODEPRECATED_DECLARATIONS_POP void DoProtect(bool bProtect); }; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 6a22a44e2731..7bbec8da9fcb 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -132,7 +132,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScRangeName::TabNameCopyMap::const_iterator itr = aOldNames.begin(), itrEnd = aOldNames.end(); for (; itr != itrEnd; ++itr) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScRangeName> p(new ScRangeName(*itr->second)); + SAL_WNODEPRECATED_DECLARATIONS_POP maTabRangeNames.insert(itr->first, p); } @@ -508,7 +510,9 @@ void ScNameDlg::ScopeChanged() ScRangeName::TabNameMap::iterator itr = maTabRangeNames.find(nTab); if (itr == maTabRangeNames.end()) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScRangeName> p(new ScRangeName); + SAL_WNODEPRECATED_DECLARATIONS_POP ::std::pair<ScRangeName::TabNameMap::iterator, bool> r = maTabRangeNames.insert(nTab, p); itr = r.first; diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index a86e1bb1e1ee..838e140289d7 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -358,9 +358,11 @@ void ScHFEditPage::SetSelectDefinedList() // default to customized ScHFEntryId eSelectEntry = eEntryCount; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< EditTextObject > pLeftObj; ::std::auto_ptr< EditTextObject > pCenterObj; ::std::auto_ptr< EditTextObject > pRightObj; + SAL_WNODEPRECATED_DECLARATIONS_POP XubString aLeftEntry; XubString aCenterEntry; @@ -564,7 +566,9 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj) { aSel.nStartPos = aSel.nEndPos; aSel.nEndPos++; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< EditTextObject > pPageObj; + SAL_WNODEPRECATED_DECLARATIONS_POP pPageObj.reset(pEngine->CreateTextObject(aSel)); if(pPageObj.get() && pPageObj->IsFieldObject() ) { @@ -622,7 +626,9 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj) void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) { SvtUserOptions aUserOpt; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< EditTextObject > pTextObj; + SAL_WNODEPRECATED_DECLARATIONS_POP switch(eSel) { diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index d384bc8b91d3..5bbcd0b47852 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -55,13 +55,17 @@ ScUndoAllRangeNames::ScUndoAllRangeNames( ScRangeName::TabNameCopyMap::const_iterator itr, itrEnd; for (itr = rOldLocal.begin(), itrEnd = rOldLocal.end(); itr != itrEnd; ++itr) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScRangeName> p(new ScRangeName(*itr->second)); + SAL_WNODEPRECATED_DECLARATIONS_POP maOldLocalNames.insert(itr->first, p); } for (itr = rNewLocal.begin(), itrEnd = rNewLocal.end(); itr != itrEnd; ++itr) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScRangeName> p(new ScRangeName(*itr->second)); + SAL_WNODEPRECATED_DECLARATIONS_POP maNewLocalNames.insert(itr->first, p); } } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 4c94b983fddf..1a2f9f58707e 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1247,11 +1247,13 @@ String ScUndoShowHideTab::GetComment() const // ============================================================================ +SAL_WNODEPRECATED_DECLARATIONS_PUSH ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, auto_ptr<ScDocProtection> pProtectSettings) : ScSimpleUndo(pShell), mpProtectSettings(pProtectSettings) { } +SAL_WNODEPRECATED_DECLARATIONS_POP ScUndoDocProtect::~ScUndoDocProtect() { @@ -1264,7 +1266,9 @@ void ScUndoDocProtect::DoProtect(bool bProtect) if (bProtect) { // set protection. + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDocProtection> pCopy(new ScDocProtection(*mpProtectSettings)); + SAL_WNODEPRECATED_DECLARATIONS_POP pCopy->setProtected(true); pDoc->SetDocProtection(pCopy.get()); } @@ -1316,12 +1320,14 @@ String ScUndoDocProtect::GetComment() const // ============================================================================ +SAL_WNODEPRECATED_DECLARATIONS_PUSH ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, auto_ptr<ScTableProtection> pProtectSettings) : ScSimpleUndo(pShell), mnTab(nTab), mpProtectSettings(pProtectSettings) { } +SAL_WNODEPRECATED_DECLARATIONS_POP ScUndoTabProtect::~ScUndoTabProtect() { @@ -1334,7 +1340,9 @@ void ScUndoTabProtect::DoProtect(bool bProtect) if (bProtect) { // set protection. + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTableProtection> pCopy(new ScTableProtection(*mpProtectSettings)); + SAL_WNODEPRECATED_DECLARATIONS_POP pCopy->setProtected(true); pDoc->SetTabProtection(mnTab, pCopy.get()); } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index b5ac0c8ce9d6..398bcfe5992d 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -201,7 +201,9 @@ vector<ScTokenRef>* TokenTable::getColRanges(SCCOL nCol) const if( mnRowCount<=0 ) return NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>); + SAL_WNODEPRECATED_DECLARATIONS_POP sal_uInt32 nLast = getIndex(nCol, mnRowCount-1); for (sal_uInt32 i = getIndex(nCol, 0); i <= nLast; ++i) { @@ -222,7 +224,9 @@ vector<ScTokenRef>* TokenTable::getRowRanges(SCROW nRow) const if( mnColCount<=0 ) return NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>); + SAL_WNODEPRECATED_DECLARATIONS_POP sal_uInt32 nLast = getIndex(mnColCount-1, nRow); for (sal_uInt32 i = getIndex(0, nRow); i <= nLast; i += mnRowCount) { @@ -238,7 +242,9 @@ vector<ScTokenRef>* TokenTable::getRowRanges(SCROW nRow) const vector<ScTokenRef>* TokenTable::getAllRanges() const { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>); + SAL_WNODEPRECATED_DECLARATIONS_POP sal_uInt32 nStop = mnColCount*mnRowCount; for (sal_uInt32 i = 0; i < nStop; i++) { @@ -488,7 +494,9 @@ private: private: shared_ptr< vector<ScTokenRef> > mpRefTokens; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<Chart2PositionMap> mpPositionMap; + SAL_WNODEPRECATED_DECLARATIONS_POP GlueType meGlue; SCCOL mnStartCol; SCROW mnStartRow; @@ -700,9 +708,11 @@ void Chart2Positioner::createPositionMap() glueState(); bool bNoGlue = (meGlue == GLUETYPE_NONE); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<Table> pCols(new Table); auto_ptr<FormulaToken> pNewAddress; auto_ptr<Table> pNewRowTable(new Table); + SAL_WNODEPRECATED_DECLARATIONS_POP Table* pCol = NULL; SCROW nNoGlueRow = 0; for (vector<ScTokenRef>::const_iterator itr = mpRefTokens->begin(), itrEnd = mpRefTokens->end(); @@ -1039,6 +1049,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint namespace { +SAL_WNODEPRECATED_DECLARATIONS_PUSH Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFromTokens( auto_ptr< vector< ScTokenRef > > pValueTokens, auto_ptr< vector< ScTokenRef > > pLabelTokens, ScDocument* pDoc, const Reference< chart2::data::XDataProvider >& xDP, bool bIncludeHiddenCells ) @@ -1074,6 +1085,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro } return xResult; } +SAL_WNODEPRECATED_DECLARATIONS_POP //---------------------------------------------------- /** @@ -1435,14 +1447,18 @@ ScChart2DataProvider::createDataSource( // Fill Categories if( bCategories ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pValueTokens(NULL); + SAL_WNODEPRECATED_DECLARATIONS_POP if (bOrientCol) pValueTokens.reset(pChartMap->getAllRowHeaderRanges()); else pValueTokens.reset(pChartMap->getAllColHeaderRanges()); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pLabelTokens(NULL); pLabelTokens.reset(pChartMap->getLeftUpperCornerRanges()); + SAL_WNODEPRECATED_DECLARATIONS_POP Reference< chart2::data::XLabeledDataSequence > xCategories = lcl_createLabeledDataSequenceFromTokens( pValueTokens, pLabelTokens, m_pDocument, this, m_bIncludeHiddenCells ); //ownership of pointers is transfered! @@ -1456,8 +1472,10 @@ ScChart2DataProvider::createDataSource( sal_Int32 nCount = bOrientCol ? pChartMap->getDataColCount() : pChartMap->getDataRowCount(); for (sal_Int32 i = 0; i < nCount; ++i) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pValueTokens(NULL); auto_ptr< vector<ScTokenRef> > pLabelTokens(NULL); + SAL_WNODEPRECATED_DECLARATIONS_POP if (bOrientCol) { pValueTokens.reset(pChartMap->getDataColRanges(static_cast<SCCOL>(i))); @@ -2681,7 +2699,9 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint OSL_ENSURE(m_pRangeIndices->size() == static_cast<size_t>(aRanges.size()), "range list and range index list have different sizes."); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScRangeList> pUndoRanges; + SAL_WNODEPRECATED_DECLARATIONS_POP if ( m_pDocument->HasUnoRefUndo() ) pUndoRanges.reset(new ScRangeList(aRanges)); @@ -3125,7 +3145,9 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() { SolarMutexGuard aGuard; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pTokensNew; + SAL_WNODEPRECATED_DECLARATIONS_POP if (m_pTokens.get()) { // Clone tokens. @@ -3139,7 +3161,9 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() } } + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScChart2DataSequence> p(new ScChart2DataSequence(m_pDocument, m_xDataProvider, pTokensNew.release(), m_bIncludeHiddenCells)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->CopyData(*this); Reference< util::XCloneable > xClone(p.release()); diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index c7e241b90f0e..aaf883de396c 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -331,19 +331,23 @@ void ScSimpleEditSource::UpdateData() //------------------------------------------------------------------------ +SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ) : mpAccessibleTextData(pAccessibleCellTextData) { } +SAL_WNODEPRECATED_DECLARATIONS_POP ScAccessibilityEditSource::~ScAccessibilityEditSource() { } +SAL_WNODEPRECATED_DECLARATIONS_PUSH SvxEditSource* ScAccessibilityEditSource::Clone() const { return new ScAccessibilityEditSource(::std::auto_ptr < ScAccessibleTextData > (mpAccessibleTextData->Clone())); } +SAL_WNODEPRECATED_DECLARATIONS_POP SvxTextForwarder* ScAccessibilityEditSource::GetTextForwarder() { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index a963834ca09a..ad07f5463934 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -465,10 +465,12 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, // ============================================================================ +SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) : formula::FormulaOpCodeMapperObj(_pCompiler) { } +SAL_WNODEPRECATED_DECLARATIONS_POP // ============================================================================ diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index f5b22047d1b3..f139828319bd 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -44,7 +44,9 @@ class ScVbaAxis : public ScVbaAxis_BASE sal_Bool bCrossesAreCustomized; ScVbaChart* getChartPtr() throw( css::uno::RuntimeException ); sal_Bool isValueAxis() throw( css::script::BasicErrorException ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ov::ShapeHelper> oShapeHelper; + SAL_WNODEPRECATED_DECLARATIONS_POP public: ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ); diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index cd06a53f33e2..5b54069bc199 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -50,7 +50,9 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XShape > xShape; css::uno::Reference< css::container::XNamed > xNamed; rtl::OUString sPersistName; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ov::ShapeHelper> oShapeHelper; + SAL_WNODEPRECATED_DECLARATIONS_POP css::uno::Reference< css::container::XNamed > xNamedShape; rtl::OUString getPersistName(); css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 1d89ea01e6d3..1f955f4ee19a 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -48,7 +48,9 @@ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseClass; protected: css::uno::Reference< css::drawing::XShape > xTitleShape; css::uno::Reference< css::beans::XPropertySet > xShapePropertySet; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ov::ShapeHelper> oShapeHelper; + SAL_WNODEPRECATED_DECLARATIONS_POP ScVbaPalette m_Palette; public: TitleImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ) : BaseClass( xParent, xContext ), xTitleShape( _xTitleShape ) diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index a0e22f3ca60a..ee80993645f1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1621,8 +1621,10 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, //! account for bAttrib during Undo !!! + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ScDocument> pUndoDoc; std::auto_ptr<ScMarkData> pUndoMark; + SAL_WNODEPRECATED_DECLARATIONS_POP rtl::OUString aUndoStr; if (bAddUndo) { @@ -2663,10 +2665,12 @@ void ScViewFunc::MoveTable( // Move or copy within the same document. SCTAB nTabCount = pDoc->GetTableCount(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<SCTAB> > pSrcTabs(new vector<SCTAB>); auto_ptr< vector<SCTAB> > pDestTabs(new vector<SCTAB>); auto_ptr< vector<OUString> > pTabNames(new vector<OUString>); auto_ptr< vector<OUString> > pDestNames(NULL); + SAL_WNODEPRECATED_DECLARATIONS_POP pSrcTabs->reserve(nTabCount); pDestTabs->reserve(nTabCount); pTabNames->reserve(nTabCount); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 028b68cdb97d..64848e7c1925 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -436,7 +436,9 @@ sal_Bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange // TODO: What's this for? break; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocument> pDocClip(new ScDocument(SCDOCMODE_CLIP)); + SAL_WNODEPRECATED_DECLARATIONS_POP // Check for geometrical feasibility of the ranges. bool bValidRanges = true; @@ -989,7 +991,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip ScDocument* pOrigClipDoc = NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ScDocument > xTransClip; + SAL_WNODEPRECATED_DECLARATIONS_POP if ( bTranspose ) { SCCOL nX; @@ -1556,7 +1560,9 @@ bool ScViewFunc::PasteMultiRangesFromClip( return false; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocument> pTransClip(new ScDocument(SCDOCMODE_CLIP)); + SAL_WNODEPRECATED_DECLARATIONS_POP pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink); pClipDoc = pTransClip.release(); SCCOL nTempColSize = nColSize; @@ -1612,7 +1618,9 @@ bool ScViewFunc::PasteMultiRangesFromClip( return false; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocument> pUndoDoc; + SAL_WNODEPRECATED_DECLARATIONS_POP if (pDoc->IsUndoEnabled()) { pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO)); @@ -1620,7 +1628,9 @@ bool ScViewFunc::PasteMultiRangesFromClip( pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark, true); } + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocument> pMixDoc; + SAL_WNODEPRECATED_DECLARATIONS_POP if ( bSkipEmpty || nFunction ) { if ( nFlags & IDF_CONTENTS ) @@ -1757,7 +1767,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges( return false; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ScDocument> pUndoDoc; + SAL_WNODEPRECATED_DECLARATIONS_POP if (pDoc->IsUndoEnabled()) { pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO)); @@ -1769,7 +1781,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges( } } + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ScDocument> pMixDoc; + SAL_WNODEPRECATED_DECLARATIONS_POP if (bSkipEmpty || nFunction) { if (nFlags & IDF_CONTENTS) |