W2X relative image size

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@100 f0f2a975-2e09-46c8-9428-3b39399b9f3c

build.xml

@@ -254,7 +254,7 @@
             <!-- Add jar and oxt's -->
             <zipfileset dir="${target.lib}" prefix="${basename}"
              includes="${jarfile}.jar,writer2latex.oxt,writer2xhtml.oxt,writer4latex.oxt,xhtml-config-sample.oxt"/>
-        </zip>		
+        </zip>
 		
         <!-- Pack the source distribution -->
         <!--<zip destfile="${target.lib}/${sourcedistrofile}">

source/distro/changelog.txt

@@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.7 ----------
 
+[w2x] Renamed the option original_image_size to image_size with extended values: absolute (default, former false),
+  relative (new value: Export images and text boxes using relative width, i.e. as a percentage of the current text width)
+  and none/original_image_size (former true). The old option name is still recognized.
+
 [w4l] Check that the document is saved locally (file) and (on Windows) with a drive letter - otherwise LaTeX cannot run
 
 [w4l] Delete .aux file before TeXifying (this avoids errors in some cases)

source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-04)
+ *  Version 1.2 (2011-03-21)
  *
  */
 
@@ -82,7 +82,7 @@ public class EpubOptionsDialog extends OptionsDialogBase {
         loadCheckBoxOption(xProps, "UseDefaultFont");
         loadComboBoxOption(xProps, "DefaultFontName");
         loadCheckBoxOption(xProps, "ConvertToPx");
-        loadCheckBoxOption(xProps, "OriginalImageSize");
+        loadListBoxOption(xProps, "ImageSize");
 
         // Fill the font name list with all installed fonts
         setListBoxStringItemList("DefaultFontName", 
@@ -132,7 +132,12 @@ public class EpubOptionsDialog extends OptionsDialogBase {
         saveCheckBoxOption(xProps, helper, "UseDefaultFont", "use_default_font");
         saveTextFieldOption(xProps, helper, "DefaultFontName", "default_font_name");
         saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
-        saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size");
+        saveListBoxOption(xProps, "ImageSize");
+        switch (getListBoxSelectedItem("ImageSize")) {
+        case 0: helper.put("image_size", "absolute"); break;
+        case 1: helper.put("image_size", "relative"); break;
+        case 2: helper.put("image_size", "none");        
+        }
 
         // AutoCorrect
         saveCheckBoxOption(xProps, helper, "IgnoreHardLineBreaks", "ignore_hard_line_breaks");
@@ -240,7 +245,7 @@ public class EpubOptionsDialog extends OptionsDialogBase {
 		setControlEnabled("DefaultFontName",!isLocked("default_font_name") && bUseDefaultFont);
         
 		setControlEnabled("ConvertToPx",!isLocked("convert_to_px"));
-        setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
+        setControlEnabled("ImageSize",!isLocked("image_size"));
 
         // AutoCorrect
         setControlEnabled("IgnoreHardLineBreaks",!isLocked("ignore_hard_line_breaks"));

source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2011 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-04-12)
+ *  Version 1.2 (2011-03-21)
  *
  */ 
  
@@ -120,7 +120,9 @@ 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, helper, "OriginalImageSize", "original_image_size");
+        saveCheckBoxOption(xProps, "OriginalImageSize");
+        // TODO: Support "relative"
+        helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute");
 
         // Special content
         saveCheckBoxOption(xProps, helper, "Notes", "notes");
@@ -175,7 +177,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
         setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling"));
         setControlEnabled("ColumnScaling",!isLocked("column_scaling"));
         setControlEnabled("ConvertToPx",!isLocked("convert_to_px"));
-        setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
+        setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));
 
         // Special content
         setControlEnabled("Notes",!isLocked("notes"));

source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2009 by Henrik Just
+ *  Copyright: 2002-2011 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-18)
+ *  Version 1.2 (2011-03-21)
  *
  */ 
  
@@ -108,7 +108,9 @@ public class XhtmlOptionsDialogCalc extends OptionsDialogBase {
         saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
         saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling");
         saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling");
-        saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size");
+        saveCheckBoxOption(xProps, "OriginalImageSize");
+        // TODO: Support "relative"
+        helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute");
 
         // Special content
         saveCheckBoxOption(xProps, helper, "Notes", "notes");
@@ -149,7 +151,7 @@ public class XhtmlOptionsDialogCalc extends OptionsDialogBase {
         setControlEnabled("Scaling",!isLocked("scaling"));
         setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling"));
         setControlEnabled("ColumnScaling",!isLocked("column_scaling"));
-        setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
+        setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));
 
         // Special content
         setControlEnabled("Notes",!isLocked("notes"));

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-10)
+ *  Version 1.2 (2011-03-21)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.7";
-    private static final String DATE = "2011-03-10";
+    private static final String DATE = "2011-03-21";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>

source/java/writer2latex/util/Misc.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2011 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-12-19)
+ *  Version 1.2 (2011-03-16)
  *
  */
 
@@ -206,6 +206,12 @@ public class Misc{
     // Divide dividend by divisor and return the quotient as an integer percentage
     // (never below 1% except if the dividend is zero)
     public static final String divide(String sDividend, String sDivisor) {
+    	return divide(sDividend,sDivisor,false);
+    }
+
+    // Divide dividend by divisor and return the quotient as an integer percentage
+    // (never below 1% except if the dividend is zero, and never above 100% if last parameter is true)
+    public static final String divide(String sDividend, String sDivisor, boolean bMax100) {
         if (sDividend.equals("0")) { return "0%"; }
         if (sDivisor.equals("0")) { return "100%"; }
 
@@ -214,7 +220,10 @@ public class Misc{
         float fDivisor=getFloat(sDivisor.substring(0,sDivisor.length()-2),1);
         String sDivisorUnit=sDivisor.substring(sDivisor.length()-2);
         int nPercent = Math.round(100*fDividend*getUpi(sDivisorUnit)/fDivisor/getUpi(sDividendUnit));
-        if (nPercent>0) {
+        if (bMax100 && nPercent>100) {
+        	return "100%";
+        }
+        else if (nPercent>0) {
         	return Integer.toString(nPercent)+"%";
         }
         else {

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-09)
+ *  Version 1.2 (2011-03-21)
  *
  */
 
@@ -32,6 +32,7 @@ import java.util.HashSet;
 import java.util.ListIterator;
 import java.util.LinkedList;
 import java.util.Set;
+import java.util.Stack;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -108,6 +109,10 @@ public class Converter extends ConverterBase {
     // Strip illegal characters from internal hyperlink targets
     private ExportNameCollection targetNames = new ExportNameCollection(true);
     
+    // The current context (currently we only track the content width, but this might be expanded with formatting
+    // attributes - at least background color and font size later)
+    private Stack<String> contentWidth = new Stack<String>();
+    
     // Constructor setting the DOCTYPE
     public Converter(int nType) {
         super();
@@ -145,6 +150,22 @@ public class Converter extends ConverterBase {
     @Override public void readResource(File file, String sFileName, String sMediaType) throws IOException {
     	readResource(new FileInputStream(file), sFileName, sMediaType);
     }    
+    
+    protected String getContentWidth() {
+    	return contentWidth.peek();
+    }
+    
+    protected String pushContentWidth(String sWidth) {
+    	return contentWidth.push(sWidth);
+    }
+    
+    protected void popContentWidth() {
+    	contentWidth.pop();
+    }
+    
+    protected boolean isTopLevel() {
+    	return contentWidth.size()==1;
+    }
 
     protected StyleConverter getStyleCv() { return styleCv; }
 	
@@ -230,6 +251,9 @@ public class Converter extends ConverterBase {
         if (style!=null) {
             l10n.setLocale(style.getProperty(XMLString.FO_LANGUAGE), style.getProperty(XMLString.FO_COUNTRY));
         }
+        
+        // Set the main content width
+        pushContentWidth(getStyleCv().getPageSc().getTextWidth());
 
         // Traverse the body
         Element body = ofr.getContent();

source/java/writer2latex/xhtml/DrawConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2011 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-05-13)
+ *  Version 1.2 (2011-03-21)
  *
  */
  
@@ -91,11 +91,11 @@ public class DrawConverter extends ConverterHelper {
     private FormReader form = null;
     private String sScale;
     private boolean bConvertToPx;
-    private boolean bOriginalImageSize;
+    private int nImageSize;
-	
+    
     // Frames in spreadsheet documents are collected here
     private Vector<Element> frames = new Vector<Element>();
-    // This flag determines wether to collect frames or insert them immediately
+    // This flag determines whether to collect frames or insert them immediately
     private boolean bCollectFrames = false;
 	
     public DrawConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
@@ -109,7 +109,7 @@ public class DrawConverter extends ConverterHelper {
         bCollectFrames = ofr.isSpreadsheet();
         sScale = config.getXhtmlScaling();
         bConvertToPx = config.xhtmlConvertToPx();
-        bOriginalImageSize = config.originalImageSize();
+        nImageSize = config.imageSize();
     }
 	
     ///////////////////////////////////////////////////////////////////////
@@ -414,7 +414,7 @@ public class DrawConverter extends ConverterHelper {
         StyleInfo info = new StyleInfo();
         String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME);
         getFrameSc().applyStyle(sStyleName,info);
-        if (!bOriginalImageSize) { applySize(frame,info.props,false); }
+        applyImageSize(frame,info.props,false);
 
         // Apply placement
         applyPlacement(frame, hnodeBlock, hnodeInline, nMode, image, info);
@@ -435,7 +435,7 @@ public class DrawConverter extends ConverterHelper {
         // Add name, if defined
         String sName = Misc.getAttribute(getFrame(onode),XMLString.DRAW_NAME);
         if (sName!=null) { converter.addTarget(textbox,sName+"|frame"); }
-
+        
         // Now style it
         Element frame = getFrame(onode);
         StyleInfo info = new StyleInfo();
@@ -459,47 +459,55 @@ public class DrawConverter extends ConverterHelper {
         }
 		
         // Apply placement
+        String sContentWidth = null;
+        
         switch (nMode) {
-            case INLINE:
+        case INLINE:
-                break;
+        	break;
-            case ABSOLUTE:
+        case ABSOLUTE:
-                applySize(frame,info.props,false);
+        	sContentWidth = applyImageSize(frame,info.props,false);
-                applyPosition(frame,info.props);
+        	applyPosition(frame,info.props);
-                break;
+        	break;
-            case CENTERED:
+        case CENTERED:
-                info.props.addValue("maring-top","2px");
+        	info.props.addValue("maring-top","2px");
-                info.props.addValue("maring-bottom","2px");
+        	info.props.addValue("maring-bottom","2px");
-                info.props.addValue("margin-left","auto");
+        	info.props.addValue("margin-left","auto");
-                info.props.addValue("margin-right","auto");
+        	info.props.addValue("margin-right","auto");
-                applySize(frame,info.props,true);
+        	sContentWidth = applyImageSize(frame,info.props,true);
-                break;
+        	break;
-            case FLOATING:
+        case FLOATING:
-                applySize(frame,info.props,true);
+        	sContentWidth = applyImageSize(frame,info.props,true);
-                StyleWithProperties style = ofr.getFrameStyle(sStyleName);
+        	StyleWithProperties style = ofr.getFrameStyle(sStyleName);
-                if (style!=null) {
+        	if (style!=null) {
-                    String sPos = style.getProperty(XMLString.STYLE_HORIZONTAL_POS);
+        		String sPos = style.getProperty(XMLString.STYLE_HORIZONTAL_POS);
-                    String sWrap = style.getProperty(XMLString.STYLE_WRAP);
+        		String sWrap = style.getProperty(XMLString.STYLE_WRAP);
-                    if (isLeft(sPos) && mayWrapRight(sWrap)) {
+        		if (isLeft(sPos) && mayWrapRight(sWrap)) {
-                        info.props.addValue("float","left");
+        			info.props.addValue("float","left");
-                    }
+        		}
-                    else if (isRight(sPos) && mayWrapLeft(sWrap)) {
+        		else if (isRight(sPos) && mayWrapLeft(sWrap)) {
-                        info.props.addValue("float","right");
+        			info.props.addValue("float","right");
-                    }
+        		}
-                    else if (isFromLeft(sPos)) {
+        		else if (isFromLeft(sPos)) {
-                        if (mayWrapRight(sWrap)) {
+        			if (mayWrapRight(sWrap)) {
-                            info.props.addValue("float","left");
+        				info.props.addValue("float","left");
-                        }
+        			}
-                        String sX = frame.getAttribute(XMLString.SVG_X);
+        			String sX = frame.getAttribute(XMLString.SVG_X);
-                        if (sX!=null && sX.length()>0) {
+        			if (sX!=null && sX.length()>0) {
-                            info.props.addValue("margin-left",scale(sX));
+        				info.props.addValue("margin-left",scale(sX));
-                        }
+        			}
-                    }
+        		}
-                }
+        	}
         }
 
         //Finish
         applyStyle(info,textbox);
+        if (sContentWidth!=null) {
+        	converter.pushContentWidth(sContentWidth);
+        }
         getTextCv().traverseBlockText(onode,textbox);
+        if (sContentWidth!=null) {
+        	converter.popContentWidth();
+        }
         getPresentationSc().exitOutline();
     }
 	
@@ -770,36 +778,38 @@ public class DrawConverter extends ConverterHelper {
             }
         }
     }
-	
+    
-    private void applySize(Element node, CSVList props, boolean bOnlyWidth) {
+	// The width attribute in CSS refers to the content width, excluding borders and padding
-    	// The width attribute in css refers to the content width, excluding borders and padding
+	// We thus have to subtract the borders and padding to get the correct width
-    	// We thus have to subtract the borders and padding to get the correct width
+    // This method handles this
-        StyleWithProperties style = ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME));
+    private String getFrameWidth(Element node, StyleWithProperties style) {
-        
+    	String sWidth = node.getAttribute(XMLString.SVG_WIDTH);
-        String sWidth = node.getAttribute(XMLString.SVG_WIDTH);
+    	if (sWidth.length()>0) {
-        if (sWidth.length()>0) {
+    		if (style!=null) {
-        	if (style!=null) {
+    			// Subtract padding
-        		// Subtract padding
+    			String s = style.getProperty(XMLString.FO_PADDING_LEFT);
-                String s = style.getProperty(XMLString.FO_PADDING_LEFT);
+    			if (s!=null) sWidth = Misc.sub(sWidth, s);
-                if (s!=null) sWidth = Misc.sub(sWidth, s);
+    			s = style.getProperty(XMLString.FO_PADDING_RIGHT);
-                s = style.getProperty(XMLString.FO_PADDING_RIGHT);
+    			if (s!=null) sWidth = Misc.sub(sWidth, s);
-                if (s!=null) sWidth = Misc.sub(sWidth, s);
+    			s = style.getProperty(XMLString.FO_PADDING);
-                s = style.getProperty(XMLString.FO_PADDING);
+    			if (s!=null) sWidth = Misc.sub(sWidth, Misc.multiply("200%", s));
-                if (s!=null) sWidth = Misc.sub(sWidth, Misc.multiply("200%", s));
+    			// Subtract border
-                // Subtract border
+    			s = style.getProperty(XMLString.FO_BORDER_LEFT);
-                s = style.getProperty(XMLString.FO_BORDER_LEFT);
+    			if (s!=null) sWidth = Misc.sub(sWidth, getTableCv().borderWidth(s));
-                if (s!=null) sWidth = Misc.sub(sWidth, getTableCv().borderWidth(s));
+    			s = style.getProperty(XMLString.FO_BORDER_RIGHT);
-                s = style.getProperty(XMLString.FO_BORDER_RIGHT);
+    			if (s!=null) sWidth = Misc.sub(sWidth, getTableCv().borderWidth(s));
-                if (s!=null) sWidth = Misc.sub(sWidth, getTableCv().borderWidth(s));
+    			s = style.getProperty(XMLString.FO_BORDER);
-                s = style.getProperty(XMLString.FO_BORDER);
+    			if (s!=null) sWidth = Misc.sub(sWidth, Misc.multiply("200%", getTableCv().borderWidth(s)));
-                if (s!=null) sWidth = Misc.sub(sWidth, Misc.multiply("200%", getTableCv().borderWidth(s)));
+    		}
-            }
+			return sWidth;
-        	
+    	}
-            props.addValue("width",scale(sWidth));
+        return null;
-        }
+    }
-        
+    
-        String sHeight = node.getAttribute(XMLString.SVG_HEIGHT);
+    // Same for height
-        if (sHeight.length()>0 && !bOnlyWidth) {
+    private String getFrameHeight(Element node, StyleWithProperties style) {
+    	String sHeight = node.getAttribute(XMLString.SVG_HEIGHT);
+    	if (sHeight.length()>0) {
         	if (style!=null) {
         		// Subtract padding
                 String s = style.getProperty(XMLString.FO_PADDING_TOP);
@@ -816,9 +826,47 @@ public class DrawConverter extends ConverterHelper {
                 s = style.getProperty(XMLString.FO_BORDER);
                 if (s!=null) sHeight = Misc.sub(sHeight, Misc.multiply("200%", getTableCv().borderWidth(s)));
             }
-        	
+        	return sHeight;
-            props.addValue("height",scale(sHeight));
+        }
-       	}
+    	return null;
+    }
+	
+    // Return the (unscaled) content width, or null if it's unknown
+    private String applySize(Element node, CSVList props, boolean bOnlyWidth) {
+    	StyleWithProperties style = ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME));
+
+    	String sWidth = getFrameWidth(node, style);
+    	if (sWidth!=null) {
+    		props.addValue("width",scale(sWidth));
+    	}
+
+    	if (!bOnlyWidth) {
+    		String sHeight = getFrameHeight(node,style);
+    		if (sHeight!=null) {
+    			props.addValue("height",scale(sHeight));
+    		}
+    	}
+    	
+    	return sWidth;
+    }
+    
+    // TODO: For absolute placement, only absolute size makes sense
+    // TODO: How to handle NONE in case of text boxes? (currently using browser default, usually 100% width)
+    private String applyImageSize(Element node, CSVList props, boolean bOnlyWidth) {
+		switch (nImageSize) {
+		case XhtmlConfig.ABSOLUTE:
+			return applySize(node, props, bOnlyWidth);
+		case XhtmlConfig.RELATIVE:
+	    	String sWidth = getFrameWidth(node, ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME)));			
+	    	if (sWidth!=null) {    
+				props.addValue("width", Misc.divide(Misc.multiply(sScale,Misc.truncateLength(sWidth)),converter.getContentWidth()));
+			}
+			return sWidth;
+		case XhtmlConfig.NONE:
+			// Nothing to do :-)
+	    	return getFrameWidth(node, ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME)));
+		}
+		return null;
     }
 	
     private void applyPosition(Element node, CSVList props) {
@@ -949,7 +997,6 @@ public class DrawConverter extends ConverterHelper {
             return Misc.multiply(sScale,Misc.truncateLength(s));
         }
     }
-	
 }
 
 

source/java/writer2latex/xhtml/PageStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2011 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-08)
+ *  Version 1.2 (2011-03-16)
  *
  */
 
@@ -35,6 +35,7 @@ import writer2latex.office.PageLayout;
 import writer2latex.office.StyleWithProperties;
 import writer2latex.office.XMLString;
 import writer2latex.util.CSVList;
+import writer2latex.util.Misc;
 
 /**
  * This class converts OpenDocument page styles to CSS2 styles.
@@ -60,6 +61,32 @@ public class PageStyleConverter extends StyleConverterHelper {
         this.bConvertStyles = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD;
     }
     
+    /** Get the text width of the first master page (page width minus left and right margin)
+     * 
+     *  @return the text width
+     */
+    public String getTextWidth() {
+        MasterPage masterPage = ofr.getFirstMasterPage();
+        if (masterPage!=null) {
+            PageLayout pageLayout = ofr.getPageLayout(masterPage.getPageLayoutName());
+            if (pageLayout!=null) {
+                String sWidth = pageLayout.getProperty(XMLString.FO_PAGE_WIDTH);
+                if (sWidth!=null) {
+                	String sMarginLeft = pageLayout.getProperty(XMLString.FO_MARGIN_LEFT);
+                	if (sMarginLeft!=null) {
+                		sWidth = Misc.sub(sWidth, sMarginLeft);
+                	}
+                	String sMarginRight = pageLayout.getProperty(XMLString.FO_MARGIN_RIGHT);
+                	if (sMarginRight!=null) {
+                		sWidth = Misc.sub(sWidth, sMarginRight);
+                	}
+                	return sWidth;
+                }
+            }
+        }
+        return "17cm"; // Default in Writer, hence usable as a fallback value
+    }
+    
     /** Apply footnote rule formatting (based on first master page)
      * 
      * @param info then StyleInfo to which style information should be attached

source/java/writer2latex/xhtml/TableConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-09)
+ *  Version 1.2 (2011-03-21)
  *
  */
 
@@ -266,7 +266,14 @@ public class TableConverter extends ConverterHelper {
     
                     // Handle content
                     if (!isEmptyCell(cell)) {
-                       getTextCv().traverseBlockText(cell,td);
+                    	String sWidth = view.getCellWidth(nRow, nCol);
+                    	if (sWidth!=null) {
+                    		converter.pushContentWidth(sWidth);
+                    	}
+                    	getTextCv().traverseBlockText(cell,td);
+                    	if (sWidth!=null) {
+                    		converter.popContentWidth();
+                    	}
                     }
                     else {
                         // Hack to display empty cells even in msie...

source/java/writer2latex/xhtml/XhtmlConfig.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-08)
+ *  Version 1.2 (2011-03-16)
  *
  */
 
@@ -50,6 +50,12 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         if (sName.startsWith("xhtml_")) { sName = sName.substring(6); }
         // this option has been renamed:
         if (sName.equals("keep_image_size")) { sName = "original_image_size"; }
+        // and later renamed and extended:
+        if (sName.equals("original_image_size")) {
+        	sName = "image_size";
+        	if (sValue.equals("true")) { sValue = "none"; }
+        	else { sValue="absolute"; }
+        }
         // this option has been renamed and extended:
         if (sName.equals("use_list_hack")) {
         	sName = "list_formatting";
@@ -69,6 +75,11 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public static final int CSS1 = 0;
     public static final int CSS1_HACK = 1;
     public static final int HARD_LABELS = 2;
+    
+    // Image dimensions
+    public static final int NONE = 0;
+    public static final int ABSOLUTE = 1;
+    public static final int RELATIVE = 2;
 
     // Formulas (for XHTML 1.0 strict)
     public static final int STARMATH = 0;
@@ -77,7 +88,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public static final int IMAGE_LATEX = 3;
     
     // Page breaks
-    public static final int NONE = 0;
+    // public static final int NONE = 0;
     public static final int STYLES = 1;
     public static final int EXPLICIT = 2;
     public static final int ALL = 3;
@@ -86,7 +97,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int IGNORE_HARD_LINE_BREAKS = 0;
     private static final int IGNORE_EMPTY_PARAGRAPHS = 1;
     private static final int IGNORE_DOUBLE_SPACES = 2;
-    private static final int ORIGINAL_IMAGE_SIZE = 3;
+    private static final int IMAGE_SIZE = 3;
     private static final int NO_DOCTYPE = 4;
     private static final int ADD_BOM = 5;
     private static final int ENCODING = 6;
@@ -151,7 +162,15 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         options[IGNORE_HARD_LINE_BREAKS] = new BooleanOption("ignore_hard_line_breaks","false");
         options[IGNORE_EMPTY_PARAGRAPHS] = new BooleanOption("ignore_empty_paragraphs","false");
         options[IGNORE_DOUBLE_SPACES] = new BooleanOption("ignore_double_spaces","false");
-        options[ORIGINAL_IMAGE_SIZE] = new BooleanOption("original_image_size","false");
+        options[IMAGE_SIZE] = new IntegerOption("image_size","auto") {
+        	@Override public void setString(String sValue) {
+        		super.setString(sValue);
+        		if ("relative".equals(sValue)) { nValue = RELATIVE; }
+        		else if ("none".equals(sValue)) { nValue = NONE; }
+        		else if ("original_image_size".equals(sValue)) { nValue = NONE; }
+        		else { nValue = ABSOLUTE; }
+        	}
+        };
         options[NO_DOCTYPE] = new BooleanOption("no_doctype","false");
         options[ADD_BOM] = new BooleanOption("add_bom","false");
         options[ENCODING] = new Option("encoding","UTF-8");
@@ -323,7 +342,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public boolean ignoreHardLineBreaks() { return ((BooleanOption) options[IGNORE_HARD_LINE_BREAKS]).getValue(); }
     public boolean ignoreEmptyParagraphs() { return ((BooleanOption) options[IGNORE_EMPTY_PARAGRAPHS]).getValue(); }
     public boolean ignoreDoubleSpaces() { return ((BooleanOption) options[IGNORE_DOUBLE_SPACES]).getValue(); }
-    public boolean originalImageSize() { return ((BooleanOption) options[ORIGINAL_IMAGE_SIZE]).getValue(); }
+    public int imageSize() { return ((IntegerOption) options[IMAGE_SIZE]).getValue(); }
     public boolean xhtmlNoDoctype() { return ((BooleanOption) options[NO_DOCTYPE]).getValue(); }
     public boolean xhtmlAddBOM() { return ((BooleanOption) options[ADD_BOM]).getValue(); }
     public String xhtmlEncoding() { return options[ENCODING].getString(); }

source/oxt/writer2xhtml/Options.xcs

@@ -61,7 +61,7 @@
             <prop oor:name="UseDefaultFont" oor:type="xs:boolean" />
             <prop oor:name="DefaultFontName" oor:type="xs:string" />
             <prop oor:name="ConvertToPx" oor:type="xs:boolean" />
-            <prop oor:name="OriginalImageSize" oor:type="xs:boolean"/>
+            <prop oor:name="ImageSize" oor:type="xs:int"/>
             <!-- AutoCorrect -->
             <prop oor:name="IgnoreEmptyParagraphs" oor:type="xs:boolean" />
             <prop oor:name="IgnoreHardLineBreaks" oor:type="xs:boolean" />

source/oxt/writer2xhtml/Options.xcu

@@ -70,8 +70,8 @@
         <prop oor:name="ColumnScaling" oor:type="xs:int">
             <value>100</value>
         </prop>
-        <prop oor:name="OriginalImageSize" oor:type="xs:boolean">
+        <prop oor:name="ImageSize" oor:type="xs:int">
-            <value>false</value>
+            <value>1</value><!-- relative -->
         </prop>
         <prop oor:name="RelativeFontSize" oor:type="xs:boolean">
             <value>true</value>

source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl

@@ -16,20 +16,19 @@
   <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="29" dlg:left="155" dlg:top="50" dlg:width="10" dlg:height="12" dlg:value="%"/>
+  <dlg:text dlg:id="ColumnScalingPercentLabel" dlg:tab-index="28" dlg:left="155" dlg:top="50" dlg:width="10" dlg:height="12" dlg:value="%"/>
   <dlg:checkbox dlg:id="ConvertToPx" dlg:tab-index="12" dlg:left="10" dlg:top="120" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsConvertToPx" dlg:value="Convert units to px (pixels)" dlg:checked="true"/>
-  <dlg:checkbox dlg:id="OriginalImageSize" dlg:tab-index="13" dlg:left="10" dlg:top="134" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsOriginalImageSize" dlg:value="Use original image size" dlg:checked="false"/>
+  <dlg:text dlg:id="SpecialContentLabel" dlg:tab-index="29" dlg:left="185" dlg:top="8" dlg:width="160" dlg:height="12" dlg:value="Special content"/>
-  <dlg:text dlg:id="SpecialContentLabel" dlg:tab-index="30" dlg:left="185" dlg:top="8" dlg:width="160" dlg:height="12" dlg:value="Special content"/>
   <dlg:checkbox dlg:id="Notes" dlg:tab-index="18" dlg:left="190" dlg:top="36" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsNotes" dlg:value="Export notes" dlg:checked="true"/>
-  <dlg:text dlg:id="AutoCorrectLabel" dlg:tab-index="31" dlg:left="5" dlg:top="148" dlg:width="160" dlg:height="12" dlg:value="AutoCorrect"/>
+  <dlg:text dlg:id="AutoCorrectLabel" dlg:tab-index="30" dlg:left="5" dlg:top="148" dlg:width="160" dlg:height="12" dlg:value="AutoCorrect"/>
   <dlg:checkbox dlg:id="IgnoreHardLineBreaks" dlg:tab-index="14" dlg:left="10" dlg:top="162" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIgnoreHardLineBreaks" dlg:value="Ignore hard line breaks" dlg:checked="false"/>
   <dlg:checkbox dlg:id="IgnoreEmptyParagraphs" dlg:tab-index="15" dlg:left="10" dlg:top="176" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIgnoreEmptyParagraphs" dlg:value="Ignore empty paragraphs" dlg:checked="false"/>
   <dlg:checkbox dlg:id="IgnoreDoubleSpaces" dlg:tab-index="16" dlg:left="10" dlg:top="190" dlg:width="155" dlg:height="15" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIgnoreDoubleSpaces" dlg:value="Ignore double spaces" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="Split" dlg:tab-index="21" dlg:left="190" dlg:top="78" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsSplit" dlg:value="Split document at headings" dlg:checked="false">
+  <dlg:checkbox dlg:id="Split" dlg:tab-index="20" dlg:left="190" dlg:top="78" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsSplit" dlg:value="Split document at headings" dlg:checked="false">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SplitChange" script:language="UNO"/>
   </dlg:checkbox>
-  <dlg:text dlg:id="SplitLevelLabel" dlg:tab-index="33" dlg:left="199" dlg:top="92" dlg:width="100" dlg:height="12" dlg:value="Heading level"/>
+  <dlg:text dlg:id="SplitLevelLabel" dlg:tab-index="32" dlg:left="199" dlg:top="92" dlg:width="100" dlg:height="12" dlg:value="Heading level"/>
-  <dlg:menulist dlg:id="SplitLevel" dlg:tab-index="22" dlg:left="305" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsSplitLevel" dlg:spin="true" dlg:linecount="6">
+  <dlg:menulist dlg:id="SplitLevel" dlg:tab-index="21" dlg:left="305" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsSplitLevel" dlg:spin="true" dlg:linecount="6">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="1"/>
     <dlg:menuitem dlg:value="2"/>
@@ -39,41 +38,41 @@
     <dlg:menuitem dlg:value="6"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:button dlg:id="ExportButton" dlg:tab-index="34" dlg:left="5" dlg:top="216" dlg:width="55" dlg:height="12" dlg:value="Export" dlg:button-type="ok"/>
+  <dlg:button dlg:id="ExportButton" dlg:tab-index="33" dlg:left="5" dlg:top="216" dlg:width="55" dlg:height="12" dlg:value="Export" dlg:button-type="ok"/>
-  <dlg:button dlg:id="CancelButton" dlg:tab-index="35" dlg:left="70" dlg:top="216" dlg:width="55" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel"/>
+  <dlg:button dlg:id="CancelButton" dlg:tab-index="34" dlg:left="70" dlg:top="216" dlg:width="55" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel"/>
-  <dlg:button dlg:id="HelpButton" dlg:tab-index="36" dlg:left="290" dlg:top="216" dlg:width="55" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptions" dlg:value="Help" dlg:button-type="help"/>
+  <dlg:button dlg:id="HelpButton" dlg:tab-index="35" dlg:left="290" dlg:top="216" dlg:width="55" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptions" dlg:value="Help" dlg:button-type="help"/>
-  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="37" dlg:left="175" dlg:top="9" dlg:width="2" dlg:height="190" dlg:value="&amp;143.XhtmlOptions.FixedLine1.Label" dlg:align="vertical"/>
+  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="36" dlg:left="175" dlg:top="9" dlg:width="2" dlg:height="190" dlg:value="&amp;143.XhtmlOptions.FixedLine1.Label" dlg:align="vertical"/>
   <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>
-  <dlg:text dlg:id="FontScalingLabel" dlg:tab-index="38" dlg:left="19" dlg:top="78" dlg:width="90" dlg:height="12" dlg:value="Scaling"/>
+  <dlg:text dlg:id="FontScalingLabel" dlg:tab-index="37" dlg:left="19" dlg:top="78" dlg:width="90" dlg:height="12" dlg:value="Scaling"/>
   <dlg:numericfield dlg:id="FontScaling" dlg:tab-index="9" dlg:left="120" dlg:top="76" dlg:width="30" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsFontScaling" 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="FontScalingPercentLabel" dlg:tab-index="39" dlg:left="155" dlg:top="78" dlg:width="10" dlg:height="12" dlg:value="%"/>
+  <dlg:text dlg:id="FontScalingPercentLabel" dlg:tab-index="38" dlg:left="155" dlg:top="78" dlg:width="10" dlg:height="12" dlg:value="%"/>
   <dlg:checkbox dlg:id="UseDefaultFont" dlg:tab-index="10" dlg:left="10" dlg:top="92" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseDefaultFont" dlg:value="Use a single font for the entire document" dlg:checked="false">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseDefaultFontChange" script:language="UNO"/>
   </dlg:checkbox>
-  <dlg:text dlg:id="DefaultFontNameLabel" dlg:tab-index="40" dlg:left="19" dlg:top="106" dlg:width="50" dlg:height="12" dlg:value="Font name"/>
+  <dlg:text dlg:id="DefaultFontNameLabel" dlg:tab-index="39" dlg:left="19" dlg:top="106" dlg:width="50" dlg:height="12" dlg:value="Font name"/>
   <dlg:combobox dlg:id="DefaultFontName" dlg:tab-index="11" dlg:left="75" dlg:top="104" dlg:width="90" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsDefaultFontName" dlg:spin="true"/>
   <dlg:checkbox dlg:id="DisplayHiddenText" dlg:tab-index="17" dlg:left="190" dlg:top="22" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsDisplayHiddenText" dlg:value="Display hidden text" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="UsePageBreakSplit" dlg:tab-index="23" dlg:left="190" dlg:top="106" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsPageBreakSplit" dlg:value="Split document at page breaks" dlg:checked="false">
+  <dlg:checkbox dlg:id="UsePageBreakSplit" dlg:tab-index="22" dlg:left="190" dlg:top="106" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsPageBreakSplit" dlg:value="Split document at page breaks" dlg:checked="false">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UsePageBreakSplitChange" script:language="UNO"/>
   </dlg:checkbox>
-  <dlg:text dlg:id="PageBreakSplitLabel" dlg:tab-index="41" dlg:left="199" dlg:top="120" dlg:width="45" dlg:height="12" dlg:value="Types"/>
+  <dlg:text dlg:id="PageBreakSplitLabel" dlg:tab-index="40" dlg:left="199" dlg:top="120" dlg:width="45" dlg:height="12" dlg:value="Types"/>
-  <dlg:menulist dlg:id="PageBreakSplit" dlg:tab-index="24" dlg:left="255" dlg:top="118" dlg:width="90" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsPageBreakSplitType" dlg:spin="true" dlg:linecount="3">
+  <dlg:menulist dlg:id="PageBreakSplit" dlg:tab-index="23" dlg:left="255" dlg:top="118" dlg:width="90" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsPageBreakSplitType" dlg:spin="true" dlg:linecount="3">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="Defined by styles"/>
     <dlg:menuitem dlg:value="All explicit"/>
     <dlg:menuitem dlg:value="All"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:checkbox dlg:id="IncludeToc" dlg:tab-index="28" dlg:left="190" dlg:top="190" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeToc" dlg:value="Also include original table of contents" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="IncludeToc" dlg:tab-index="27" dlg:left="190" dlg:top="190" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeToc" dlg:value="Also include original table of contents" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="UseSplitAfter" dlg:tab-index="25" dlg:left="190" dlg:top="134" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseEpubAutoSplit" dlg:value="Automatic split of long documents" dlg:checked="false">
+  <dlg:checkbox dlg:id="UseSplitAfter" dlg:tab-index="24" dlg:left="190" dlg:top="134" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseEpubAutoSplit" dlg:value="Automatic split of long documents" dlg:checked="false">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseSplitAfterChange" script:language="UNO"/>
   </dlg:checkbox>
-  <dlg:text dlg:id="SplitAfterLabel" dlg:tab-index="42" dlg:left="199" dlg:top="148" dlg:width="100" dlg:height="12" dlg:value="After (in 1000 characters)"/>
+  <dlg:text dlg:id="SplitAfterLabel" dlg:tab-index="41" dlg:left="199" dlg:top="148" dlg:width="100" dlg:height="12" dlg:value="After (in 1000 characters)"/>
-  <dlg:numericfield dlg:id="SplitAfter" dlg:tab-index="26" dlg:left="305" dlg:top="146" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsEpubAutoSplit" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
+  <dlg:numericfield dlg:id="SplitAfter" dlg:tab-index="25" dlg:left="305" dlg:top="146" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsEpubAutoSplit" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
-  <dlg:text dlg:id="ExternalTocDepthLabel" dlg:tab-index="43" dlg:left="190" dlg:top="176" dlg:width="110" dlg:height="12" dlg:value="Number of heading levels to include"/>
+  <dlg:text dlg:id="ExternalTocDepthLabel" dlg:tab-index="42" dlg:left="190" dlg:top="176" dlg:width="110" dlg:height="12" dlg:value="Number of heading levels to include"/>
-  <dlg:menulist dlg:id="ExternalTocDepth" dlg:tab-index="27" dlg:left="305" dlg:top="174" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsExternalTocDepth" dlg:spin="true" dlg:linecount="10">
+  <dlg:menulist dlg:id="ExternalTocDepth" dlg:tab-index="26" dlg:left="305" dlg:top="174" dlg:width="40" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsExternalTocDepth" dlg:spin="true" dlg:linecount="10">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="1"/>
     <dlg:menuitem dlg:value="2"/>
@@ -87,10 +86,18 @@
     <dlg:menuitem dlg:value="10"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:text dlg:id="TocLabel" dlg:tab-index="44" dlg:left="185" dlg:top="162" dlg:width="160" dlg:height="12" dlg:value="Navigation table"/>
+  <dlg:text dlg:id="TocLabel" dlg:tab-index="43" dlg:left="185" dlg:top="162" dlg:width="160" dlg:height="12" dlg:value="Navigation table"/>
-  <dlg:text dlg:id="DocumentDivisionLabel" dlg:tab-index="32" dlg:left="185" dlg:top="64" dlg:width="160" dlg:height="12" dlg:value="Document division"/>
+  <dlg:text dlg:id="DocumentDivisionLabel" dlg:tab-index="31" dlg:left="185" dlg:top="64" dlg:width="160" dlg:height="12" dlg:value="Document division"/>
-  <dlg:button dlg:id="EditMetadata" dlg:tab-index="20" dlg:left="190" dlg:top="48" dlg:width="100" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseCustomMetadata" dlg:value="Edit document properties">
+  <dlg:button dlg:id="EditMetadata" dlg:tab-index="19" dlg:left="190" dlg:top="48" dlg:width="100" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseCustomMetadata" dlg:value="Edit document properties">
    <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:EditMetadataClick" script:language="UNO"/>
   </dlg:button>
+  <dlg:text dlg:id="ImageSizeLabel" dlg:tab-index="44" dlg:left="10" dlg:top="134" dlg:width="60" dlg:height="12" dlg:value="Image size"/>
+  <dlg:menulist dlg:id="ImageSize" dlg:tab-index="13" dlg:left="75" dlg:top="132" dlg:width="90" dlg:height="12" dlg:spin="true" dlg:linecount="3" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsImageSize">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Use absolute size"/>
+    <dlg:menuitem dlg:value="Use relative size (%)"/>
+    <dlg:menuitem dlg:value="Use orignal image size"/>
+   </dlg:menupopup>
+  </dlg:menulist>
  </dlg:bulletinboard>
 </dlg:window>

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp

@@ -81,9 +81,24 @@
        	all dimensions are converted to px.</paragraph>
 		<embed href="org.openoffice.da.writer2xhtml.oxt/export.xhp#converttopx4"/>
         
-        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsOriginalImageSize" id="bm_options_originalimagesize"/>
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsImageSize" id="bm_options_imagesize"/>
-		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsOriginalImageSize" visibility="hidden">Check this to use the natural size of images rather than the size defined in the document</ahelp></paragraph>
+		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsImageSize" visibility="hidden">Select how to set the image size in the EPUB document</ahelp></paragraph>
-		<embed href="org.openoffice.da.writer2xhtml.oxt/export.xhp#originalimagesize"/>
+        <paragraph role="paragraph" xml-lang="en-US">Select how to set the image size in the EPUB document</paragraph>
+        <list type="unordered">
+			<listitem>
+    		    <paragraph role="paragraph" xml-lang="en-US"><emph>Use absolute size</emph>: Images will get the same size in the EPUB
+    		    document as in the original %PRODUCTNAME Writer document.</paragraph>
+        	</listitem>
+			<listitem>
+    		    <paragraph role="paragraph" xml-lang="en-US"><emph>Use relative size (%)</emph>: Image sizes will be exported as
+    		    percentages. This has the advantage that the image size will adapt to the size of the reader screen.</paragraph>
+        	</listitem>
+			<listitem>
+    		    <paragraph role="paragraph" xml-lang="en-US"><emph>Use original image size</emph>: Often images in a %PRODUCTNAME document
+    		    are scaled up or down from their original size. If you select this option, the original (unscaled) image
+        		size will be used.</paragraph>
+        	</listitem>
+        </list>
         
         <paragraph role="heading" level="2" xml-lang="en-US">AutoCorrect</paragraph>
 

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp

@@ -65,7 +65,7 @@
 		<section id="scaling3">
         	<paragraph role="paragraph" xml-lang="en-US">Using this option you can define a percentage used to scale all
         	dimensions. Thus with the setting 140, all dimensions will be 40% larger than in the original document. Depending on the
-        	style you have selected and on the option <emph>Use original image size</emph>, some dimensions may be unaffected by
+        	style you have selected and on the setting for image size below, some dimensions may be unaffected by
         	this option.</paragraph>
        	</section>