summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 13:43:17 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 13:43:17 +0000
commitbc3d9a356a914091de3dd5369e07f3cd0a566d62 (patch)
treecb957907fbbee75271963ea4b111bd5d0e80cc76 /wizards
parent722967c3622754779417ebf1a5dd6687a228064d (diff)
INTEGRATION: CWS rptwizard01 (1.13.126); FILE MERGED
2008/05/21 10:15:43 lla 1.13.126.3: RESYNC: (1.14-1.15); FILE MERGED 2008/02/15 07:36:44 lla 1.13.126.2: RESYNC: (1.13-1.14); FILE MERGED 2008/02/14 13:14:59 lla 1.13.126.1: #i86092# cleanups
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 8aff4046c444..59f2cd4790cf 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: UnoDialog.java,v $
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
* This file is part of OpenOffice.org.
*
@@ -26,7 +26,9 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************/package com.sun.star.wizards.ui;
+ ************************************************************************/
+
+package com.sun.star.wizards.ui;
import com.sun.star.awt.*;
import com.sun.star.awt.XReschedule;
@@ -65,7 +67,7 @@ public class UnoDialog implements EventNames {
public XPropertySet xPSetDlg;
public XVclWindowPeer xVclWindowPeer;
public Hashtable ControlList;
- public Resource oResource;
+ public Resource m_oResource;
public XWindowPeer xWindowPeer = null;
protected PeerConfig oPeerConfig;
@@ -101,8 +103,8 @@ public class UnoDialog implements EventNames {
public int getControlKey(Object EventObject, Hashtable ControlList) {
int iKey;
- XControl xControl = (XControl) UnoRuntime.queryInterface(XControl.class, EventObject);
- XControlModel xControlModel = xControl.getModel();
+ XControl xContrl = (XControl) UnoRuntime.queryInterface(XControl.class, EventObject);
+ XControlModel xControlModel = xContrl.getModel();
XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xControlModel);
try {
String sName = (String) xPSet.getPropertyValue("Name");
@@ -152,7 +154,7 @@ public class UnoDialog implements EventNames {
public Resource getResource(){
- return oResource;
+ return m_oResource;
}
public void setControlProperties(String ControlName, String[] PropertyNames, Object[] PropertyValues) {
@@ -823,7 +825,7 @@ public class UnoDialog implements EventNames {
}
public void addResourceHandler(String _Unit, String _Module) {
- oResource = new Resource(xMSF, _Unit, _Module);
+ m_oResource = new Resource(xMSF, _Unit, _Module);
}
public static short setInitialTabindex(int _istep) {