diff options
author | Maciej Rumianowski <maciej.rumianowski@gmail.com> | 2011-09-27 22:04:20 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-09-29 08:09:19 +0200 |
commit | ef01fae2759ac225f281f11a2b24ebaad40be941 (patch) | |
tree | 9ccc0ed54ee2795b719710260bbc4db0e5ea47c3 /sfx2/source/doc/docfile.cxx | |
parent | f446ca6fe8fe9ebdc66c230f4608fd3de74d0ca9 (diff) |
Replace SvULongs with std::vector in sfx2
Bug 38831, replace SvULongs with std::vector in sfx2 and related svtools
Diffstat (limited to 'sfx2/source/doc/docfile.cxx')
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index ddeadec0f765..8140cc57aaf9 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -95,7 +95,6 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase1.hxx> -#define _SVSTDARR_ULONGS #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> @@ -3104,21 +3103,21 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision ) if ( GetStorage().is() ) { // To determine a unique name for the stream - SvULongs aLongs; + std::vector<sal_uInt32> aLongs; sal_Int32 nLength = pImp->aVersions.getLength(); for ( sal_Int32 m=0; m<nLength; m++ ) { - sal_uInt32 nVer = (sal_uInt32) String( pImp->aVersions[m].Identifier ).Copy(7).ToInt32(); - sal_uInt16 n; - for ( n=0; n<aLongs.Count(); n++ ) + sal_uInt32 nVer = static_cast<sal_uInt32>(String( pImp->aVersions[m].Identifier ).Copy(7).ToInt32()); + size_t n; + for ( n=0; n<aLongs.size(); ++n ) if ( nVer<aLongs[n] ) break; - aLongs.Insert( nVer, n ); + aLongs.insert( aLongs.begin()+n, nVer ); } sal_uInt16 nKey; - for ( nKey=0; nKey<aLongs.Count(); nKey++ ) + for ( nKey=0; nKey<aLongs.size(); ++nKey ) if ( aLongs[nKey] > ( sal_uIntPtr ) nKey+1 ) break; |