summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-04 14:19:41 +0200
committerNoel Grandin <noel@peralex.com>2014-12-05 11:34:20 +0200
commit0375504f7be34d857859dfbaa312501e0eaaaad1 (patch)
tree92e67f8b77e53c343306483bc49f5021283d3519 /l10ntools
parent7716243236a047932240de275ecac17b149b88a9 (diff)
fdo#38835 strip out OString globals
Change-Id: Id2eb27132fd6c1734e50c02617ce1bbb75e294a0
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/source/localize.cxx2
-rw-r--r--l10ntools/source/merge.cxx2
-rw-r--r--l10ntools/source/po.cxx4
3 files changed, 4 insertions, 4 deletions
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';