This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 10d685eaf0 Update Euro Converter (#168)
10d685eaf0 is described below
commit 10d685eaf05487ae305fb27895e68dff92c96120
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Wed Aug 7 23:47:50 2024 +0200
Update Euro Converter (#168)
* Update Euro Converter
* Additional changes for Euro Converter
* Add Latgalian
---
main/wizards/source/euro/ConvertRun.xba | 24 +++++-----
main/wizards/source/euro/DlgPassword.xdl | 8 ++--
main/wizards/source/euro/Hard.xba | 20 ++++----
main/wizards/source/euro/Init.xba | 79 ++++++++++++++++++++++++++++++--
main/wizards/source/euro/Soft.xba | 30 ++++++------
main/wizards/source/euro/Writer.xba | 12 ++---
main/wizards/source/euro/euro.src | 26 +++++++++--
7 files changed, 144 insertions(+), 55 deletions(-)
diff --git a/main/wizards/source/euro/ConvertRun.xba
b/main/wizards/source/euro/ConvertRun.xba
index bc0fd60f28..d2076fcd6e 100644
--- a/main/wizards/source/euro/ConvertRun.xba
+++ b/main/wizards/source/euro/ConvertRun.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"module.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,16 +9,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.
- *
+ *
***********************************************************-->
<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="ConvertRun" script:language="StarBasic">Option Explicit
@@ -131,7 +131,7 @@ Dim bCurrIsSelected as Boolean
Dim bObjectIsSelected as Boolean
Dim bConvertWholeDoc as Boolean
Dim bDoEnableFrame as Boolean
- bConvertWholeDoc = DialogModel.chkComplete.State = 1
+ bConvertWholeDoc = DialogModel.chkComplete.State = 1
bDoEnableFrame = bFrameEnabled And (NOT bConvertWholeDoc)
' Controls around the Selection Listbox
@@ -150,7 +150,7 @@ Dim bDoEnableFrame as Boolean
If bButtonsEnabled Then
bCurrIsSelected =
Ubound(DialogModel.lstCurrencies.SelectedItems()) <> -1
' Enable GoOnButton only when Currency is selected
- DialogModel.cmdGoOn.Enabled = bCurrIsSelected
+ DialogModel.cmdGoOn.Enabled = bCurrIsSelected
DialogModel.chkComplete.Enabled = bCurrIsSelected
If bDoEnableFrame AND DialogModel.cmdGoOn.Enabled Then
' If FrameControls are enabled, check if Listbox
is Empty
@@ -181,7 +181,7 @@ Dim oSheetRanges as Object
If DialogModel.optSelRange.State = 1 Then
SelectListItem()
End If
- SelList() =
DialogConvert.GetControl("lstSelection").SelectedItems()
+ SelList() =
DialogConvert.GetControl("lstSelection").SelectedItems()
If DialogModel.optCellTemplates.State = 1 Then
' Option 'Soft' Formatation is selected
AssignRangestoStyle(DialogModel.lstSelection.StringItemList(), SelList())
@@ -257,13 +257,13 @@ Dim OldCurrSymbolList(2) as String
Dim OldCurrIndex as Integer
Dim OldCurExtension(2) as String
oPreSelRange = AddSelectedRangeToSelRangesEnum()
-
+
DialogModel.chkComplete.State = Abs(Not(bPreSelected))
If bPreSelected Then
DialogModel.optSelRange.State = 1
AddRangeToListbox(oPreSelRange)
Else
- DialogModel.optCellTemplates.State = 1
+ DialogModel.optCellTemplates.State = 1
CreateStyleEnumeration()
End If
EnableStep1DialogControls(True, bPreSelected, True)
@@ -283,7 +283,7 @@ End Sub
Sub CheckRangeSelection(Optional oEvent)
EmptySelection()
AddRangeToListbox(oPreSelRange)
- oPreSelRange = AddSelectedRangeToSelRangesEnum()
+ oPreSelRange = AddSelectedRangeToSelRangesEnum()
End Sub
@@ -291,9 +291,9 @@ End Sub
' Returns 'True' or 'False'
Function FieldinList(LocList(), MaxIndex as integer, ByVal LocField ) As
Boolean
Dim i as integer
- LocField = Ucase(LocField)
+ LocField = UCase(LocField)
For i = Lbound(LocList()) to MaxIndex
- If Ucase(LocList(i)) = LocField then
+ If UCase(LocList(i)) = LocField then
FieldInList = True
Exit Function
End if
diff --git a/main/wizards/source/euro/DlgPassword.xdl
b/main/wizards/source/euro/DlgPassword.xdl
index 9c7b3e62db..ee55c93d26 100644
--- a/main/wizards/source/euro/DlgPassword.xdl
+++ b/main/wizards/source/euro/DlgPassword.xdl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"dialog.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,16 +9,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.
- *
+ *
***********************************************************-->
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog";
xmlns:script="http://openoffice.org/2000/script"; dlg:id="DlgPassword"
dlg:left="77" dlg:top="93" dlg:width="310" dlg:height="65" dlg:closeable="true"
dlg:moveable="true" dlg:title="DlgPassword">
<dlg:bulletinboard>
diff --git a/main/wizards/source/euro/Hard.xba
b/main/wizards/source/euro/Hard.xba
index fcd53d2949..f765278ba0 100644
--- a/main/wizards/source/euro/Hard.xba
+++ b/main/wizards/source/euro/Hard.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"module.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,18 +9,18 @@
* 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.
- *
+ *
***********************************************************-->
-<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Hard" script:language="StarBasic">REM ***** BASIC *****
+<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Hard" script:language="StarBasic">REM ***** BASIC *****
Option Explicit
@@ -88,8 +88,8 @@ Dim sStatustext as String
End If
Rangeindex = MaxIndex
End Sub
-
-
+
+
Function AddSheetRanges(oRanges as Object, r as Integer, oSheet as Object,
bAutopilot)
Dim RangeName as String
Dim AddtoList as Boolean
@@ -168,7 +168,7 @@ Dim oSelListbox as Object
If bRemove Then
If oSelRanges.HasbyName(RangeName) Then
oSelRanges.RemovebyName(RangeName)
-
oDocument.CurrentController.Select(oSelRanges)
+
oDocument.CurrentController.Select(oSelRanges)
End If
End If
If SwitchFormat Then
@@ -194,7 +194,7 @@ Sub ConvertCellCurrencies(oRange as Object)
Dim oValues as Object
Dim oCells as Object
Dim oCell as Object
- oValues = oRange.queryContentCells(com.sun.star.sheet.CellFlags.VALUE)
+ oValues = oRange.queryContentCells(com.sun.star.sheet.CellFlags.VALUE)
If (oValues.Count > 0) Then
oCells = oValues.Cells.createEnumeration
While oCells.hasMoreElements
@@ -217,7 +217,7 @@ Dim oFormatofObject() as Object
' Retrieve the Format of the Object
On Local Error GoTo NOKEY
oFormatofObject() = oFormats.getByKey(FormatObject.NumberFormat)
- On Local Error GoTo 0
+ On Local Error GoTo 0
CheckIfRangeIsCurrency = INT(oFormatofObject.Type) AND
com.sun.star.util.NumberFormat.CURRENCY
Exit Function
NOKEY:
diff --git a/main/wizards/source/euro/Init.xba
b/main/wizards/source/euro/Init.xba
index 0a3e428e66..4121559e75 100644
--- a/main/wizards/source/euro/Init.xba
+++ b/main/wizards/source/euro/Init.xba
@@ -89,6 +89,10 @@ Public sCurrSLOVENIAN as String
Public sCurrCYPRIOT as String
Public sCurrMALTESE as String
Public sCurrSLOVAK as String
+Public sCurrESTONIAN as String
+Public sCurrLATVIAN as String
+Public sCurrLITHUANIAN as String
+Public sCurrCROATIAN as String
Public sCurrUNKNOWN as String
Public sCurrSYSUNKNOWN as String
@@ -97,7 +101,7 @@ Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 15
+Public Const SBCOUNTRYCOUNT = 19
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -133,8 +137,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(15,5)
-Public LangIDValue(15,2,2) as String
+Public CurrValue(19,5)
+Public LangIDValue(19,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -213,8 +217,12 @@ Dim LocWorkPath as String
sCurrCYPRIOT = GetResText(1513)
sCurrMALTESE = GetResText(1514)
sCurrSLOVAK = GetResText(1515)
- sCurrUNKNOWN = GetResText(1516)
- sCurrSYSUNKNOWN = GetResText(1517)
+ sCurrESTONIAN = GetResText(1516)
+ sCurrLATVIAN = GetResText(1517)
+ sCurrLITHUANIAN = GetResText(1518)
+ sCurrCROATIAN = GetResText(1519)
+ sCurrUNKNOWN = GetResText(1520)
+ sCurrSYSUNKNOWN = GetResText(1521)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -375,6 +383,31 @@ Sub InitializeLanguages()
LangIDValue(15,0,1) = "SK"
LangIDValue(15,0,2) = "-41B"
+' CURRENCIES_ESTONIAN
+ LangIDValue(16,0,0) = "et"
+ LangIDValue(16,0,1) = "ET"
+ LangIDValue(16,0,2) = "-425"
+
+' CURRENCIES_LATVIAN
+ LangIDValue(17,0,0) = "lv"
+ LangIDValue(17,0,1) = "LV"
+ LangIDValue(17,0,2) = "-426"
+
+ 'Latgalian
+ LangIDValue(17,1,0) = "ltg"
+ LangIDValue(17,1,1) = "LV"
+ LangIDValue(17,1,2) = "-64B"
+
+' CURRENCIES_LITHUANIAN
+ LangIDValue(18,0,0) = "lt"
+ 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
@@ -527,6 +560,42 @@ Dim i as Integer
CurrValue(15,4) = "Sk"
CurrValue(15,5) = "SKK"
+ CurrValue(16,0) = sCurrESTONIAN
+ ' real conversion rate
+ CurrValue(16,1) = 15.6466
+ ' rounded conversion rate
+ CurrValue(16,2) = 15
+ CurrValue(16,3) = "kr"
+ CurrValue(16,4) = "kr"
+ CurrValue(16,5) = "EEK"
+
+ CurrValue(17,0) = sCurrLATVIAN
+ ' real conversion rate
+ CurrValue(17,1) = 0.702804
+ ' rounded conversion rate
+ CurrValue(17,2) = 0.7
+ CurrValue(17,3) = "Ls"
+ CurrValue(17,4) = "Ls"
+ CurrValue(17,5) = "LVL"
+
+ CurrValue(18,0) = sCurrLITHUANIAN
+ ' real conversion rate
+ CurrValue(18,1) = 3.45280
+ ' rounded conversion rate
+ CurrValue(18,2) = 3.5
+ CurrValue(18,3) = "Lt"
+ 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/main/wizards/source/euro/Soft.xba
b/main/wizards/source/euro/Soft.xba
index 779e5fcd9b..7c52df2e42 100644
--- a/main/wizards/source/euro/Soft.xba
+++ b/main/wizards/source/euro/Soft.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"module.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,19 +9,19 @@
* 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.
- *
+ *
***********************************************************-->
<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Soft" script:language="StarBasic">Option Explicit
-REM ***** BASIC *****
+REM ***** BASIC *****
Sub CreateStyleEnumeration()
@@ -45,7 +45,7 @@ Dim Stylename as String
If CheckFormatType(oStyle) Then
If Not bAddToListBox Then
AddSingleItemToListbox(DialogModel.lstSelection, Stylename)
- Else
+ Else
SwitchNumberFormat(ostyle, oFormats, sEuroSign)
End If
StyleIndex = StyleIndex + 1
@@ -117,7 +117,7 @@ Dim CellCountString as String
oRanges = osheet.CellFormatRanges.CreateEnumeration
While oRanges.hasMoreElements
oRange = oRanges.NextElement
- If oRange.getPropertyState("NumberFormat") =
1 Then
+ If oRange.getPropertyState("NumberFormat") =
1 Then
If oRange.CellStyle = CurStyleName Then
oRangeAddress = oRange.RangeAddress
RangeName =
RetrieveRangeNamefromAddress(oRange)
@@ -128,7 +128,7 @@ Dim CellCountString as String
Wend
Next i
If StyleCellCount > 0 Then
- TotCellCount = TotCellCount + StyleCellCount
+ TotCellCount = TotCellCount + StyleCellCount
RangeString = RTrimStr(RangeString,",")
RangeString = RangeString & "</RANGES>"
CellCountString = "<CELLCOUNT>" &
StyleCellCount & "</CELLCOUNT"
@@ -137,7 +137,7 @@ Dim CellCountString as String
End If
AssignString = ReplaceString(AssignString,
"<DEFINED>TRUE</DEFINED>",
"<DEFINED>FALSE</DEFINED>")
StyleRangeAssignmentList(n) = AssignString
-End Sub
+End Sub
' deletes a styletemplate from the Collection that selects the ranges
@@ -156,12 +156,12 @@ Dim MaxIndex as Integer
For i = 0 To MaxIndex
RangeName = StyleRangeList(i)
If oSelRanges.HasbyName(RangeName) Then
- oSelRanges.RemovebyName(RangeName)
+ oSelRanges.RemovebyName(RangeName)
End If
Next i
AssignString = ReplaceString(AssignString,
"<SELECTED>FALSE</SELECTED>",
"<SELECTED>TRUE</SELECTED>")
StyleRangeAssignmentList(n) = AssignString
-End Sub
+End Sub
Function RetrieveRangeNamefromAddress(oRange as Object) as String
@@ -169,7 +169,7 @@ Dim Rangename as String
Dim oAddressRanges as Object
oAddressRanges =
oDocument.createInstance("com.sun.star.sheet.SheetCellRanges")
oAddressRanges.InsertbyName("",oRange)
- Rangename = oAddressRanges.RangeAddressesasString
+ Rangename = oAddressRanges.RangeAddressesasString
' Msgbox "Adresse: " & oRangeAddress.StartColumn &
" ; " & oRangeAddress.EndColumn & " ; " &
oRangeAddress.StartRow & " ; " & oRangeAddress.EndRow &
chr(13) & RangeName
' oAddressRanges.RemovebyName(RangeName)
RetrieveRangeNamefromAddress = Rangename
@@ -177,7 +177,7 @@ End Function
' creates a sheet object from an according sectionname
-Function RetrieveSheetoutofRangeName(TableText as String)
+Function RetrieveSheetoutofRangeName(TableText as String)
Dim DescriptionList() as String
Dim SheetName as String
Dim MaxIndex as integer
@@ -191,7 +191,7 @@ End Function
' creates a rangeobject from an according rangename
-Function RetrieveRangeoutofRangeName(TableText as String)
+Function RetrieveRangeoutofRangeName(TableText as String)
oSheet = RetrieveSheetoutofRangeName(TableText)
oRange = oSheet.GetCellRangebyName(TableText)
RetrieveRangeoutofRangeName = oRange
@@ -238,7 +238,7 @@ Dim MaxIndex as Integer
SwitchNumberFormat(ostyle, oFormats, sEuroSign)
StyleRangeAssignmentList(n) = ""
l = GetItemPos(oSelListBox.Model, CurStyleName)
- oSelListbox.RemoveItems(l,1)
+ oSelListbox.RemoveItems(l,1)
Next
End Sub
diff --git a/main/wizards/source/euro/Writer.xba
b/main/wizards/source/euro/Writer.xba
index 42b1e9caca..4088d1cbd0 100644
--- a/main/wizards/source/euro/Writer.xba
+++ b/main/wizards/source/euro/Writer.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"module.dtd">
<!--***********************************************************
- *
+ *
* 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
@@ -9,18 +9,18 @@
* 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.
- *
+ *
***********************************************************-->
-<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Writer" script:language="StarBasic">REM ***** BASIC *****
+<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Writer" script:language="StarBasic">REM ***** BASIC *****
Sub ConvertWriterTables()
@@ -34,7 +34,7 @@ Dim oCell as Object
While oParagraphs.HasMoreElements
oPara = oParagraphs.NextElement
If NOT
oPara.supportsService("com.sun.star.text.Paragraph") Then
- ' Note: As cells might be splitted or merged
+ ' Note: As cells might be split or merged
' you cannot refer to them via their indices
sCellNames = oPara.CellNames
For i = 0 To Ubound(sCellNames)
diff --git a/main/wizards/source/euro/euro.src
b/main/wizards/source/euro/euro.src
index 136d63e9c0..a001594f3d 100644
--- a/main/wizards/source/euro/euro.src
+++ b/main/wizards/source/euro/euro.src
@@ -42,7 +42,7 @@ Text [ en-US ] = "~Help" ;
String STEP_ZERO + 2
{
-Text [ en-US ] = "<< ~Back" ;
+Text [ en-US ] = "< ~Back" ;
};
String STEP_ZERO + 3
@@ -67,7 +67,7 @@ Text [ en-US ] = "Currencies:" ;
String STEP_ZERO + 7
{
-Text [ en-US ] = "C~ontinue >>" ;
+Text [ en-US ] = "C~ontinue >" ;
};
String STEP_ZERO + 8
@@ -412,11 +412,31 @@ Text [ en-US ] = "Slovak Koruna" ;
String CURRENCIES + 16
{
-Text [ en-US ] = "The currency set for the document is not a European
currency!" ;
+Text [ en-US ] = "Estonian Kroon" ;
};
String CURRENCIES + 17
{
+Text [ en-US ] = "Latvian Lats" ;
+};
+
+String CURRENCIES + 18
+{
+Text [ en-US ] = "Lithuanian Litas" ;
+};
+
+String CURRENCIES + 19
+{
+Text [ en-US ] = "Croatian Kuna" ;
+};
+
+String CURRENCIES + 20
+{
+Text [ en-US ] = "The currency set for the document is not a European
currency!" ;
+};
+
+String CURRENCIES + 21
+{
Text [ en-US ] = "The language set for your operating system is not a language
of the European Monetary Union." ;
};
