[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - officecfg/registry sc/source

[Aurimas Fišeras]

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++++++++++
 sc/source/core/tool/interpr2.cxx                       |    3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 2894cd72dd356cb113cd229a12e2a2c3bb398bd8
Author: Aurimas Fišeras <auri...@members.fsf.org>
Date:   Sat Aug 23 11:50:56 2014 +0300

    added Lithuanian "LTL" to EUROCONVERT(), CONVERT()
    
    Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
    Reviewed-on: https://gerrit.libreoffice.org/11088
    Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
    Tested-by: Thomas Arnhold <tho...@arnhold.org>
    (cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
    Reviewed-on: https://gerrit.libreoffice.org/12463
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
         <value>0.702804</value>
       </prop>
     </node>
+    <node oor:name="CR19" oor:op="replace">
+      <prop oor:name="FromUnit">
+        <value>EUR</value>
+      </prop>
+      <prop oor:name="ToUnit">
+        <value>LTL</value>
+      </prop>
+      <prop oor:name="Factor">
+        <value>3.45280</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="Calculate">
     <node oor:name="Other">
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index d13f1e6..8867c0a 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2563,7 +2563,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, 
double& rfRate, int& r
         { "CYP", 0.585274, 2 },
         { "SKK", 30.1260,  2 },
         { "EEK", 15.6466,  2 },
-        { "LVL", 0.702804, 2 }
+        { "LVL", 0.702804, 2 },
+        { "LTL", 3.45280,  2 }
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( 
aConvertTable[0] );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits