summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-13 16:46:21 +0200
committerNoel Grandin <noel@peralex.com>2013-09-17 09:04:44 +0200
commitd4f46e00a8ad65307ec5ce85972a2e79b7f686be (patch)
tree61a69afbe1b465c6a202b9f12980b50cd69b59c3 /filter
parent7f83faa795292333c1be6d99ed1b6eb305a066f9 (diff)
convert filter/source/msfilter/rtfutil.hxx from String to OUString
Change-Id: Ibcea731a84e9afb62c6ce0a0e6b70017e610dc45
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/rtfutil.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 3ffb053e2f15..20439f50d7c0 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -116,13 +116,13 @@ OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* pS
return aBuf.makeStringAndClear();
}
-OString OutString(const String &rStr, rtl_TextEncoding eDestEnc, bool bUnicode)
+OString OutString(const OUString &rStr, rtl_TextEncoding eDestEnc, bool bUnicode)
{
SAL_INFO("filter.ms", OSL_THIS_FUNC << ", rStr = '" << OUString(rStr) << "'");
OStringBuffer aBuf;
int nUCMode = 1;
- for (xub_StrLen n = 0; n < rStr.Len(); ++n)
- aBuf.append(OutChar(rStr.GetChar(n), &nUCMode, eDestEnc, 0, bUnicode));
+ for (sal_Int32 n = 0; n < rStr.getLength(); ++n)
+ aBuf.append(OutChar(rStr[n], &nUCMode, eDestEnc, 0, bUnicode));
if (nUCMode != 1) {
aBuf.append(OOO_STRING_SVTOOLS_RTF_UC);
aBuf.append((sal_Int32)1);
@@ -145,7 +145,7 @@ static bool TryOutString(const String &rStr, rtl_TextEncoding eDestEnc)
return true;
}
-OString OutStringUpr(const sal_Char *pToken, const String &rStr, rtl_TextEncoding eDestEnc)
+OString OutStringUpr(const sal_Char *pToken, const OUString &rStr, rtl_TextEncoding eDestEnc)
{
if (TryOutString(rStr, eDestEnc))
return OString("{") + pToken + " " + OutString(rStr, eDestEnc) + "}";