From 216f143c8706ae97848d60318c0f6c1277dd8087 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 10 Jan 2020 20:28:15 +0100 Subject: [PATCH] New option is working --- .../org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java | 3 +++ .../openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java b/src/main/java/org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java index 47ea91c..13f1393 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java @@ -96,6 +96,7 @@ public class DialogAccess { } catch (Exception e) { // Will fail if the control does not exist + System.out.println(e); } } @@ -105,6 +106,8 @@ public class DialogAccess { return ((Short) xPropertySet.getPropertyValue("State")).shortValue(); } catch (Exception e) { + System.out.println(e); + // Will fail if the control does not exist or is not a checkbox return CHECKBOX_DONT_KNOW; } diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java index 68a2c76..247f19a 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -124,7 +124,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { helper.put("StyleSheetURL", "$(user)/writer2xhtml-styles.css"); } - saveTextFieldOption(xProps, "MinLetterSpacing"); + saveTextFieldOption(xProps, helper, "MinLetterSpacing", "min_letter_spacing"); saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); @@ -186,7 +186,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling")); setControlEnabled("ColumnScaling",!isLocked("column_scaling")); - // setControlEnabled("MinLetterSpacingValue",!isLocked("min_letter_spacing")); + setControlEnabled("MinLetterSpacing",!isLocked("min_letter_spacing")); setControlEnabled("ConvertToPx",!isLocked("convert_to_px")); setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));