diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-13 23:26:59 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-13 23:32:41 +0200 |
| commit | 6f5094515dac8e8cfc90050e0691ad361acb0157 (patch) | |
| tree | 0403c121893bdda0e4a8ae2d90e0a8ab4553429b /xmloff | |
| parent | eb35c23d03b5171736ea73de756bbc11e40c2a73 (diff) | |
conditional SAL_WARN
An attempt to import a language from fo:language is fine even if
*:rfc-language-tag was already imported, just ignore this case instead
of warning, warn only if Language!="qlt".
Change-Id: I0f7ebc6964fe079c9f86ca19e98cfa56ec56398a
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/chrlohdl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index 64c37725097c..e75ff7b424bc 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -86,7 +86,10 @@ sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& else { if (!aLocale.Language.isEmpty() || aLocale.Variant[0] != '-') - SAL_WARN( "xmloff.style", "XMLCharLanguageHdl::importXML - attempt to import language twice"); + { + SAL_WARN_IF( aLocale.Language != I18NLANGTAG_QLT, "xmloff.style", + "XMLCharLanguageHdl::importXML - attempt to import language twice"); + } else { aLocale.Variant = rStrImpValue + aLocale.Variant; |