From 2a47a124ff58d4d7d3e9cece02def9a38dba324b Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 26 Jan 2006 16:19:06 +0000 Subject: INTEGRATION: CWS qwizardspp2 (1.8.2); FILE MERGED 2006/01/19 11:07:24 bc 1.8.2.1: #i55714#when querying short name void is considered --- wizards/com/sun/star/wizards/common/Configuration.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index 18f1fead2075..4fe551ad95e1 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -4,9 +4,9 @@ * * $RCSfile: Configuration.java,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2005-12-28 17:14:30 $ + * last change: $Author: hr $ $Date: 2006-01-26 17:19:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -280,7 +280,11 @@ public abstract class Configuration { snames = xNameAccessNode.getElementNames(); String[] sdisplaynames = new String[snames.length]; for (int i = 0; i < snames.length; i++){ - sdisplaynames[i] = (String) Helper.getUnoPropertyValue(xNameAccessNode.getByName(snames[i]), _schildname); + Object oContent = Helper.getUnoPropertyValue(xNameAccessNode.getByName(snames[i]), _schildname); + if (!AnyConverter.isVoid(oContent)) + sdisplaynames[i] = (String) Helper.getUnoPropertyValue(xNameAccessNode.getByName(snames[i]), _schildname); + else + sdisplaynames[i] = snames[i]; } return sdisplaynames; } catch (Exception e) { -- cgit