From dd5086102184b31b6706991d40332986a6f045be Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 8 May 2012 03:52:02 +0200 Subject: DECL_PTRARR_SORT to ptr_set in conditio.[ch]xx Change-Id: I I7de285ae784ae144a7d3190d4f99c1b38694da28 --- sc/source/filter/excel/xecontent.cxx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'sc/source/filter/excel/xecontent.cxx') diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 8dfe1cb5c385..fb974d943177 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -936,18 +936,12 @@ XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot ) : { if( const ScConditionalFormatList* pCondFmtList = GetDoc().GetCondFormList() ) { - if( const ScConditionalFormatPtr* ppCondFmt = pCondFmtList->GetData() ) + for( ScConditionalFormatList::const_iterator itr = pCondFmtList->begin(); + itr != pCondFmtList->end(); ++itr) { - const ScConditionalFormatPtr* ppCondEnd = ppCondFmt + pCondFmtList->Count(); - for( ; ppCondFmt < ppCondEnd; ++ppCondFmt ) - { - if( *ppCondFmt ) - { - XclExpCondfmtList::RecordRefType xCondfmtRec( new XclExpCondfmt( GetRoot(), **ppCondFmt ) ); - if( xCondfmtRec->IsValid() ) - maCondfmtList.AppendRecord( xCondfmtRec ); - } - } + XclExpCondfmtList::RecordRefType xCondfmtRec( new XclExpCondfmt( GetRoot(), *itr ) ); + if( xCondfmtRec->IsValid() ) + maCondfmtList.AppendRecord( xCondfmtRec ); } } } -- cgit