litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Workaround for an obscure bug + add missing link to EPUB options help

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@179 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2014-09-26 15:01:47 +00:00
parent 751e14eb9f
commit 798b94560e
6 changed files with 41 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/distro/changelog.txt
View file

@ -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

16
source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java
View file

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

12
source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
View file

@ -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

14
source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java
View file

@ -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

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -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)<br/>

2
source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
View file

@ -38,7 +38,7 @@
</dlg:menulist>
<dlg:button dlg:id="ExportButton" dlg:tab-index="34" dlg:left="5" dlg:top="230" 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="230" 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="230" dlg:width="55" dlg:height="12" dlg:value="Help" dlg:button-type="help"/>
<dlg:button dlg:id="HelpButton" dlg:tab-index="36" dlg:left="290" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Help" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptions" 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="" 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"/>