INTEGRATION: CWS qwizardsbf6 (1.2.138); FILE MERGED

2005/08/17 09:28:42 tv 1.2.138.1: fixed event bindings, crash when ending tutorial and focus problems
Issue number:
Submitted by:
Reviewed by:

wizards/source/tutorials/ShowInfoDialog.xba

@@ -123,24 +123,23 @@ Sub ShowON()
 End Sub
 
 Sub ShowOFF()
-	On Local Error Goto NOPROPERTYSETINFO:
+	'On Local Error Goto NOPROPERTYSETINFO:
 		oWnd.setVisible(False)
 		oWnd2.setVisible(False)
 		oWnd3.setVisible(False)
-		oDoc.dispose()
+		'oDoc.dispose()
 	Exit Sub
-	NOPROPERTYSETINFO:
-
+	'NOPROPERTYSETINFO:
 End Sub
 
 Sub DisposeIDialog()
-    On Local Error Goto NOPROPERTYSETINFO:	
+    'On Local Error Goto NOPROPERTYSETINFO:	
 		oWnd3.dispose
 		oWnd2.dispose
 		oWnd.dispose
 		oDoc.dispose()	
 	Exit Sub
-	NOPROPERTYSETINFO:
+	'NOPROPERTYSETINFO:
 End Sub
 
 sub setImage(whatever as Object) 

wizards/source/tutorials/TutorialCloseDialog.xdl

@@ -6,7 +6,7 @@
  </dlg:styles>
  <dlg:bulletinboard>
   <dlg:button dlg:id="yesButton" dlg:tab-index="1" dlg:left="24" dlg:top="20" dlg:width="50" dlg:height="14" dlg:value="Yes">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.TutorialClose.CloseYes" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.TutorialClose.CloseYes?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:button dlg:id="noButton" dlg:tab-index="0" dlg:left="76" dlg:top="20" dlg:width="50" dlg:height="14" dlg:value="No" dlg:button-type="cancel"/>
   <dlg:text dlg:style-id="0" dlg:id="Label1" dlg:tab-index="2" dlg:left="6" dlg:top="6" dlg:width="120" dlg:height="8" dlg:value="Do you want to close this Tutorial?." dlg:align="center"/>

wizards/source/tutorials/TutorialOpen.xba

@@ -80,8 +80,13 @@ End Sub
 
 Sub OpenTutorial(aEvent)
 	completPath = files(Ubound(files()) - oListBox.getSelectedItemPos())	
-	Dim NoArgs() as new com.sun.star.beans.PropertyValue
-	StarDesktop.LoadComponentFromURL(completPath,"_default",0, NoArgs())
+	Dim Args(2) as new com.sun.star.beans.PropertyValue
+	Args(1).Name = "MacroExecutionMode"
+	Args(1).Value = com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE
+	Args(2).Name = "AsTemplate"
+	Args(2).Value = true
+
+	StarDesktop.LoadComponentFromURL(completPath,"_default",0, Args())
 	myOpenDialog.endExecute()
 End Sub