#88056# loading of Basic dialogs changed

3 files changed, 18 insertions, 8 deletions

diff --git a/wizards/source/tools/Listbox.xba b/wizards/source/tools/Listbox.xba
index 58f96499e2b4..0f69beab917e 100644
--- a/wizards/source/tools/Listbox.xba
+++ b/wizards/source/tools/Listbox.xba
@@ -23,29 +23,31 @@ End Sub
 Sub FormMoveSelected(aEvent as Object)
 	Call MoveSelectedListBox(oDialogModel.lstFields, oDialogModel.lstSelFields)
 	Call FormSetMoveRights()
+	oDialogModel.lstSelFields.Tag = True
 End Sub
 
 
 Sub FormMoveAll()
 	Call CopyListboxItems(oDialogModel.lstFields, oDialogModel.lstSelFields)
 	Call FormSetMoveRights()
-'	CmdNext.SetFocus
+	oDialogModel.lstSelFields.Tag = True
 End Sub
 
 
 Sub FormRemoveSelected()
 	Call MoveOrderedSelectedListbox(oDialogModel.lstFields, oDialogModel.lstSelFields, False)
 	Call FormSetMoveRights()
+	oDialogModel.lstSelFields.Tag = True
 End Sub
 
 
 Sub FormRemoveAll()
 	Call MoveOrderedSelectedListbox(oDialogModel.lstFields, oDialogModel.lstSelFields, True)
 	Call FormSetMoveRights()
+	oDialogModel.lstSelFields.Tag = 1
 End Sub
 
 
-
 Sub MoveSelectedListBox(SourceListbox as Object, TargetListbox as Object)
 Dim MaxCurTarget as Integer
 Dim MaxSourceSelected as Integer
@@ -220,6 +222,7 @@ Dim SelectCount as Integer
 	oDialogModel.cmdMoveAll.Enabled = FieldCount >=1
 	oDialogModel.cmdMoveSelected.Enabled = bIsFieldSelected
 	oDialogModel.cmdGoOn.Enabled = SelectCount>=1
+	' This flag is set to '1' when the lstSelFields has been modified 
 End Sub
 
 
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index d754468e4efd..2b60febc3b42 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -394,6 +394,7 @@ Function GetDocumentType(oDocument)
 		GetDocumentType() = "swriter"
 	ElseIf oDocument.SupportsService("com.sun.star.drawing.DrawingDocument") Then
 		GetDocumentType() = "sdraw"
+' Todo: Formel services einbinden		
 	End If
 End Function
 
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index 874afe2dd678..ab85b7438e88 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -142,13 +142,19 @@ Dim oCell as Object
 End Function
 
 
-Function LoadDialog(Libname as String, DialogName as String)
+Function LoadDialog(Libname as String, DialogName as String, Optional oLibContainer)
 Dim oLib as Object
-Dim oDialog as Object
-	DialogLibraries.loadLibrary(Libname)
-	oLib = DialogLibraries.GetByName(Libname)
-	oDialog = CreateUnoDialog(oLib, DialogName)
-	LoadDialog() = oDialog
+Dim oLibDialog as Object
+Dim oRuntimeDialog as Object
+
+	If IsMissing( oLibContainer ) then
+		oLibContainer = DialogLibraries
+	End If
+	oLibContainer.LoadLibrary(Libname)
+	oLib = oLibContainer.GetByName(Libname)
+	oLibDialog = oLib.GetByName(DialogName)
+	oRuntimeDialog = CreateUnoDialog(oLibDialog)
+	LoadDialog() = oRuntimeDialog
 End Function