diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2001-11-02 15:49:43 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2001-11-02 15:49:43 +0000 |
| commit | 77e70b7f98a813eedff8060976da33b6b837d0d5 (patch) | |
| tree | 547ebcaf1c42ecb172ec8525bdf4e2fc84c45b74 /wizards/source/euro/Common.xba | |
| parent | 6026a2786ee9f698e182a26968336fafba5b15e3 (diff) | |
#94168# Preselected Range handling now modified. Numberlocale
Diffstat (limited to 'wizards/source/euro/Common.xba')
| -rw-r--r-- | wizards/source/euro/Common.xba | 12 |
1 files changed, 7 insertions, 5 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 |