diff options
| -rw-r--r-- | wizards/source/euro/Common.xba | 12 | ||||
| -rw-r--r-- | wizards/source/euro/ConvertRun.xba | 9 | ||||
| -rw-r--r-- | wizards/source/euro/DlgConvert.xdl | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba index fb972cd3a49c..2bc1fbc5f3b6 100644 --- a/wizards/source/euro/Common.xba +++ b/wizards/source/euro/Common.xba @@ -80,7 +80,6 @@ Dim nFormatLeading as Integer Dim bFormatLeading as Integer Dim bFormatNegRed as Integer Dim bFormatThousands as Integer -Dim aLocLocale As New com.sun.star.lang.Locale Dim i as Integer Dim aNewStr as String Dim iNumberFormat as Long @@ -106,9 +105,8 @@ Dim sOldCurrSymbol as String nFormatLeading = aFormat.LeadingZeros bFormatNegRed = aFormat.NegativeRed bFormatThousands = aFormat.ThousandsSeparator - aLocLocale = aFormat.Locale - aNewStr = oFormats.generateFormat( nSimpleKey, oLocale, bFormatThousands, bFormatNegRed, nFormatDecimals, nFormatLeading) - oObject.NumberFormat = Numberformat(oFormats, aNewStr, aLocLocale) + aNewStr = oFormats.generateFormat( nSimpleKey, aFormat.Locale, bFormatThousands, bFormatNegRed, nFormatDecimals, nFormatLeading) + oObject.NumberFormat = Numberformat(oFormats, aNewStr, aFormat.Locale) NOKEY: If Err <> 0 Then Resume CLERROR @@ -119,8 +117,12 @@ End Sub Function Numberformat( oFormats as Object, aFormatStr as String, oLocale as Object) Dim nRetkey +Dim l as String +Dim c as String nRetKey = oFormats.queryKey( aFormatStr, oLocale, True ) If nRetKey = -1 Then + l = oLocale.Language + c = oLocale.Country nRetKey = oFormats.addNew( aFormatStr, oLocale ) If nRetKey = -1 Then nRetKey = 0 End If @@ -232,7 +234,7 @@ Dim OldCurrIndex as Integer CreateRangeEnumeration(False) ElseIf DialogModel.optSelRange.State= 1 Then 'Preselected Range - CheckRangeSelection() +' CheckRangeSelection() End If EnableStep1DialogControls(True, True, True) End If diff --git a/wizards/source/euro/ConvertRun.xba b/wizards/source/euro/ConvertRun.xba index 9963a9d05d99..d917343d10b2 100644 --- a/wizards/source/euro/ConvertRun.xba +++ b/wizards/source/euro/ConvertRun.xba @@ -269,12 +269,9 @@ End Sub Sub CheckRangeSelection(Optional oEvent) ' Todo: Beim Startup werden die folgenden zwei Zeilen doppelt ausgeführt -' oPreSelRange = AddSelectedRangeToSelRangesEnum() -' bPreSelected = CheckFormatType(oRange) - ' If bPreSelected Then - EmptySelection() - AddRangeToListbox(oPreSelRange) -' End If + EmptySelection() + AddRangeToListbox(oPreSelRange) + oPreSelRange = AddSelectedRangeToSelRangesEnum() End Sub diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl index 284d34835643..9e768d74ec36 100644 --- a/wizards/source/euro/DlgConvert.xdl +++ b/wizards/source/euro/DlgConvert.xdl @@ -63,7 +63,7 @@ <dlg:text dlg:id="lblCurDocument" dlg:tab-index="26" dlg:left="16" dlg:top="141" dlg:width="208" dlg:height="8" dlg:page="3"/> <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.bmp"/> <dlg:text dlg:id="lblCurrencies" dlg:tab-index="28" dlg:left="170" dlg:top="39" dlg:width="89" dlg:height="8" dlg:value="lblCurrencies"/> - <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="29" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:34669" dlg:spin="true" dlg:linecount="9"> + <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="29" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:34669" dlg:spin="true" dlg:linecount="12"> <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Euro.ConvertRun.SelectCurrency" script:language="StarBasic"/> </dlg:menulist> <dlg:checkbox dlg:id="chkTextDocuments" dlg:tab-index="30" dlg:left="12" dlg:top="112" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:34680" dlg:value="chkTextDocuments" dlg:checked="false"/> |