openoffice-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1859149&view=rev
Log:
Merged r1859148 from trunk:

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/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
    openoffice/branches/AOO42X/main/sc/source/core/tool/interpr2.cxx

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 12 14:20:20 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148

Modified: openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu?rev=1859149&r1=1859148&r2=1859149&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
(original)
+++ openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/Calc.xcu
Sun May 12 14:20:20 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/branches/AOO42X/main/sc/source/core/tool/interpr2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sc/source/core/tool/interpr2.cxx?rev=1859149&r1=1859148&r2=1859149&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sc/source/core/tool/interpr2.cxx (original)
+++ openoffice/branches/AOO42X/main/sc/source/core/tool/interpr2.cxx Sun May 12 14:20:20 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