summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlfly.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-05-16 10:58:34 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-25 00:17:04 +0200
commitcf0e08c6b8d739b8b17dc533efc3e12505b2d5a9 (patch)
tree7a05e2cf05d608623ff22cc6c85895655c7a43ee /sw/source/filter/html/htmlfly.cxx
parent39f5e66eadc66272fca566643bcf9577f3b6e9fe (diff)
Convert SV_DECL_PTRARR_SORT_VISIBILITY(SwPosFlyFrms) to std::set
Change-Id: Iba19e13b4402594023d9ce7c4d4fa3a9cdc9899e
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
-rw-r--r--sw/source/filter/html/htmlfly.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 887ab2407ed6..9aabb328e8bd 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -312,13 +312,12 @@ void SwHTMLWriter::CollectFlyFrms()
OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS,
"number of browser configurations has changed" );
- sal_uInt8 nSz = (sal_uInt8)Min( pDoc->GetSpzFrmFmts()->Count(), sal_uInt16(255) );
- SwPosFlyFrms aFlyPos( nSz );
+ SwPosFlyFrms aFlyPos;
pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, sal_True );
- for( sal_uInt16 i=0; i< aFlyPos.Count(); i++ )
+ for(SwPosFlyFrms::iterator it = aFlyPos.begin(); it != aFlyPos.end(); ++it)
{
- const SwFrmFmt& rFrmFmt = aFlyPos[i]->GetFmt();
+ const SwFrmFmt& rFrmFmt = (*it)->GetFmt();
const SdrObject *pSdrObj = 0;
const SwPosition *pAPos;
const SwCntntNode *pACNd;
@@ -369,7 +368,7 @@ void SwHTMLWriter::CollectFlyFrms()
pHTMLPosFlyFrms = new SwHTMLPosFlyFrms;
SwHTMLPosFlyFrm *pNew =
- new SwHTMLPosFlyFrm( *aFlyPos[i], pSdrObj, nMode );
+ new SwHTMLPosFlyFrm( **it, pSdrObj, nMode );
pHTMLPosFlyFrms->Insert( pNew );
}
}