diff options
author | Matthias Seidel <mseidel@apache.org> | 2019-05-12 14:17:46 +0000 |
---|---|---|
committer | Matthias Seidel <mseidel@apache.org> | 2019-05-12 14:17:46 +0000 |
commit | cd3fffb5c3473a532aed43135d4404f10e3e31de (patch) | |
tree | 81b27168aaed2e41c9fc6fe0e74881e306bc3985 | |
parent | ee4b7394ff7c027e09d885e66056a405fc3b0291 (diff) |
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).
Notes
Notes:
prefer: 21c8b5815a21b6586fe13b12d00a9fb432c2aef4
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Calc.xcu | 37 | ||||
-rw-r--r-- | sc/source/core/tool/interpr2.cxx | 5 |
2 files changed, 39 insertions, 3 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu index 0dfff1e2f224..a7c93a427917 100644 --- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu @@ -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"> diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index d382f38d01fc..5a72927a57b2 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2668,7 +2668,10 @@ sal_Bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec { "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] ); |