summaryrefslogtreecommitdiff
path: root/sw/source/ui/dochdl
diff options
context:
space:
mode:
authorBrad Sowden <code@sowden.org>2011-12-27 23:18:50 +1300
committerJan Holesovsky <kendy@suse.cz>2011-12-30 16:37:14 +0100
commita9b3b64a5a94a4c27ac524ac6997ef2e2467267c (patch)
treeb653f99fe56c7cf9df23acccb4be6ba28a2bc40d /sw/source/ui/dochdl
parentd8f2a82f6905178f1f594b22a0d5427b29c8eb33 (diff)
fdo#38831 Convert some SvStrings to std::vector (part 2)
Diffstat (limited to 'sw/source/ui/dochdl')
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index efd545f79d2c..2fa3c324daeb 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -38,8 +38,6 @@
#include <svl/macitem.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfile.hxx>
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
#include <svl/urihelper.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <poolfmt.hxx>
@@ -138,13 +136,13 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw
String sCurBase = aTemp.getBase();
aTemp.removeSegment();
const String sCurEntryPath = aTemp.GetMainURL(INetURLObject::NO_DECODE);
- const SvStrings* pPathArr = rStatGlossaries.GetPathArray();
+ const std::vector<String*> *pPathArr = rStatGlossaries.GetPathArray();
sal_uInt16 nCurrentPath = USHRT_MAX;
- for(sal_uInt16 nPath = 0; nPath < pPathArr->Count(); nPath++)
+ for( size_t nPath = 0; nPath < pPathArr->size(); nPath++ )
{
if(sCurEntryPath == *(*pPathArr)[nPath])
{
- nCurrentPath = nPath;
+ nCurrentPath = static_cast<sal_uInt16>(nPath);
break;
}
}