[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source xmloff/source

[Libreoffice Gerrit user]

 sc/source/core/tool/addincol.cxx |    1 +
 xmloff/source/style/xmlnumfe.cxx |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 3c89d9c2b3f2a4bb260624ba97692879ccc3f5c1
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 13 23:54:44 2012 +0100

    added some FIXME-BCP47 markers
    
    Change-Id: I085ca72b6c2dc1e73f4af7233017895bf92b2ef8
    (cherry picked from commit 34b7826f9814b09dcd6aba15552bef1c330f3db2)

diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index bb29171..8f63781 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -175,6 +175,7 @@ sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUStri
         const sheet::LocalizedName* pArray = rSequence.getConstArray();
         long i;
 
+        /* FIXME-BCP47: we may want to handle language tags here as well. */
         rtl::OUString aLangStr, aCountryStr;
         LanguageTag( eDestLang ).getIsoLanguageCountry( aLangStr, aCountryStr );
         rtl::OUString aUserLang = aLangStr.toAsciiLowerCase();
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 694d939..98e3e9e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -342,6 +342,12 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32 nLang )
 {
     if ( nLang != LANGUAGE_SYSTEM )
     {
+        /* FIXME-BCP47: handle language tags!
+         * ODF now provides fo:script, and rfc-language-tag attribute in case a
+         * locale can't be expressed using these three ISO codes.
+         * Of course these need to be read in xmlnumfi.cxx then..
+         * In general all places using XML_LANGUAGE and XML_COUNTRY need to be
+         * adapted once we really support bcp47. */
         OUString aLangStr, aCountryStr;
         LanguageTag( (LanguageType)nLang ).getIsoLanguageCountry( aLangStr, aCountryStr );