diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-14 01:14:45 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-14 01:32:24 +0200 |
| commit | 533a8a9efe99391b1258ea7d1481f2d07d3ae14c (patch) | |
| tree | ddffaab65714fbdcd03a8dca6014fbd5222af188 /sc | |
| parent | 1885266f274575327cdeee9852945a3e91f32f15 (diff) | |
remove some auto_ptr from xecontent
Change-Id: Idef77ba4ce419aec26476ed027ac1a3c3fc41eef
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/inc/xecontent.hxx | 14 |
2 files changed, 6 insertions, 16 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index d7461cfac852..fbbfe75b858f 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -677,9 +677,7 @@ 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 + boost::scoped_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) ); mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_CONDFMT, *xScTokArr ); if( bFmla2 ) @@ -1284,9 +1282,7 @@ 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 + boost::scoped_ptr< ScTokenArray > xScTokArr; // first formula xScTokArr.reset( pValData->CreateTokenArry( 0 ) ); diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 498bd103df33..953a347d9de0 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -72,9 +72,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); private: - SAL_WNODEPRECATED_DECLARATIONS_PUSH - typedef ::std::auto_ptr< XclExpSstImpl > XclExpSstImplPtr; - SAL_WNODEPRECATED_DECLARATIONS_POP + typedef boost::scoped_ptr< XclExpSstImpl > XclExpSstImplPtr; XclExpSstImplPtr mxImpl; }; @@ -131,10 +129,8 @@ 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 + typedef boost::scoped_ptr< String > StringPtr; + typedef boost::scoped_ptr< SvStream > SvStreamPtr; ScAddress maScPos; /// Position of the hyperlink. StringPtr mxRepr; /// Cell representation text. @@ -190,9 +186,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); private: - SAL_WNODEPRECATED_DECLARATIONS_PUSH - typedef ::std::auto_ptr< XclExpCFImpl > XclExpCFImplPtr; - SAL_WNODEPRECATED_DECLARATIONS_POP + typedef boost::scoped_ptr< XclExpCFImpl > XclExpCFImplPtr; XclExpCFImplPtr mxImpl; }; |