diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:34:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:34:43 +0000 |
| commit | 72167557234f5beba95b26ccc1556f4c7275fd7f (patch) | |
| tree | a951fce561353b744e8b0fb7d346eaec68f2909a /wizards | |
| parent | 37b27b5f5d8f3ae6865e3437da5ea58cdb83d1e2 (diff) | |
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:
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/tutorials/ShowInfoDialog.xba | 11 | ||||
| -rw-r--r-- | wizards/source/tutorials/TutorialCloseDialog.xdl | 2 | ||||
| -rw-r--r-- | wizards/source/tutorials/TutorialOpen.xba | 9 |
3 files changed, 13 insertions, 9 deletions
diff --git a/wizards/source/tutorials/ShowInfoDialog.xba b/wizards/source/tutorials/ShowInfoDialog.xba index 63496b2c533d..4bb0f608d9b6 100644 --- a/wizards/source/tutorials/ShowInfoDialog.xba +++ b/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) diff --git a/wizards/source/tutorials/TutorialCloseDialog.xdl b/wizards/source/tutorials/TutorialCloseDialog.xdl index 37a045b89104..edc1dae7e699 100644 --- a/wizards/source/tutorials/TutorialCloseDialog.xdl +++ b/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&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"/> diff --git a/wizards/source/tutorials/TutorialOpen.xba b/wizards/source/tutorials/TutorialOpen.xba index 3f8f0969e59b..a64a72507ba1 100644 --- a/wizards/source/tutorials/TutorialOpen.xba +++ b/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 |