summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 13:41:18 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 13:41:18 +0000
commitff4cd9179686830b08bbd2083913f9b9543cde8b (patch)
tree59fae3f90f98bbf767f4e69551a08351280e6472 /wizards
parent43a45bcb76fc532fd3925ac7903de8c50b0131f7 (diff)
INTEGRATION: CWS rptwizard01 (1.6.126); FILE MERGED
2008/05/21 10:15:16 lla 1.6.126.2: RESYNC: (1.7-1.8); FILE MERGED 2008/02/14 13:14:59 lla 1.6.126.1: #i86092# cleanups
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/text/TextFieldHandler.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java
index 282ae54883c1..7d3c249f32b2 100644
--- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TextFieldHandler.java,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@@ -129,14 +129,13 @@ public class TextFieldHandler {
XDependentTextField[] xDependentFields;
Vector xDependentVector = new Vector();
if (xTextFieldsSupplier.getTextFields().hasElements()) {
- XPropertySet xPSet;
XEnumeration xEnum = xTextFieldsSupplier.getTextFields().createEnumeration();
while (xEnum.hasMoreElements()) {
Object oTextField = xEnum.nextElement();
XDependentTextField xDependent = (XDependentTextField) UnoRuntime.queryInterface(XDependentTextField.class, oTextField);
- xPSet = xDependent.getTextFieldMaster();
- if (xPSet.getPropertySetInfo().hasPropertyByName(_PropertyName)){
- Object oValue = xPSet.getPropertyValue(_PropertyName);
+ XPropertySet xPropertySet = xDependent.getTextFieldMaster();
+ if (xPropertySet.getPropertySetInfo().hasPropertyByName(_PropertyName)){
+ Object oValue = xPropertySet.getPropertyValue(_PropertyName);
// TODO replace the following comparison via com.sun.star.uno.Any.Type
if(AnyConverter.isString(oValue)){
if (_TypeName.equals("String")){
@@ -247,6 +246,7 @@ public class TextFieldHandler {
e.printStackTrace();
}}
+
public void removeUserFieldByContent(String _FieldContent) {
try {
XDependentTextField[] xDependentTextFields = getTextFieldsByProperty("Content", _FieldContent, "String");