openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1859148 - in /openoffice/trunk/main: officecfg/registry/data/org/openoffice/Office/Calc.xcu sc/source/core/tool/interpr2.cxx
Date Sun, 12 May 2019 14:17:46 GMT
Author: mseidel
Date: Sun May 12 14:17:46 2019
New Revision: 1859148

URL: http://svn.apache.org/viewvc?rev=1859148&view=rev
Log:
OpenOffice Calc offers functions for converting from old national currencies to EURO.

Additional countries joined the euro area: Estonia (2011), Latvia (2014) and Lithuania (2015),
see:
https://www.ecb.europa.eu/euro/changeover/estonia/html/index.en.html
https://www.ecb.europa.eu/euro/changeover/latvia/html/index.en.html
https://www.ecb.europa.eu/euro/changeover/lithuania/html/index.en.html

This patch adds those currencies and conversion rates for CONVERT (Calc.xcu) and EUROCONVERT
(interpr2.cxx).

Modified:
    openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
    openoffice/trunk/main/sc/source/core/tool/interpr2.cxx

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu?rev=1859148&r1=1859147&r2=1859148&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu Sun May 12
14:17:46 2019
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -8,16 +8,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  ***********************************************************-->
 
 
@@ -175,7 +175,7 @@
 				<value>MTL</value>
 			</prop>
 			<prop oor:name="Factor">
-              <value>.429300</value>
+				<value>.429300</value>
 			</prop>
 		</node>
 		<node oor:name="CR15" oor:op="replace">
@@ -186,7 +186,7 @@
 				<value>CYP</value>
 			</prop>
 			<prop oor:name="Factor">
-              <value>.585274</value>
+				<value>.585274</value>
 			</prop>
 		</node>
 		<node oor:name="CR16" oor:op="replace">
@@ -200,6 +200,39 @@
 				<value>30.1260</value>
 			</prop>
 		</node>
+		<node oor:name="CR17" oor:op="replace">
+			<prop oor:name="FromUnit">
+				<value>EUR</value>
+			</prop>
+			<prop oor:name="ToUnit">
+				<value>EEK</value>
+			</prop>
+			<prop oor:name="Factor">
+				<value>15.6466</value>
+			</prop>
+		</node>
+		<node oor:name="CR18" oor:op="replace">
+			<prop oor:name="FromUnit">
+				<value>EUR</value>
+			</prop>
+			<prop oor:name="ToUnit">
+				<value>LVL</value>
+			</prop>
+			<prop oor:name="Factor">
+				<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">

Modified: openoffice/trunk/main/sc/source/core/tool/interpr2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/interpr2.cxx?rev=1859148&r1=1859147&r2=1859148&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/interpr2.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/interpr2.cxx Sun May 12 14:17:46 2019
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -2668,7 +2668,10 @@ sal_Bool lclConvertMoney( const String&
         { "SIT", 239.640,  2 },
         { "MTL", 0.429300, 2 },
         { "CYP", 0.585274, 2 },
-        { "SKK", 30.1260,  2 }
+        { "SKK", 30.1260,  2 },
+        { "EEK", 15.6466,  2 },
+        { "LVL", 0.702804, 2 },
+        { "LTL", 3.45280,  2 }
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );



Mime
View raw message