Removed column scaling option

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"));

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)) {
+       else if (implName.equals(EpubOptionsDialog.__implementationName)) {
-            xSingleServiceFactory = FactoryHelper.getServiceFactory(XhtmlOptionsDialogCalc.class,
-            XhtmlOptionsDialogCalc.__serviceName,
-            multiFactory,						    
-            regKey);
-        }
-        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,

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"));
         

src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java

@@ -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 <http://www.gnu.org/licenses/>.
- * 
- *  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"));
-    }
-		
-}
-
-
-

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

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(); }

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);
 	}
 

src/main/java/w2phtml/xhtml/content/TableParser.java

@@ -225,7 +225,7 @@ public class TableParser extends Parser {
         			for (int nCol=0; nCol<nColCount; nCol++) {
         				Element col = converter.createElement("col");
         				colgroup.appendChild(col);
-        				col.setAttribute("style","width:"+getTableSP().colScale(view.getColumnWidth(nCol)));
+        				col.setAttribute("style","width:"+view.getColumnWidth(nCol));
         			}
         		}
         	}
@@ -355,7 +355,7 @@ public class TableParser extends Parser {
                         	info.props.addProperty("width",sWidth);
                         }
                         else {
-                        	info.props.addProperty("width",getTableSP().colScale(sWidth));
+                        	info.props.addProperty("width",sWidth);
                         }
                     }
                 }
@@ -414,31 +414,31 @@ public class TableParser extends Parser {
                 // "total cell width" - "border" - "padding"
                 String s = style.getProperty(XMLString.FO_PADDING_LEFT);
                 if (s!=null) {
-                    sEdge=Calc.add(sEdge,getTableSP().colScale(s));
+                    sEdge=Calc.add(sEdge,s);
                 }
                 s = style.getProperty(XMLString.FO_PADDING_RIGHT);
                 if (s!=null) { 
-                    sEdge=Calc.add(sEdge,getTableSP().colScale(s));
+                    sEdge=Calc.add(sEdge,s);
                 }
                 s = style.getProperty(XMLString.FO_PADDING);
                 if (s!=null) {
-                    sEdge=Calc.add(sEdge,Calc.multiply("200%",getTableSP().colScale(s)));
+                    sEdge=Calc.add(sEdge,Calc.multiply("200%",s));
                 }
                 s = style.getProperty(XMLString.FO_BORDER_LEFT);
                 if (s!=null) {
-                    sEdge=Calc.add(sEdge,getTableSP().colScale(borderWidth(s)));
+                    sEdge=Calc.add(sEdge,borderWidth(s));
                 }
                 s = style.getProperty(XMLString.FO_BORDER_RIGHT);
                 if (s!=null) { 
-                    sEdge=Calc.add(sEdge,getTableSP().colScale(borderWidth(s)));
+                    sEdge=Calc.add(sEdge,borderWidth(s));
                 }
                 s = style.getProperty(XMLString.FO_BORDER);
                 if (s!=null) {
-                    sEdge=Calc.add(sEdge,Calc.multiply("200%",getTableSP().colScale(borderWidth(s))));
+                    sEdge=Calc.add(sEdge,Calc.multiply("200%",borderWidth(s)));
                 }
 
                 if (sTotalWidth!=null) {
-                    info.props.addProperty("width",Calc.sub(getTableSP().colScale(sTotalWidth),sEdge));
+                    info.props.addProperty("width",Calc.sub(sTotalWidth,sEdge));
                 }
             }
         }

src/main/java/w2phtml/xhtml/style/StyleParser.java

@@ -75,7 +75,6 @@ public abstract class StyleParser extends Parser {
         this.prettyPrint = config.prettyPrint();
         this.indent = prettyPrint ? "      " : "";
         sScale = config.getXhtmlScaling();
-        sColScale = config.getXhtmlColumnScaling();
         bConvertToPx = config.xhtmlConvertToPx();
         inlineCSS = config.inlineCSS();
     }
@@ -89,10 +88,6 @@ public abstract class StyleParser extends Parser {
         }
     }
 	
-    public String colScale(String s) {
-        return scale(Calc.multiply(sColScale,s));
-    }
-	
     /** Apply the writing direction (ltr or rtl) attribute from a style
      *  @param style the OpenDocument style to use
      *  @param info the <code>StyleInfo</code> object to add information to

src/main/oxt/writer2xhtml/Options.xcs

@@ -35,7 +35,6 @@
             <prop oor:name="EmbedImg" oor:type="xs:boolean" />
             <prop oor:name="Greenstone" oor:type="xs:boolean" />
             <prop oor:name="Scaling" oor:type="xs:int" />
-            <prop oor:name="ColumnScaling" oor:type="xs:int" />
             <prop oor:name="OriginalImageSize" oor:type="xs:boolean"/>
             <prop oor:name="MinLetterSpacing" oor:type="xs:string" />
             <prop oor:name="PageBreakStyle" oor:type="xs:string" />
@@ -62,7 +61,6 @@
             <prop oor:name="Config" oor:type="xs:short" />
             <prop oor:name="ConfigName" oor:type="xs:string" />
             <prop oor:name="Scaling" oor:type="xs:int" />
-            <prop oor:name="ColumnScaling" oor:type="xs:int" />
             <prop oor:name="RelativeFontSize" oor:type="xs:boolean" />
             <prop oor:name="FontScaling" oor:type="xs:int" />
             <prop oor:name="UseDefaultFont" oor:type="xs:boolean" />

src/main/oxt/writer2xhtml/Options.xcu

@@ -23,9 +23,6 @@
         <prop oor:name="PageBreakStyle" oor:type="xs:string">
             <value>height:3em;margin-top:1em;margin-bottom:1em;background-color:#f6f6f6;</value>
         </prop>
-        <prop oor:name="ColumnScaling" oor:type="xs:int">
-            <value>100</value>
-        </prop>
         <prop oor:name="OriginalImageSize" oor:type="xs:boolean">
             <value>false</value>
         </prop>
@@ -79,9 +76,6 @@
         <prop oor:name="Scaling" oor:type="xs:int">
             <value>100</value>
         </prop>
-        <prop oor:name="ColumnScaling" oor:type="xs:int">
-            <value>100</value>
-        </prop>
         <prop oor:name="ImageSize" oor:type="xs:short">
             <value>1</value><!-- relative -->
         </prop>

src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl

@@ -22,9 +22,6 @@
   <dlg:text dlg:id="ScalingLabel" dlg:tab-index="3" dlg:left="9" dlg:top="34" dlg:width="76" dlg:height="12" dlg:help-text="&amp;17.XhtmlOptions.ScalingLabel.HelpText" dlg:value="&amp;18.XhtmlOptions.ScalingLabel.Label"/>
   <dlg:numericfield dlg:id="Scaling" dlg:tab-index="4" dlg:left="127" dlg:top="32" dlg:width="46" dlg:height="12" dlg:help-text="&amp;19.XhtmlOptions.Scaling.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsScaling" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value="100" dlg:value-min="1" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
   <dlg:text dlg:id="ScalingPercentLabel" dlg:tab-index="5" dlg:left="178" dlg:top="34" dlg:width="10" dlg:height="12" dlg:help-text="&amp;20.XhtmlOptions.ScalingPercentLabel.HelpText" dlg:value="&amp;21.XhtmlOptions.ScalingPercentLabel.Label"/>
-  <dlg:text dlg:id="ColumnScalingLabel" dlg:tab-index="6" dlg:left="9" dlg:top="48" dlg:width="76" dlg:height="12" dlg:help-text="&amp;22.XhtmlOptions.ColumnScalingLabel.HelpText" dlg:value="&amp;23.XhtmlOptions.ColumnScalingLabel.Label"/>
-  <dlg:numericfield dlg:id="ColumnScaling" dlg:tab-index="7" dlg:left="127" dlg:top="46" dlg:width="46" dlg:height="12" dlg:help-text="&amp;24.XhtmlOptions.ColumnScaling.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsColumnScaling" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value="100" dlg:value-min="1" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
-  <dlg:text dlg:id="ColumnScalingPercentLabel" dlg:tab-index="8" dlg:left="178" dlg:top="48" dlg:width="10" dlg:height="12" dlg:help-text="&amp;25.XhtmlOptions.ColumnScalingPercentLabel.HelpText" dlg:value="&amp;26.XhtmlOptions.ColumnScalingPercentLabel.Label"/>
   <dlg:checkbox dlg:id="ConvertToPx" dlg:tab-index="9" dlg:left="9" dlg:top="79" dlg:width="177" dlg:height="12" dlg:help-text="&amp;27.XhtmlOptions.ConvertToPx.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsConvertToPx" dlg:value="&amp;28.XhtmlOptions.ConvertToPx.Label" dlg:checked="true"/>
   <dlg:checkbox dlg:id="OriginalImageSize" dlg:tab-index="10" dlg:left="9" dlg:top="93" dlg:width="177" dlg:height="12" dlg:help-text="&amp;29.XhtmlOptions.OriginalImageSize.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsOriginalImageSize" dlg:value="&amp;30.XhtmlOptions.OriginalImageSize.Label" dlg:checked="false"/>
   <dlg:text dlg:id="SpecialContentLabel" dlg:tab-index="11" dlg:left="4" dlg:top="107" dlg:width="184" dlg:height="12" dlg:help-text="&amp;31.XhtmlOptions.SpecialContentLabel.HelpText" dlg:value="&amp;32.XhtmlOptions.SpecialContentLabel.Label"/>

src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl

@@ -14,9 +14,6 @@
   <dlg:text dlg:id="ScalingLabel" dlg:tab-index="3" dlg:left="10" dlg:top="36" dlg:width="100" dlg:height="12" dlg:value="Scaling"/>
   <dlg:numericfield dlg:id="Scaling" dlg:tab-index="4" dlg:left="120" dlg:top="34" dlg:width="30" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsScaling" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value="100" dlg:value-min="1" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
   <dlg:text dlg:id="ScalingPercentLabel" dlg:tab-index="5" dlg:left="155" dlg:top="36" dlg:width="10" dlg:height="12" dlg:value="%"/>
-  <dlg:text dlg:id="ColumnScalingLabel" dlg:tab-index="6" dlg:left="10" dlg:top="50" dlg:width="100" dlg:height="12" dlg:value="Column scaling"/>
-  <dlg:numericfield dlg:id="ColumnScaling" dlg:tab-index="7" dlg:left="120" dlg:top="48" dlg:width="30" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsColumnScaling" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value="100" dlg:value-min="1" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
-  <dlg:text dlg:id="ColumnScalingPercentLabel" dlg:tab-index="38" dlg:left="155" dlg:top="50" dlg:width="10" dlg:height="12" dlg:value="%"/>
   <dlg:checkbox dlg:id="RelativeFontSize" dlg:tab-index="8" dlg:left="10" dlg:top="64" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsRelativeFontSize" dlg:value="Use relative font size" dlg:checked="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RelativeFontSizeChange" script:language="UNO"/>
   </dlg:checkbox>
@@ -105,4 +102,4 @@
 
   <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="37" dlg:left="175" dlg:top="9" dlg:width="2" dlg:height="204" dlg:value="" dlg:align="vertical"/>
  </dlg:bulletinboard>
-</dlg:window>
+</dlg:window>