diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-26 16:19:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-26 16:19:06 +0000 |
| commit | 2a47a124ff58d4d7d3e9cece02def9a38dba324b (patch) | |
| tree | be6fce735ef890e1351ca469184093a42606be39 /wizards | |
| parent | e379e3bf89fbca5a83f9781d592272e6fe46458f (diff) | |
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
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/common/Configuration.java | 10 |
1 files 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) { |