[Libreoffice-commits] core.git: xmloff/source

[Eike Rathke]

 xmloff/source/style/chrlohdl.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6f5094515dac8e8cfc90050e0691ad361acb0157
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 13 23:26:59 2013 +0200

    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

diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 64c3772..e75ff7b 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;