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
Download patch file Download diff file Expand all files Collapse all files

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