diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 0eccba8..8e3d81d 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,12 @@ Changelog for Writer2LaTeX version 1.2 -> 1.4
---------- version 1.4 beta ----------
+[w2x] If the export dialogs are loaded with a setting for scaling or column_scaling of 1% or less, the value
+ is reset to 100%. This is a workaround for an obscure bug in the extension manager, which in some cases sets
+ the value to 1% if the export is used right after installation.
+
+[w2x] Bugfix: The help button on the EPUB export dialog now works
+
[w2x] Bugfix: Avoid null pointer exception in HTML5 export if embed_svg is true and an image is used more than once
[all] An image that is used more than once in the source document is now only exported once. This was already the
diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java
index 4aac9c9..43c443d 100644
--- a/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java
+++ b/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.4 (2014-09-24)
+ * Version 1.4 (2014-09-25)
*
*/
@@ -74,10 +74,20 @@ public class EpubOptionsDialog extends OptionsDialogBase {
@Override protected void loadSettings(XPropertySet xProps) {
// Style
loadConfig(xProps);
- loadNumericOption(xProps, "Scaling");
- loadNumericOption(xProps, "ColumnScaling");
+ 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, "RelativeFontSize");
loadNumericOption(xProps, "FontScaling");
+ int nFontScaling = loadNumericOption(xProps, "FontScaling");
+ if (nFontScaling<=1) {
+ setNumericFieldValue("FontScaling",100);
+ }
loadCheckBoxOption(xProps, "RelativeFontSize");
loadCheckBoxOption(xProps, "UseDefaultFont");
loadComboBoxOption(xProps, "DefaultFontName");
diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
index dc0ce05..ceef5e4 100644
--- a/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
+++ b/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.4 (2014-08-18)
+ * Version 1.4 (2014-09-25)
*
*/
@@ -69,8 +69,14 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
// Style
loadConfig(xProps);
loadCheckBoxOption(xProps, "ConvertToPx");
- loadNumericOption(xProps, "Scaling");
- loadNumericOption(xProps, "ColumnScaling");
+ 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
diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java b/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java
index 54fd434..1efc9ff 100644
--- a/source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java
+++ b/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-2011 by Henrik Just
+ * Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
- * Version 1.2 (2011-03-21)
+ * Version 1.4 (2014-09-25)
*
*/
@@ -69,8 +69,14 @@ public class XhtmlOptionsDialogCalc extends OptionsDialogBase {
// Style
loadConfig(xProps);
loadCheckBoxOption(xProps, "ConvertToPx");
- loadNumericOption(xProps, "Scaling");
- loadNumericOption(xProps, "ColumnScaling");
+ 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
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 99ee3ea..7607d39 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.4 (2014-09-22)
+ * Version 1.4 (2014-09-26)
*
*/
@@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.4";
- private static final String DATE = "2014-09-22";
+ private static final String DATE = "2014-09-26";
/** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
index 0e8eb72..ac0dfc8 100755
--- a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
+++ b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
@@ -38,7 +38,7 @@
-
+