summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-11-29 13:01:00 +0000
committerKurt Zenker <kz@openoffice.org>2004-11-29 13:01:00 +0000
commit06bb71ac871b0ca2575a8b64917430be4aa8ac94 (patch)
treef7eb6dba8f7e5ebdd01d080c2cee4974f08d3d91
parent7df08726d9e32b623ca8cfb28dc030d5fe217894 (diff)
#i10000# merge corrected (tv)
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 55414272775f..dbb85f05f5df 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -2,9 +2,9 @@
*
* $RCSfile: WizardDialog.java,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kz $ $Date: 2004-11-27 12:10:26 $
+ * last change: $Author: kz $ $Date: 2004-11-29 14:01:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -363,8 +363,8 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", "HID:" + hid);
- insertButton("btnWizardHelp", null , propNames ,
- new Object[] { new Boolean(true), IButtonHeight, "HID:" + hid + 1, oWizardResource.getResText(UIConsts.RID_COMMON + 15), new Integer(iHelpPosX), new Integer(iBtnPosY), new Short((short)PushButtonType.HELP_value), ICurStep, new Short(curtabindex++), IButtonWidth });
+ insertButton("btnWizardHelp", HELP_ACTION_PERFORMED, propNames ,
+ new Object[] { new Boolean(true), IButtonHeight, "HID:" + (hid + 1), oWizardResource.getResText(UIConsts.RID_COMMON + 15), new Integer(iHelpPosX), new Integer(iBtnPosY), new Short((short)PushButtonType.HELP_value), ICurStep, new Short(curtabindex++), IButtonWidth });
insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames ,
new Object[] { new Boolean(false), IButtonHeight, "HID:" + (hid + 2) ,oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short)PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth });