diff options
| author | Nigel Hawkins <n.hawkins@gmx.com> | 2011-08-08 11:34:59 +0100 |
|---|---|---|
| committer | Nigel Hawkins <n.hawkins@gmx.com> | 2011-08-08 20:23:05 +0100 |
| commit | b090fcf34f105f7937ddd1d5e814fce3970b5894 (patch) | |
| tree | 0cc8343db85a7d18b0ff195d0feadb5ff94615f9 /sd | |
| parent | 7d2cea2bc9a9463db8e6b6e82cb8aa9504ba9b8e (diff) | |
Replace SvUShorts with vector in editeng.hxx and cascade changes.
LGPLv3+/MPL
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 41a14f3e4801..8054c1af637f 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -72,8 +72,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/fcontnr.hxx> #include <svl/style.hxx> -#define _SVSTDARR_USHORTS -#include <svl/svstdarr.hxx> #include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> #include <tools/urlobj.hxx> // INetURLObject @@ -1365,14 +1363,13 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPar return aStr; HtmlState aState( (mbUserAttr || mbDocColors) ? maTextColor : Color(COL_BLACK) ); - SvUShorts aPortionList; + std::vector<sal_uInt16> aPortionList; rEditEngine.GetPortions( (sal_uInt16) nPara, aPortionList ); - sal_uInt16 nPortionCount = aPortionList.Count(); sal_uInt16 nPos1 = 0; - for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; nPortion++ ) + for( std::vector<sal_uInt16>::const_iterator it( aPortionList.begin() ); it != aPortionList.end(); ++it ) { - sal_uInt16 nPos2 = aPortionList.GetObject(nPortion); + sal_uInt16 nPos2 = *it; ESelection aSelection( (sal_uInt16) nPara, nPos1, (sal_uInt16) nPara, nPos2); |