Kaydet (Commit) 88e426a5 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS dba24e_SRC680 (1.17.98); FILE MERGED

2007/12/19 12:28:45 oj 1.17.98.1: #i84339# handle refcount by releasing the objects as early as possible, gc is not alsways the best way to trust :-)
üst 878b019a
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: WizardDialog.java,v $ * $RCSfile: WizardDialog.java,v $
* *
* $Revision: 1.17 $ * $Revision: 1.18 $
* *
* last change: $Author: kz $ $Date: 2006-07-06 14:32:56 $ * last change: $Author: vg $ $Date: 2008-01-29 08:44:30 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
************************************************************************/package com.sun.star.wizards.ui; ************************************************************************/
package com.sun.star.wizards.ui;
import java.beans.*; import java.beans.*;
...@@ -72,7 +73,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL ...@@ -72,7 +73,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
XItemEventBroadcaster xRoadmapBroadcaster; XItemEventBroadcaster xRoadmapBroadcaster;
String[] sRMItemLabels; String[] sRMItemLabels;
private Object oRoadmap; private Object oRoadmap;
private Object oRoadmapControl;
private XSingleServiceFactory xSSFRoadmap; private XSingleServiceFactory xSSFRoadmap;
public XIndexContainer xIndexContRoadmap; public XIndexContainer xIndexContRoadmap;
private Resource oWizardResource; private Resource oWizardResource;
...@@ -208,10 +208,10 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL ...@@ -208,10 +208,10 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
// xPropRoadmapModel.addPropertyChangeListener("CurrentItemID", new WizardDialog.RoadmapItemListener(this.xDialogModel)); // xPropRoadmapModel.addPropertyChangeListener("CurrentItemID", new WizardDialog.RoadmapItemListener(this.xDialogModel));
MethodInvocation mi = new MethodInvocation("itemStateChanged", this, com.sun.star.awt.ItemEvent.class); MethodInvocation mi = new MethodInvocation("itemStateChanged", this, com.sun.star.awt.ItemEvent.class);
guiEventListener.add("rdmNavi", EventNames.EVENT_ITEM_CHANGED, mi); getGuiEventListener().add("rdmNavi", EventNames.EVENT_ITEM_CHANGED, mi);
xRoadmapControl = this.xDlgContainer.getControl("rdmNavi"); xRoadmapControl = this.xDlgContainer.getControl("rdmNavi");
xRoadmapBroadcaster = (XItemEventBroadcaster) UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl); xRoadmapBroadcaster = (XItemEventBroadcaster) UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl);
xRoadmapBroadcaster.addItemListener((XItemListener) guiEventListener); xRoadmapBroadcaster.addItemListener((XItemListener) getGuiEventListener());
// xRoadmapControl = this.xDlgContainer.getControl("rdmNavi"); // xRoadmapControl = this.xDlgContainer.getControl("rdmNavi");
// xRoadmapBroadcaster.addItemListener(new RoadmapItemListener()); // xRoadmapBroadcaster.addItemListener(new RoadmapItemListener());
...@@ -388,9 +388,9 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL ...@@ -388,9 +388,9 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
// if the user used "escape" key to // if the user used "escape" key to
// close the dialog. // close the dialog.
MethodInvocation windowHidden = new MethodInvocation("windowHidden", this); MethodInvocation windowHidden = new MethodInvocation("windowHidden", this);
xWindow.addWindowListener((CommonListener)guiEventListener); xWindow.addWindowListener((CommonListener)getGuiEventListener());
String dialogName = (String)Helper.getUnoPropertyValue( xDialogModel, "Name" ); String dialogName = (String)Helper.getUnoPropertyValue( xDialogModel, "Name" );
guiEventListener.add( dialogName, EVENT_ACTION_PERFORMED , windowHidden); getGuiEventListener().add( dialogName, EVENT_ACTION_PERFORMED , windowHidden);
} catch (java.lang.Exception jexception) { } catch (java.lang.Exception jexception) {
jexception.printStackTrace(System.out); jexception.printStackTrace(System.out);
...@@ -559,7 +559,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL ...@@ -559,7 +559,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
} }
} }
private boolean wizardClosed = false;
/** /**
* called by the cancel button and * called by the cancel button and
* by the window hidden event. * by the window hidden event.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment