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 /editeng/source/editeng/editview.cxx | |
| parent | 7d2cea2bc9a9463db8e6b6e82cb8aa9504ba9b8e (diff) | |
Replace SvUShorts with vector in editeng.hxx and cascade changes.
LGPLv3+/MPL
Diffstat (limited to 'editeng/source/editeng/editview.cxx')
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index e324b7beca1d..9f7b2c494d7d 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -46,9 +46,6 @@ #include <svl/srchitem.hxx> -#define _SVSTDARR_sal_uIt16S -#include <svl/svstdarr.hxx> - #include <impedit.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> @@ -1455,19 +1452,19 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) { for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { - SvUShorts aPortions; + std::vector<sal_uInt16> aPortions; rEditEngine.GetPortions( nPara, aPortions ); - if( aPortions.Count() == 0 ) - aPortions.Insert( rEditEngine.GetTextLen(nPara), 0 ); + if( aPortions.empty() ) + aPortions.push_back( rEditEngine.GetTextLen(nPara) ); const sal_uInt16 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0; const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff; - for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos ) + for ( size_t nPos = 0; nPos < aPortions.size(); ++nPos ) { - sal_uInt16 nPortionEnd = aPortions.GetObject( nPos ); - sal_uInt16 nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0; + sal_uInt16 nPortionEnd = aPortions[ nPos ]; + sal_uInt16 nPortionStart = nPos > 0 ? aPortions[ nPos - 1 ] : 0; if( (nPortionEnd < nBeginPos) || (nPortionStart > nEndPos) ) continue; |