diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-24 14:39:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-09 08:52:52 +0200 |
| commit | 4c45c52b283d83c2c9749f9f129461ea4d2c32d2 (patch) | |
| tree | 754730f94a123300c52a49dac65c984d032b14bb /sw/source/filter/html/htmlfly.cxx | |
| parent | c353979a75f20bd71a883bc61110e82e5030d9e2 (diff) | |
Convert SV_DECL_PTRARR(INetFmts) to std::vector
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 419699295237..887ab2407ed6 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -836,10 +836,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; // ggf. ein noch offenes Attribut voruebergehend beenden - if( rHTMLWrt.aINetFmts.Count() ) + if( !rHTMLWrt.aINetFmts.empty() ) { - SwFmtINetFmt *pINetFmt = - rHTMLWrt.aINetFmts[ rHTMLWrt.aINetFmts.Count()-1 ]; + SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back(); OutHTML_INetFmt( rWrt, *pINetFmt, sal_False ); } @@ -1198,12 +1197,11 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( !aEndTags.isEmpty() ) rWrt.Strm() << aEndTags.getStr(); - if( rHTMLWrt.aINetFmts.Count() ) + if( !rHTMLWrt.aINetFmts.empty() ) { // es ist noch ein Attribut auf dem Stack, das wieder geoeffnet // werden muss - SwFmtINetFmt *pINetFmt = - rHTMLWrt.aINetFmts[ rHTMLWrt.aINetFmts.Count()-1 ]; + SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back(); OutHTML_INetFmt( rWrt, *pINetFmt, sal_True ); } |