Kaydet (Commit) 533a8a9e authored tarafından Markus Mohrhard's avatar Markus Mohrhard

remove some auto_ptr from xecontent

Change-Id: Idef77ba4ce419aec26476ed027ac1a3c3fc41eef
üst 1885266f
......@@ -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 ) );
......
......@@ -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;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment