INTEGRATION: CWS qwizardspp4 (1.7.36); FILE MERGED

2006/07/25 14:16:33 tv 1.7.36.2: RESYNC: (1.7-1.8); FILE MERGED
2006/07/17 15:52:23 tv 1.7.36.1: #i38801# #i42034# Writer Wizards can now be closed with ESC and closer

1 files changed, 9 insertions, 10 deletions

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index 4a9e32066..0eecc5142 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -143,20 +143,22 @@ public class FaxWizardDialogImpl extends FaxWizardDialog {
             //disable the document, so that the user cannot change anything:
             myFaxDoc.xFrame.getComponentWindow().setEnable(false);
             
-            //show the Wizard dialog:   
-            xWindow.setVisible(true);
+            executeDialog(myFaxDoc.xFrame);
+            removeTerminateListener(); 
+            closeDocument();
+            running = false;
             
         } catch (Exception exception) {
             removeTerminateListener();
             exception.printStackTrace(System.out);
+            running=false;
+            return;
         }
     }
 
 
     public void cancelWizard() {
-        xWindow.setVisible(false);
-        closeDocument();
-        removeTerminateListener();
+        xDialog.endExecute();
         running = false;
     }
 
@@ -193,9 +195,6 @@ public class FaxWizardDialogImpl extends FaxWizardDialog {
             bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false, "Template could not be saved to" + sPath);
             if (bSaveSuccess) {
                 saveConfiguration();
-                xWindow.setVisible(false);
-                closeDocument();
-                //myFaxDoc.xTextDocument.unlockControllers();
                 XInteractionHandler xIH = (XInteractionHandler) UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler"));
                 PropertyValue loadValues[] = new PropertyValue[4];
                 loadValues[0] = new PropertyValue();
@@ -228,7 +227,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog {
             e.printStackTrace();
         }
         finally {
-            removeTerminateListener();
+            xDialog.endExecute();
             running = false;
         }
 
@@ -236,7 +235,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog {
         
     public void closeDocument() {
         try {
-            xComponent.dispose();                       
+            //xComponent.dispose();                       
             XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, myFaxDoc.xFrame);
             xCloseable.close(false);
         } catch (CloseVetoException e) {