From 0375504f7be34d857859dfbaa312501e0eaaaad1 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 4 Dec 2014 14:19:41 +0200
Subject: fdo#38835 strip out OString globals

Change-Id: Id2eb27132fd6c1734e50c02617ce1bbb75e294a0
---
 l10ntools/source/localize.cxx | 2 +-
 l10ntools/source/merge.cxx    | 2 +-
 l10ntools/source/po.cxx       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'l10ntools')

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 5546e9eb5984..5c107a6a3a6b 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -261,7 +261,7 @@ void handleFilesOfDir(
 }
 
 bool includeProject(const OString& rProject) {
-    static const OString projects[] = {
+    static const char *projects[] = {
         "accessibility",
         "avmedia",
         "basctl",
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index ee980093c709..a8323be61884 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -439,7 +439,7 @@ void MergeDataFile::InsertEntry(
 OString MergeDataFile::CreateKey(const OString& rTYP, const OString& rGID,
     const OString& rLID, const OString& rFilename, bool bCaseSensitive)
 {
-    static const OString sStroke('-');
+    static const char sStroke[] = "-";
     OString sKey( rTYP );
     sKey += sStroke;
     sKey += rGID;
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index bc599a098384..a4e60b91e6a6 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -396,12 +396,12 @@ OString PoEntry::genKeyId(const OString& rGenerator)
     aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
     sal_uInt32 nCRC = aCRC32.checksum();
     // Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs
-    static const OString sSymbols =
+    static const char sSymbols[] =
         "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
     char sKeyId[6];
     for( short nKeyInd = 0; nKeyInd < 5; ++nKeyInd )
     {
-        sKeyId[nKeyInd] = sSymbols[(nCRC & 63) % sSymbols.getLength()];
+        sKeyId[nKeyInd] = sSymbols[(nCRC & 63) % strlen(sSymbols)];
         nCRC >>= 6;
     }
     sKeyId[5] = '\0';
-- 
cgit