From 2b7d161bf9869b7d073373241a330a118b87a79d Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 6 Feb 2020 10:56:26 +0100 Subject: [PATCH] Added options for svg and raster image embedding --- .../da/comp/writer2xhtml/XhtmlOptionsDialog.java | 8 +++++++- src/main/oxt/writer2xhtml/Options.xcs | 2 ++ src/main/oxt/writer2xhtml/Options.xcu | 6 ++++++ .../W2PaginatedHTMLDialogs/DialogStrings_en_US.properties | 2 ++ .../W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties | 2 ++ .../writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl | 4 +++- 6 files changed, 22 insertions(+), 2 deletions(-) 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 b5bf9dc..2d4fe74 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -83,7 +83,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { loadTextFieldOption(xProps, "PageBreakStyle"); loadCheckBoxOption(xProps, "InlineCSS"); - + loadCheckBoxOption(xProps, "EmbedImg"); + loadCheckBoxOption(xProps, "EmbedSVG"); // Special content loadCheckBoxOption(xProps, "Notes"); @@ -142,6 +143,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { // Special content saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline"); + saveCheckBoxOption(xProps, helper, "EmbedImg", "embed_svg"); + saveCheckBoxOption(xProps, helper, "EmbedSVG", "embed_img"); + saveCheckBoxOption(xProps, helper, "Notes", "notes"); saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); @@ -204,6 +208,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { // Special content setControlEnabled("InlineCSS",!isLocked("css_inline")); + setControlEnabled("EmbedImg",!isLocked("embed_img")); + setControlEnabled("EmbedSVG",!isLocked("embed_svg")); setControlEnabled("Notes",!isLocked("notes")); setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index 62ccfa7..2492cac 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -31,6 +31,8 @@ + + diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index 6e56742..0dda11e 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -183,6 +183,12 @@ true + + false + + + false + true diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties index dd1f511..38a4a56 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties @@ -131,3 +131,5 @@ 147.XhtmlOptions.MinimumLetterSpacing.HelpText=Minimum Letter Spacing 148.XhtmlOptions.MinLetterSpacing.HelpText=Minimum Letter Spacing Value 152.XhtmlOptions.InlineCSS.Label=Inline CSS +156.XhtmlOptions.EmbedSVG.Label=Embed SVG +160.XhtmlOptions.EmbedImg.Label=Embed images diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties index 69833d0..39f75e3 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties @@ -131,3 +131,5 @@ 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 +156.XhtmlOptions.EmbedSVG.Label=Embed SVG +160.XhtmlOptions.EmbedImg.Label=Embed images diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index 09925f5..bb613fd 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -68,6 +68,8 @@ - + + + \ No newline at end of file