[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - i18npool/source oox/CustomTarget_generated.mk

[Michael Stahl]

 i18npool/source/localedata/data/es_CR.xml |    7 +++++++
 oox/CustomTarget_generated.mk             |    1 +
 2 files changed, 8 insertions(+)

New commits:
commit d8dde16f6ef8053449d15e29a0d09851f62062f0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 7 16:39:03 2014 +0200

    oox: fix spurious rebuilds of namespacemap.cxx
    
    There is a missing dependency on one of the generated header files.
    
    Change-Id: Id3fa2ccf2c2a31527b795861afdf557882f56972
    (cherry picked from commit 63e6cbc3180047000787a9071513152fdd9ce942)
    Reviewed-on: https://gerrit.libreoffice.org/11844
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 70aa0d2..640f4e4 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -63,6 +63,7 @@ $(call gb_CustomTarget_get_target,oox/generated) : \
 	$(oox_INC)/tokenhash.inc \
 	$(oox_INC)/tokennames.inc \
 	$(oox_INC)/namespacenames.inc \
+	$(oox_INC)/namespaces-strictnames.inc \
 	$(oox_INC)/propertynames.inc \
 	$(oox_GENHEADERPATH)/tokens.hxx \
 	$(oox_GENHEADERPATH)/namespaces.hxx \
commit 41e3663f1a358048d3e8c1dd3f265f3bcbbfcdd1
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 8 13:48:02 2014 +0200

    add missing legacyOnly currency, fdo#84260
    
    aa33dd16b0e3075f28c56656678c0f5cb7642222 changed the currency symbol
    from ¢ to ₡ but changed only the symbol. Actually changing the number
    format codes wasn't necessary at all, but changing only the symbol is
    wrong, see also the ATTLIST Currency  legacyOnly description in
    i18npool/source/localedata/data/locale.dtd
    
    Hopefully nothing relies on the actual symbol used in the number format
    codes ...
    
    Change-Id: I92e79403fbb80f18c44dc3ecf5a3830a52fd2ff8
    (cherry picked from commit aa1c549e65d103910904a75d19672240da10cc54)
    Reviewed-on: https://gerrit.libreoffice.org/11849
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml
index 6a04a8e..ff0d73a 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -185,6 +185,13 @@
       <CurrencyName>Colon</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CRC</CurrencyID>
+      <CurrencySymbol>¢</CurrencySymbol>
+      <BankSymbol>CRC</BankSymbol>
+      <CurrencyName>Colon</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
   </LC_CURRENCY>
   <LC_TRANSLITERATION ref="en_US"/>
   <LC_MISC ref="es_ES"/>