From 9c66ab4d21966878bad76dd1707c29100e03956e Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 6 Feb 2020 10:01:21 +0100 Subject: [PATCH] Added boolean option for inline control in extension --- .../openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java | 5 +++++ src/main/java/properties/Property.java | 5 +++++ src/main/oxt/writer2xhtml/Options.xcs | 1 + src/main/oxt/writer2xhtml/Options.xcu | 3 +++ .../W2PaginatedHTMLDialogs/DialogStrings_en_US.properties | 1 + .../W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties | 1 + .../oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl | 1 + src/main/oxt/writer2xhtml/description.xml | 2 +- 8 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/main/java/properties/Property.java 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 ff642ea..b5bf9dc 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -82,6 +82,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { loadTextFieldOption(xProps, "PageBreakStyle"); + loadCheckBoxOption(xProps, "InlineCSS"); + // Special content loadCheckBoxOption(xProps, "Notes"); @@ -139,6 +141,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute"); // Special content + saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline"); saveCheckBoxOption(xProps, helper, "Notes", "notes"); saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); @@ -200,6 +203,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size")); // Special content + setControlEnabled("InlineCSS",!isLocked("css_inline")); + setControlEnabled("Notes",!isLocked("notes")); setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); diff --git a/src/main/java/properties/Property.java b/src/main/java/properties/Property.java new file mode 100644 index 0000000..c88bdbf --- /dev/null +++ b/src/main/java/properties/Property.java @@ -0,0 +1,5 @@ +package properties; + +public interface Property { + +} diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index 47279b9..62ccfa7 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -30,6 +30,7 @@ + diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index 2c3e117..6e56742 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -180,6 +180,9 @@ true + + true + true diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties index e158060..dd1f511 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties @@ -130,3 +130,4 @@ 146.XhtmlOptions.MinimumLetterSpacing.Label=Minimum Letter Spacing 147.XhtmlOptions.MinimumLetterSpacing.HelpText=Minimum Letter Spacing 148.XhtmlOptions.MinLetterSpacing.HelpText=Minimum Letter Spacing Value +152.XhtmlOptions.InlineCSS.Label=Inline CSS diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties index 13a2261..69833d0 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties @@ -130,3 +130,4 @@ 146.XhtmlOptions.MinimumLetterSpacing.Label=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 147.XhtmlOptions.MinimumLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 148.XhtmlOptions.MinLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 +152.XhtmlOptions.InlineCSS.Label=Inline CSS diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index 02a79b3..09925f5 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -68,5 +68,6 @@ + \ No newline at end of file diff --git a/src/main/oxt/writer2xhtml/description.xml b/src/main/oxt/writer2xhtml/description.xml index 7e52727..80afa62 100644 --- a/src/main/oxt/writer2xhtml/description.xml +++ b/src/main/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - +