#94903#Toggling and saving improved

1 files changed, 12 insertions, 8 deletions

diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index c45c9beea17c..99e92829aa8e 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -140,7 +140,6 @@ End Function
 
 Sub	ImportStyles()
 Dim OldIndex as Integer
-Dim sImportPath as String
 	If Not bDebug Then
 		On Local Error GoTo WIZARDERROR
 	End If
@@ -149,19 +148,24 @@ Dim sImportPath as String
 	If CurIndex <> OldIndex Then	
 		ToggleLayoutPage(False)
 		oDocument.LockControllers
-		sImportPath = Styles(8,CurIndex)
-		bWithBackGraphic = LoadNewStyles(oDocument, oDialogModel, CurIndex, sImportPath, Styles(), TexturePath)
-		ControlCaptionsToStandardLayout()
+		SetImportStyle()
 		ToggleOptionButtons(oDialogModel, bWithBackGraphic)	
-		ConfigurePageStyle()	
 		ToggleLayoutPage(True, "lstStyles")	
-		oDocument.UnlockControllers
+		oDocument.UnlockControllers()
 	End If
 WIZARDERROR:
 	ShowErrorMessage(True)
 End Sub
 
 
+Sub SetImportStyle()
+Dim sImportPath as String
+	sImportPath = Styles(8,CurIndex)
+	bWithBackGraphic = LoadNewStyles(oDocument, oDialogModel, CurIndex, sImportPath, Styles(), TexturePath)
+	ControlCaptionsToStandardLayout()
+End Sub
+
+
 Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Object	
 	Select Case iLocFieldType
 		Case com.sun.star.sdbc.DataType.BIGINT
@@ -278,9 +282,9 @@ Sub ShowErrorMessage(bEndExecute as Boolean)
 		ToggleWindow(True)
 		Resume LOCERROR
 		LOCERROR:		
+		On Local Error Goto 0
 		If bEndExecute Then
 			DlgFormDB.EndExecute()	
 		End If
 	End If
-End Sub	
-</script:module>
\ No newline at end of file
+End Sub</script:module>
\ No newline at end of file