diff options
| author | Daniel Di Marco <d.dimarco@gmx.de> | 2011-10-29 13:24:48 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 12:19:05 +0000 |
| commit | f7303fcac779f99931bfba48e8bfcf9c081af67f (patch) | |
| tree | 2ebd76bd8d6d8db36bc87020accf5b22e05afec9 /svtools | |
| parent | cca7126c2908c5b9b6693326a3861bb96fae1be3 (diff) | |
eliminate SvUShorts type
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/svparser.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx index b82a5a85e36e..eac4a92a8f47 100644 --- a/svtools/inc/svtools/svparser.hxx +++ b/svtools/inc/svtools/svparser.hxx @@ -34,11 +34,11 @@ #include <tools/ref.hxx> #include <rtl/textenc.h> #include <boost/utility.hpp> +#include <vector> struct SvParser_Impl; class SvStream; -class SvUShorts; enum SvParserState { @@ -174,7 +174,7 @@ public: // Aufbau einer Which-Map 'rWhichMap' aus einem Array von // 'pWhichIds' von Which-Ids. Es hat die Lange 'nWhichIds'. // Die Which-Map wird nicht geloescht. - static void BuildWhichTbl( SvUShorts &rWhichMap, + static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ); }; diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 9cb6ba80f9ae..84ebfa492ce6 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -572,7 +572,7 @@ void SvParser::Continue( int ) { } -void SvParser::BuildWhichTbl( SvUShorts &rWhichMap, +void SvParser::BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ) { @@ -590,7 +590,7 @@ void SvParser::BuildWhichTbl( SvUShorts &rWhichMap, if( *pWhichIds < rWhichMap[nOfs] - 1 ) { // neuen Range davor - rWhichMap.Insert( aNewRange, 2, nOfs ); + rWhichMap.insert( rWhichMap.begin() + nOfs, aNewRange, aNewRange + 2 ); bIns = sal_False; break; } @@ -607,7 +607,8 @@ void SvParser::BuildWhichTbl( SvUShorts &rWhichMap, { // mit dem naechsten Bereich mergen rWhichMap[nOfs+1] = rWhichMap[nOfs+3]; - rWhichMap.Remove( nOfs+2, 2 ); + rWhichMap.erase( rWhichMap.begin() + nOfs + 2, + rWhichMap.begin() + nOfs + 4 ); } else // diesen Range nach oben erweitern @@ -619,7 +620,10 @@ void SvParser::BuildWhichTbl( SvUShorts &rWhichMap, // einen Range hinten anhaengen if( bIns ) - rWhichMap.Insert( aNewRange, 2, rWhichMap.Count()-1 ); + { + rWhichMap.insert( rWhichMap.begin() + rWhichMap.size() - 1, + aNewRange, aNewRange + 2 ); + } } } |