diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java index 4d9493d..dccc001 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.4 (2014-11-01) * */ @@ -385,11 +385,11 @@ public abstract class OptionsDialogBase extends DialogBase implements XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,configurations); - boolean bFound = false; short nConfig = getListBoxSelectedItem("Config"); int nStdConfigs = getListBoxStringItemList("Config").length - sConfigNames.length; if (nConfig>=nStdConfigs) { // only handle registry configurations int i = nConfig-nStdConfigs; + XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]); try { Object config = xNameAccess.getByName(sConfigNames[i]); XPropertySet xCfgProps = (XPropertySet) @@ -414,17 +414,16 @@ public abstract class OptionsDialogBase extends DialogBase implements if (buf.length()>0) { buf.append(';'); } buf.append(sURL).append("::").append(sFileName).append("::").append(sMediaType); } - filterData.put("Resources",buf.toString()); - - XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]); - bFound = true; + filterData.put("Resources",buf.toString()); } } catch (Exception e) { } } + else { // Standard configurations have no name + XPropertySetHelper.setPropertyValue(xProps,"ConfigName",""); + } XPropertySetHelper.setPropertyValue(xProps,"Config",nConfig); - if (!bFound) { XPropertySetHelper.setPropertyValue(xProps,"ConfigName",""); } return nConfig; }