1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
From 7c4b2db21ef77b37daf234ac1ab9989234606a22 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Fri, 22 Jul 2022 22:12:02 +0200
Subject: Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro
TODO: switch defaults before 2023-01-01 in
i18npool/source/localedata/data/hr_HR.xml
Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
---
i18npool/source/localedata/data/hr_HR.xml | 8 ++++++++
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++++++++++
sc/source/core/tool/interpr2.cxx | 3 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml
index 0c493131e16b..4de83e5535cd 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -421,6 +421,14 @@
<CurrencyName>Hrvatska Kuna</CurrencyName>
<DecimalPlaces>2</DecimalPlaces>
</Currency>
+ <!-- TODO: switch defaults before 2023-01-01 -->
+ <Currency default="false" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
</LC_CURRENCY>
<LC_TRANSLITERATION>
<Transliteration unoid="SENTENCE_CASE"/>
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index a62d06512704..eda60fe6c434 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -228,6 +228,17 @@
<value>3.45280</value>
</prop>
</node>
+ <node oor:name="CR20" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>HRK</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>7.53450</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 31c42a4b728a..67fcd9f787f8 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3235,7 +3235,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& r
{ "SKK", 30.1260, 2 },
{ "EEK", 15.6466, 2 },
{ "LVL", 0.702804, 2 },
- { "LTL", 3.45280, 2 }
+ { "LTL", 3.45280, 2 },
+ { "HRK", 7.53450, 2 }
};
for (const auto & i : aConvertTable)
--
cgit v1.2.1
From b1a2f727ca99ecd3402d4b051b99cbfd24266e59 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Fri, 22 Jul 2022 22:17:11 +0200
Subject: Related: tdf#150011 Add HRK Croatian Kuna to Euro conversion wizard
Maybe just for completeness, it's removed from menu but might be
callable as macro.
Change-Id: Iade0be845186d3deb2f00f4aaa230c0b344cea72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137372
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
---
wizards/source/euro/Init.xba | 16 ++++++++++++++++
wizards/source/resources/resources_en_US.properties | 1 +
2 files changed, 17 insertions(+)
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 623a0a53be46..9f56c503a347 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -89,6 +89,7 @@ Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
Public sCurrLATVIAN as String
Public sCurrLITHUANIAN as String
+Public sCurrCROATIAN as String
Public sPrgsRETRIEVAL as String
Public sPrgsCONVERTING as String
@@ -214,6 +215,7 @@ Dim LocWorkPath as String
sCurrESTONIAN = GetResText("CURRENCIES_16")
sCurrLATVIAN = GetResText("CURRENCIES_17")
sCurrLITHUANIAN = GetResText("CURRENCIES_18")
+ sCurrCROATIAN = GetResText("CURRENCIES_19")
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText("STEP_ZERO_2")
@@ -393,6 +395,11 @@ Sub InitializeLanguages()
LangIDValue(18,0,1) = "LT"
LangIDValue(18,0,2) = "-427"
+' CURRENCIES_CROATIAN
+ LangIDValue(19,0,0) = "hr"
+ LangIDValue(19,0,1) = "HR"
+ LangIDValue(19,0,2) = "-41A"
+
End Sub
@@ -572,6 +579,15 @@ Dim i as Integer
CurrValue(18,4) = "Lt"
CurrValue(18,5) = "LTL"
+ CurrValue(19,0) = sCurrCROATIAN
+ ' real conversion rate
+ CurrValue(19,1) = 7.53450
+ ' rounded conversion rate
+ CurrValue(19,2) = 7.5
+ CurrValue(19,3) = "kn"
+ CurrValue(19,4) = "kn"
+ CurrValue(19,5) = "HRK"
+
i = -1
CurrSymbolList(0) = ""
CurrSymbolList(1) = ""
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index 32f9104e97e0..8649b2500e6a 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -448,6 +448,7 @@ CURRENCIES_15=Slovak Koruna
CURRENCIES_16=Estonian Kroon
CURRENCIES_17=Latvian Lats
CURRENCIES_18=Lithuanian Litas
+CURRENCIES_19=Croatian Kuna
STEP_LASTPAGE_0=Progress
STEP_LASTPAGE_1=Retrieving the relevant documents...
STEP_LASTPAGE_2=Converting the documents...
--
cgit v1.2.1
|
