mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid generation of unused replaceFrom* variables

Browse Source 
Change-Id: I2a65485b8dcaa7b6ed4a049f97d460878b8bb17d
This commit is contained in:
Stephan Bergmann
2014-02-07 10:04:31 +01:00
parent 91fcdd5a8d
commit 0443d29672
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
i18npool/source/localedata/LocaleNode.cxx
View File

@@ -617,9 +617,14 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
::std::vector< OUString > theDateAcceptancePatterns; ::std::vector< OUString > theDateAcceptancePatterns;
OUString useLocale(getAttr().getValueByName("ref"));
OUString str; OUString str;
OUString strFrom( getAttr().getValueByName("replaceFrom")); OUString strFrom( getAttr().getValueByName("replaceFrom"));
of.writeParameter("replaceFrom", strFrom, mnSection); if (useLocale.isEmpty())
{
of.writeParameter("replaceFrom", strFrom, mnSection);
}
str = getAttr().getValueByName("replaceTo"); str = getAttr().getValueByName("replaceTo");
if (!strFrom.isEmpty() && str.isEmpty()) if (!strFrom.isEmpty() && str.isEmpty())
incErrorStr("replaceFrom=\"%s\" replaceTo=\"\" is empty replacement.", strFrom); incErrorStr("replaceFrom=\"%s\" replaceTo=\"\" is empty replacement.", strFrom);
@@ -640,9 +645,14 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
} }
} }
OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) if (!useLocale.isEmpty())
{ {
if (!strFrom.isEmpty() && strFrom != "[CURRENCY]") //???
{
incErrorStrStr(
"non-empty replaceFrom=\"%s\" with non-empty ref=\"%s\".",
strFrom, useLocale);
}
useLocale = useLocale.replace( '-', '_'); useLocale = useLocale.replace( '-', '_');
switch (mnSection) switch (mnSection)
{ {