summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8glsy.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-09-23 07:19:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-09-25 19:24:23 +0200
commit98de5b40c8a3fd4e57477b6d994e3b1472207f71 (patch)
tree567fdbbaecbddbfc19f28a08da5d1f6d5207748c /sw/source/filter/ww8/ww8glsy.cxx
parent0552a91acde9dce28c0d92c552d21fbadfcb9184 (diff)
Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
Diffstat (limited to 'sw/source/filter/ww8/ww8glsy.cxx')
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 07210dc1829b..f5d523e128ac 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -79,7 +79,7 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx)
}
bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
- bool bSaveRelFile, const std::vector<String>& rStrings,
+ bool bSaveRelFile, const std::vector<OUString>& rStrings,
const std::vector<ww::bytes>& rExtra)
{
// this code will be called after reading all text into the
@@ -147,7 +147,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
if(n != 0xFFFF)
{
rBlocks.ClearDoc();
- const String &rLNm = rStrings[nGlosEntry];
+ const OUString &rLNm = rStrings[nGlosEntry];
String sShortcut = rLNm;
@@ -195,7 +195,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
if (pGlossary && pGlossary->IsGlossaryFib() && rBlocks.StartPutMuchBlockEntries())
{
//read the names of the autotext entries
- std::vector<String> aStrings;
+ std::vector<OUString> aStrings;
std::vector<ww::bytes> aData;
rtl_TextEncoding eStructCharSet =