#91710# several modifications

1 files changed, 10 insertions, 43 deletions

diff --git a/wizards/source/euro/ConvertRun.xba b/wizards/source/euro/ConvertRun.xba
index 2461ef293c0a..c1144b8a97f6 100644
--- a/wizards/source/euro/ConvertRun.xba
+++ b/wizards/source/euro/ConvertRun.xba
@@ -48,7 +48,6 @@ Dim m as Integer
 Dim MaxIndex as Integer
 	Listbox = DialogModel.lstSelection
 	If Ubound(Listbox.SelectedItems()) > -1 Then
-'		ToggleWindow(False)
 		EnableStep1DialogControls(False, False, False)
 		oSelRanges = oDocument.createInstance("com.sun.star.sheet.SheetCellRanges")
 
@@ -78,8 +77,8 @@ Dim MaxIndex as Integer
 				Wend
 			Next i
 		Else
-			a = -1
 			' Hard Formatation is selected
+			a = -1
 			For n = 0 To Ubound(Listbox.SelectedItems())
 				m = Listbox.SelectedItems(n)
 				RangeName = Listbox.StringItemList(m)
@@ -103,7 +102,6 @@ Dim MaxIndex as Integer
 		End If
 		oDocument.CurrentController.Select(oSelRanges)
 		EnableStep1DialogControls(True, True, True)
-'		ToggleWindow(True)
 	End If
 End Sub
 
@@ -136,7 +134,7 @@ Dim bDoEnableFrame as Boolean
 		.optDocRanges.Enabled = bDoEnableFrame
 		.optSelRange.Enabled = bDoEnableFrame
 	End With
-	' The CheckBox has the Value 'True' when the Controls in the Frame are disabled
+	' The CheckBox has the Value '1' when the Controls in the Frame are disabled
 	If bButtonsEnabled Then
 		bCurrIsSelected = Ubound(DialogModel.lstCurrencies.SelectedItems()) <> -1
 		' Enable GoOnButton only when Currency is selected
@@ -245,46 +243,16 @@ Dim OldCurrIndex as Integer
 Dim OldCurExtension(2) as String
 	oPreSelRange = AddSelectedRangeToSelRangesEnum()
 	bPreSelected = True
-
-'	bPreSelected =  CheckIfRangeisCurrency(oRange)
-'	If bPreSelected Then
-'		OldCurrSymbolList() = CurrSymbolList()
-'		OldCurExtension() = CurExtension()
-'		OldCurrIndex = CurrIndex
-'		For i = 0 To 11
-'			CurrIndex = i
-'			CurExtension(0) = LangIDValue(CurrIndex,0,2)
-'			CurExtension(1) = LangIDValue(CurrIndex,1,2)
-'			CurExtension(2) = LangIDValue(CurrIndex,2,2)
-'			InitializeCurrencyValues(CurrIndex)
-'			bPreSelected = CheckFormatType(oRange)
-'			If bPreSelected Then
-'				Exit For
-'			End If
-'		Next i
-'		If Not bPreSelected Then
-'			CurrIndex = OldCurrIndex
-'			CurrSymbolList() = OldCurrSymbolList()
-'			CurExtension() = OldCurExtension()
-'		End If
-'	End If
-
-'	If CurrIndex > -1 Then
-		If bPreSelected Then
-			DialogModel.optSelRange.State = 1
-			AddRangeToListbox(oPreSelRange)
-		Else
-			DialogModel.optCellTemplates.State  = 1
-			CreateStyleEnumeration()
-		End If
-'	End If
+	If bPreSelected Then
+		DialogModel.optSelRange.State = 1
+		AddRangeToListbox(oPreSelRange)
+	Else
+		DialogModel.optCellTemplates.State  = 1
+		CreateStyleEnumeration()
+	End If
 	EnableStep1DialogControls(True, bPreSelected, True)
 ' Todo: auf Integer umstellen
-'	If bPreselected Then
-		DialogModel.chkComplete.State = Not(Abs(bPreSelected)) '0
-'	Else
-'		DialogModel.chkComplete.State = 1
-'	End If
+	DialogModel.chkComplete.State = Not(Abs(bPreSelected))
 	DialogModel.optSelRange.Enabled = bPreSelected
 End Sub
 
@@ -304,7 +272,6 @@ Sub CheckRangeSelection(Optional oEvent)
 '	oPreSelRange = AddSelectedRangeToSelRangesEnum()
 '	bPreSelected = CheckFormatType(oRange)
  '	If bPreSelected Then
-'
 		EmptySelection()
 		AddRangeToListbox(oPreSelRange)
 '	End If