[Libreoffice-commits] core.git: 2 commits - editeng/source sc/source

[Eike Rathke]

 editeng/source/items/textitem.cxx         |    2 +-
 sc/source/filter/xml/editattributemap.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 75c2ecc2497ec48aeead48da0bd271fee5dc83fd
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Oct 17 22:06:07 2016 +0200

    let LanguageTag::convertToLocale() decide when to create a temporary
    
    Change-Id: Iaefddb13192aff1aad912ac9f908c3d12236b94d

diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 8ffcb44..f05529d 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2412,7 +2412,7 @@ bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
             rVal <<= (sal_Int16)(GetValue());
         break;
         case MID_LANG_LOCALE:
-            lang::Locale aRet( LanguageTag( GetValue()).getLocale( false));
+            lang::Locale aRet( LanguageTag::convertToLocale( GetValue(), false));
             rVal <<= aRet;
         break;
     }
commit ab6f04ded935d314c5b763fef1015b1ed06c1db5
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Oct 17 22:05:17 2016 +0200

    comment that the country entries are just placeholders
    
    09f2f36 related, tdf#102357
    
    Change-Id: I053853227d36dfd17da5914487a6aefe8af06f2d

diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index 057adc0..3a2dec7 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -57,6 +57,9 @@ ScXMLEditAttributeMap::Entry aEntries[] = {
     { XML_NAMESPACE_STYLE, "text-position", "CharEscapement", EE_CHAR_ESCAPEMENT, MID_ESC },
     { XML_NAMESPACE_STYLE, "text-position", "CharEscapementHeight", EE_CHAR_ESCAPEMENT, MID_ESC_HEIGHT },
     { XML_NAMESPACE_STYLE, "text-emphasize", "CharEmphasis", EE_CHAR_EMPHASISMARK, MID_EMPHASIS },
+    // The following 3 "country" entries are just placeholders for language,
+    // country, script and rfc-language-tag, which all map to CharLocale,
+    // EE_CHAR_LANGUAGE and MID_LANG_LOCALE and are handled individually.
     { XML_NAMESPACE_FO, "country", "CharLocale", EE_CHAR_LANGUAGE, MID_LANG_LOCALE },
     { XML_NAMESPACE_STYLE, "country-asian", "CharLocaleAsian", EE_CHAR_LANGUAGE_CJK, MID_LANG_LOCALE },
     { XML_NAMESPACE_STYLE, "country-complex", "CharLocaleComplex", EE_CHAR_LANGUAGE_CTL, MID_LANG_LOCALE },