From ff4cd9179686830b08bbd2083913f9b9543cde8b Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 25 Jun 2008 13:41:18 +0000 Subject: 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 --- wizards/com/sun/star/wizards/text/TextFieldHandler.java | 10 +++++----- 1 file 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"); -- cgit v1.2.3