From 2c7fb816e6fc89bbb208d774a6ff97986f088379 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Mon, 27 Jan 2020 13:09:41 +0100 Subject: [PATCH] Added temporary text option for page breaks style --- .../comp/writer2xhtml/XhtmlOptionsDialog.java | 8 +++ src/main/oxt/writer2xhtml/Options.xcs | 1 + src/main/oxt/writer2xhtml/Options.xcu | 3 + .../W2PaginatedHTMLDialogs/XhtmlOptions.xdl | 67 ++++++++++--------- src/main/oxt/writer2xhtml/description.xml | 2 +- 5 files changed, 47 insertions(+), 34 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 247f19a..ff642ea 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -80,6 +80,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { loadTextFieldOption(xProps, "MinLetterSpacing"); + loadTextFieldOption(xProps, "PageBreakStyle"); + + // Special content loadCheckBoxOption(xProps, "Notes"); loadCheckBoxOption(xProps, "UseDublinCore"); @@ -126,6 +129,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { saveTextFieldOption(xProps, helper, "MinLetterSpacing", "min_letter_spacing"); + saveTextFieldOption(xProps, helper, "PageBreakStyle", "page_break_style"); + saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling"); @@ -188,6 +193,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("MinLetterSpacing",!isLocked("min_letter_spacing")); + setControlEnabled("PageBreakStyle",!isLocked("page_break_style")); + + setControlEnabled("ConvertToPx",!isLocked("convert_to_px")); setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size")); diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index f5008cd..47279b9 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -34,6 +34,7 @@ + diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index ae20f16..2c3e117 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -20,6 +20,9 @@ 0.15 + + height:3em;margin-top:1em;margin-bottom:1em;background-color:#f6f6f6; + 100 diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index 2407b99..02a79b3 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -1,10 +1,10 @@ - + - - - + + + @@ -19,27 +19,27 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + @@ -49,8 +49,8 @@ - - + + @@ -60,12 +60,13 @@ - - - - - - - + + + + + + + + - + \ No newline at end of file diff --git a/src/main/oxt/writer2xhtml/description.xml b/src/main/oxt/writer2xhtml/description.xml index 141434c..f8d908e 100644 --- a/src/main/oxt/writer2xhtml/description.xml +++ b/src/main/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - +