From 3f98eaaa3c711c5d6ac5f86ac2be3c756f706a2d Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 10 Mar 2020 14:03:08 +0100 Subject: [PATCH] Removed column scaling option --- .../comp/writer2xhtml/EpubOptionsDialog.java | 7 - .../da/comp/writer2xhtml/W2XRegistration.java | 10 +- .../comp/writer2xhtml/XhtmlOptionsDialog.java | 7 - .../writer2xhtml/XhtmlOptionsDialogCalc.java | 181 ------------------ src/main/java/w2phtml/project.properties | 4 +- src/main/java/w2phtml/xhtml/XhtmlConfig.java | 7 +- .../w2phtml/xhtml/content/ListParser.java | 1 + .../w2phtml/xhtml/content/TableParser.java | 18 +- .../java/w2phtml/xhtml/style/StyleParser.java | 5 - src/main/oxt/writer2xhtml/Options.xcs | 2 - src/main/oxt/writer2xhtml/Options.xcu | 6 - .../W2PaginatedHTMLDialogs/XhtmlOptions.xdl | 3 - .../W2PaginatedHTMLDialogs2/EpubOptions.xdl | 5 +- 13 files changed, 16 insertions(+), 240 deletions(-) delete mode 100644 src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java index e71f7fa..206eb08 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java @@ -77,10 +77,6 @@ public class EpubOptionsDialog extends OptionsDialogBase { if (nScaling<=1) { // Workaround for an obscure bug in the extension manager setNumericFieldValue("Scaling",100); } - int nColumnScaling = loadNumericOption(xProps, "ColumnScaling"); - if (nColumnScaling<=1) { - setNumericFieldValue("ColumnScaling",100); - } loadCheckBoxOption(xProps, "RelativeFontSize"); loadNumericOption(xProps, "FontScaling"); int nFontScaling = loadNumericOption(xProps, "FontScaling"); @@ -138,7 +134,6 @@ public class EpubOptionsDialog extends OptionsDialogBase { } saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); - saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling"); saveCheckBoxOption(xProps, helper, "RelativeFontSize", "relative_font_size"); saveNumericOptionAsPercentage(xProps, helper, "FontScaling", "font_scaling"); saveCheckBoxOption(xProps, helper, "UseDefaultFont", "use_default_font"); @@ -242,8 +237,6 @@ public class EpubOptionsDialog extends OptionsDialogBase { // Style setControlEnabled("ScalingLabel",!isLocked("scaling")); setControlEnabled("Scaling",!isLocked("scaling")); - setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling")); - setControlEnabled("ColumnScaling",!isLocked("column_scaling")); boolean bRelativeFontSize = getCheckBoxStateAsBoolean("RelativeFontSize"); setControlEnabled("RelativeFontSize",!isLocked("relative_font_size")); diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/W2XRegistration.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/W2XRegistration.java index 22537d0..4d7ad10 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/W2XRegistration.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/W2XRegistration.java @@ -89,13 +89,7 @@ public class W2XRegistration { multiFactory, regKey); } - else if (implName.equals(XhtmlOptionsDialogCalc.__implementationName)) { - xSingleServiceFactory = FactoryHelper.getServiceFactory(XhtmlOptionsDialogCalc.class, - XhtmlOptionsDialogCalc.__serviceName, - multiFactory, - regKey); - } - else if (implName.equals(EpubOptionsDialog.__implementationName)) { + else if (implName.equals(EpubOptionsDialog.__implementationName)) { xSingleServiceFactory = FactoryHelper.getServiceFactory(EpubOptionsDialog.class, EpubOptionsDialog.__serviceName, multiFactory, @@ -149,8 +143,6 @@ public class W2XRegistration { XhtmlOptionsDialog.__serviceName, regKey) & FactoryHelper.writeRegistryServiceInfo(XhtmlOptionsDialogMath.__implementationName, XhtmlOptionsDialogMath.__serviceName, regKey) & - FactoryHelper.writeRegistryServiceInfo(XhtmlOptionsDialogCalc.__implementationName, - XhtmlOptionsDialogCalc.__serviceName, regKey) & FactoryHelper.writeRegistryServiceInfo(EpubOptionsDialog.__implementationName, EpubOptionsDialog.__serviceName, regKey) & FactoryHelper.writeRegistryServiceInfo(Epub3OptionsDialog.__implementationName, 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 651d3c5..1977faf 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -72,10 +72,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { if (nScaling<=1) { // Workaround for an obscure bug in the extension manager setNumericFieldValue("Scaling",100); } - int nColumnScaling = loadNumericOption(xProps, "ColumnScaling"); - if (nColumnScaling<=1) { - setNumericFieldValue("ColumnScaling",100); - } loadCheckBoxOption(xProps, "OriginalImageSize"); loadTextFieldOption(xProps, "MinLetterSpacing"); @@ -139,7 +135,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); - saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling"); saveCheckBoxOption(xProps, "OriginalImageSize"); // TODO: Support "relative" helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute"); @@ -200,8 +195,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { // Style setControlEnabled("ScalingLabel",!isLocked("scaling")); setControlEnabled("Scaling",!isLocked("scaling")); - setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling")); - setControlEnabled("ColumnScaling",!isLocked("column_scaling")); setControlEnabled("MinLetterSpacing",!isLocked("min_letter_spacing")); diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java deleted file mode 100644 index 2c71c93..0000000 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java +++ /dev/null @@ -1,181 +0,0 @@ -/************************************************************************ - * - * XhtmlOptionsDialogCalc.java - * - * Copyright: 2002-2014 by Henrik Just - * - * This file is part of Writer2LaTeX. - * - * Writer2LaTeX is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Writer2LaTeX is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Writer2LaTeX. If not, see . - * - * Version 1.4 (2014-09-25) - * - */ - -package org.openoffice.da.comp.writer2xhtml; - -import com.sun.star.awt.XDialog; -import com.sun.star.beans.XPropertySet; -import com.sun.star.uno.XComponentContext; - -import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; -import org.openoffice.da.comp.w2lcommon.filter.OptionsDialogBase; - -/** This class provides a uno component which implements a filter ui for the - * Xhtml export in Calc - */ -public class XhtmlOptionsDialogCalc extends OptionsDialogBase { - - /** The component will be registered under this name. - */ - public static String __serviceName = "org.openoffice.da.writerxhtml.XhtmlOptionsDialogCalc"; - - /** The component should also have an implementation name. - */ - public static String __implementationName = "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogCalc"; - - public String getDialogLibraryName() { return "W2PaginatedHTMLDialogs"; } - - /** Return the name of the dialog within the library - */ - public String getDialogName() { return "XhtmlOptionsCalc"; } - - /** Return the name of the registry path - */ - public String getRegistryPath() { - return "/org.openoffice.da.Writer2xhtml.Options/XhtmlOptionsCalc"; - } - - /** Create a new XhtmlOptionsDialogCalc */ - public XhtmlOptionsDialogCalc(XComponentContext xContext) { - super(xContext); - xMSF = W2XRegistration.xMultiServiceFactory; - } - - /** Load settings from the registry to the dialog */ - protected void loadSettings(XPropertySet xProps) { - // Style - loadConfig(xProps); - loadCheckBoxOption(xProps, "ConvertToPx"); - int nScaling = loadNumericOption(xProps, "Scaling"); - if (nScaling<=1) { // Workaround for an obscure bug in the extension manager - setNumericFieldValue("Scaling",100); - } - int nColumnScaling = loadNumericOption(xProps, "ColumnScaling"); - if (nColumnScaling<=1) { - setNumericFieldValue("ColumnScaling",100); - } - loadCheckBoxOption(xProps, "OriginalImageSize"); - - // Special content - loadCheckBoxOption(xProps, "Notes"); - loadCheckBoxOption(xProps, "UseDublinCore"); - - // Sheets - loadCheckBoxOption(xProps, "DisplayHiddenSheets"); - loadCheckBoxOption(xProps, "DisplayHiddenRowsCols"); - loadCheckBoxOption(xProps, "DisplayFilteredRowsCols"); - loadCheckBoxOption(xProps, "ApplyPrintRanges"); - loadCheckBoxOption(xProps, "UseTitleAsHeading"); - loadCheckBoxOption(xProps, "UseSheetNamesAsHeadings"); - - // Files - loadCheckBoxOption(xProps, "CalcSplit"); - loadCheckBoxOption(xProps, "SaveImagesInSubdir"); - - updateLockedOptions(); - enableControls(); - } - - /** Save settings from the dialog to the registry and create FilterData */ - protected void saveSettings(XPropertySet xProps, PropertyHelper helper) { - // Style - short nConfig = saveConfig(xProps, helper); - if (nConfig==0) { - helper.put("ConfigURL","*default.xml"); - } - else if (nConfig==1) { - helper.put("ConfigURL","$(user)/writer2xhtml.xml"); - helper.put("AutoCreate","true"); - } - - saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); - saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); - saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling"); - saveCheckBoxOption(xProps, "OriginalImageSize"); - // TODO: Support "relative" - helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute"); - - // Special content - saveCheckBoxOption(xProps, helper, "Notes", "notes"); - saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); - - // Sheets - saveCheckBoxOption(xProps, helper, "DisplayHiddenSheets", "display_hidden_sheets"); - saveCheckBoxOption(xProps, helper, "DisplayHiddenRowsCols", "display_hidden_rows_cols"); - saveCheckBoxOption(xProps, helper, "DisplayFilteredRowsCols", "display_filtered_rows_cols"); - saveCheckBoxOption(xProps, helper, "ApplyPrintRanges", "apply_print_ranges"); - saveCheckBoxOption(xProps, helper, "UseTitleAsHeading", "use_title_as_heading"); - saveCheckBoxOption(xProps, helper, "UseSheetNamesAsHeadings", "use_sheet_names_as_headings"); - - // Files - saveCheckBoxOption(xProps, helper, "CalcSplit", "calc_split"); - saveCheckBoxOption(xProps, helper, "SaveImagesInSubdir", "save_images_in_subdir"); - - } - - // Implement XDialogEventHandler - public boolean callHandlerMethod(XDialog xDialog, Object event, String sMethod) { - if (sMethod.equals("ConfigChange")) { - updateLockedOptions(); - enableControls(); - } - return true; - } - - public String[] getSupportedMethodNames() { - String[] sNames = { "ConfigChange" }; - return sNames; - } - - private void enableControls() { - // Style - setControlEnabled("ConvertToPx",!isLocked("convert_to_px")); - setControlEnabled("ScalingLabel",!isLocked("scaling")); - setControlEnabled("Scaling",!isLocked("scaling")); - setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling")); - setControlEnabled("ColumnScaling",!isLocked("column_scaling")); - setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size")); - - // Special content - setControlEnabled("Notes",!isLocked("notes")); - setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); - - // Sheets - setControlEnabled("DisplayHiddenSheets", !isLocked("display_hidden_sheets")); - setControlEnabled("DisplayHiddenRowsCols", !isLocked("display_hidden_rows_cols")); - setControlEnabled("DisplayFilteredRowsCols", !isLocked("display_filtered_rows_cols")); - setControlEnabled("ApplyPrintRanges", !isLocked("apply_print_ranges")); - setControlEnabled("UseTitleAsHeading", !isLocked("use_title_as_heading")); - setControlEnabled("UseSheetNamesAsHeadings", !isLocked("use_sheet_names_as_headings")); - - // Files - setControlEnabled("CalcSplit",!isLocked("calc_split")); - setControlEnabled("SaveImagesInSubdir",!isLocked("save_images_in_subdir")); - } - -} - - - diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 7a9d2ad..5c2b35e 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Mon Mar 09 15:37:23 CET 2020 +#Tue Mar 10 14:02:00 CET 2020 releaseVersion=0.5.4 -releaseDate=15\:37\:23 09-03-2020 +releaseDate=14\:02\:00 10-03-2020 diff --git a/src/main/java/w2phtml/xhtml/XhtmlConfig.java b/src/main/java/w2phtml/xhtml/XhtmlConfig.java index f0968dd..4b88afe 100644 --- a/src/main/java/w2phtml/xhtml/XhtmlConfig.java +++ b/src/main/java/w2phtml/xhtml/XhtmlConfig.java @@ -40,7 +40,7 @@ import w2phtml.util.Misc; public class XhtmlConfig extends w2phtml.base.ConfigBase { // Implement configuration methods - protected int getOptionCount() { return 65; } + protected int getOptionCount() { return 64; } protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; } // Override setOption: To be backwards compatible, we must accept options @@ -127,7 +127,7 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { private static final int DISPLAY_HIDDEN_TEXT = 25; private static final int CONVERT_TO_PX = 26; private static final int SCALING = 27; - private static final int COLUMN_SCALING = 28; + private static final int CSV_METADATA = 28; private static final int RELATIVE_FONT_SIZE = 29; private static final int FONT_SCALING = 30; private static final int FLOAT_OBJECTS = 31; @@ -163,7 +163,6 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { private static final int MIN_LETTER_SPACING = 61; private static final int PAGE_BREAK_STYLE = 62; private static final int ALIGN_SPLITS_TO_PAGES = 63; - private static final int CSV_METADATA = 64; protected ComplexOption xheading = addComplexOption("heading-map"); protected ComplexOption xpar = addComplexOption("paragraph-map"); @@ -225,7 +224,6 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { options[DISPLAY_HIDDEN_TEXT] = new BooleanOption("display_hidden_text", "false"); options[CONVERT_TO_PX] = new BooleanOption("convert_to_px","false"); options[SCALING] = new Option("scaling","100%"); - options[COLUMN_SCALING] = new Option("column_scaling","100%"); options[RELATIVE_FONT_SIZE] = new BooleanOption("relative_font_size","false"); options[FONT_SCALING] = new Option("font_scaling","100%"); options[FLOAT_OBJECTS] = new BooleanOption("float_objects","true"); @@ -410,7 +408,6 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { public boolean displayHiddenText() { return ((BooleanOption) options[DISPLAY_HIDDEN_TEXT]).getValue(); } public boolean xhtmlConvertToPx() { return ((BooleanOption) options[CONVERT_TO_PX]).getValue(); } public String getXhtmlScaling() { return options[SCALING].getString(); } - public String getXhtmlColumnScaling() { return options[COLUMN_SCALING].getString(); } public boolean relativeFontSize() { return ((BooleanOption) options[RELATIVE_FONT_SIZE]).getValue(); } public String fontScaling() { return options[FONT_SCALING].getString(); } public boolean xhtmlFloatObjects() { return ((BooleanOption) options[FLOAT_OBJECTS]).getValue(); } diff --git a/src/main/java/w2phtml/xhtml/content/ListParser.java b/src/main/java/w2phtml/xhtml/content/ListParser.java index 5d8e0b7..efd5fcd 100644 --- a/src/main/java/w2phtml/xhtml/content/ListParser.java +++ b/src/main/java/w2phtml/xhtml/content/ListParser.java @@ -264,6 +264,7 @@ public class ListParser extends Parser { } } // Still here? - traverse block text as usual! + //TODO: getTextParser().parseText(onode,nLevel,styleName,hnode); } diff --git a/src/main/java/w2phtml/xhtml/content/TableParser.java b/src/main/java/w2phtml/xhtml/content/TableParser.java index 8926aa0..f181c89 100644 --- a/src/main/java/w2phtml/xhtml/content/TableParser.java +++ b/src/main/java/w2phtml/xhtml/content/TableParser.java @@ -225,7 +225,7 @@ public class TableParser extends Parser { for (int nCol=0; nColStyleInfo object to add information to diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index c71e501..c2cd2c6 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -35,7 +35,6 @@ - @@ -62,7 +61,6 @@ - diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index 9541a16..49e4037 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -23,9 +23,6 @@ height:3em;margin-top:1em;margin-bottom:1em;background-color:#f6f6f6; - - 100 - false @@ -79,9 +76,6 @@ 100 - - 100 - 1 diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index 621197f..807fd31 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -22,9 +22,6 @@ - - - diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl index 66f267f..5207964 100755 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl @@ -14,9 +14,6 @@ - - - @@ -105,4 +102,4 @@ - \ No newline at end of file +