bug 9012 fixed - Print preview triggered a java exception.

Change-Id: I23ccca248ca0863a4b402358f099d53db89aa299

diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 67eeda6..9b2305a 100644 (file)
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -18,6 +18,8 @@ Scinotes:
 
 * The selection is now highlighted in yellow in all the document.
 
+* bug 9012 fixed - Print preview triggered a java exception.
+
 * bug 9047 fixed - edit('foo',12) now opens the function foo 12 lines after the
                    definition of foo.
 

diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 664b28c..51e8333 100644 (file)
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -28,14 +28,15 @@ The option is "disableUnderMode" and can be:
 <classpaths>
 
 <!-- Mandatory on startup -->
+<path value="$SCILAB/thirdparty/flexdock-0.5.2.jar"/>
+<path value="$SCILAB/thirdparty/jrosetta-API.jar" disableUnderMode="NW"/>
+<path value="$SCILAB/thirdparty/jrosetta-engine.jar"/>
+<path value="$SCILAB/thirdparty/skinlf.jar"/>
+<path value="$SCILAB/thirdparty/looks-2.1.1.jar"/>
+<path value="$SCILAB/thirdparty/commons-logging-1.1.jar"/>
+<path value="$SCILAB/thirdparty/jhall.jar"/>
 
-<path value="$SCILAB/thirdparty/flexdock-0.5.2.jar" load="startup"/>
-<path value="$SCILAB/thirdparty/jrosetta-API.jar" load="startup" disableUnderMode="NW"/>
-<path value="$SCILAB/thirdparty/jrosetta-engine.jar" load="startup"/>
-<path value="$SCILAB/thirdparty/skinlf.jar" load="startup"/>
-<path value="$SCILAB/thirdparty/looks-2.1.1.jar" load="startup"/>
-<path value="$SCILAB/thirdparty/commons-logging-1.1.jar" load="startup"/>
-<path value="$SCILAB/thirdparty/jhall.jar" load="startup"/>
+<!-- Load when needed -->
 
 <path value="$SCILAB/thirdparty/jgraphx.jar" load="onUse">
        <load on="XCos"/>
@@ -75,6 +76,15 @@ The option is "disableUnderMode" and can be:
        <load on="graphics_mathml_textrendering"/>
        <load on="xcos_mathml_rendering"/>
 </path>
+
+<path value="$SCILAB/thirdparty/jlatexmath-fop-0.9.4.jar" load="onUse">
+       <load on="documentationGeneration"/>
+       <load on="pdf_ps_eps_graphic_export"/>
+</path>
+<path value="$SCILAB/thirdparty/fop.jar" load="onUse">
+       <load on="documentationGeneration"/>
+       <load on="pdf_ps_eps_graphic_export"/>
+</path>
 <path value="$SCILAB/thirdparty/saxon.jar" load="onUse">
        <load on="documentationGeneration"/>
 </path>
@@ -84,10 +94,6 @@ The option is "disableUnderMode" and can be:
        <load on="pdf_ps_eps_graphic_export"/>
        <load on="XCos"/>
 </path>
-<path value="$SCILAB/thirdparty/fop.jar" load="onUse">
-       <load on="documentationGeneration"/>
-       <load on="pdf_ps_eps_graphic_export"/>
-</path>        
 <path value="$SCILAB/thirdparty/xml-apis-ext.jar" load="onUse">
        <load on="documentationGeneration"/>
        <load on="pdf_ps_eps_graphic_export"/>
@@ -99,7 +105,7 @@ The option is "disableUnderMode" and can be:
        <load on="documentationGeneration"/>
        <load on="graphics_mathml_textrendering"/>
        <load on="pdf_ps_eps_graphic_export"/>
-       <load on="XCos"/>
+       <load on="xcos"/>
 </path>
 
 <!-- PDF doc generation (dep of jeuclid) -->
@@ -114,22 +120,12 @@ The option is "disableUnderMode" and can be:
        <load on="pdf_ps_eps_graphic_export"/>
 </path>
 
-<path value="$SCILAB/thirdparty/xalan.jar" load="onUse">
-       <load on="documentationGeneration"/>
-       <load on="pdf_ps_eps_graphic_export"/>
-</path>        
-
 <path value="$SCILAB/thirdparty/jlatexmath-0.9.4.jar" load="onUse">
-       <load on="documentationGeneration"/>
+       <load on="documentationGeneration"/>
        <load on="graphics_latex_textrendering"/>
        <load on="pdf_ps_eps_graphic_export"/>
        <load on="XCos"/>
-</path>        
-
-<path value="$SCILAB/thirdparty/jlatexmath-fop-0.9.4.jar" load="onUse">
-       <load on="documentationGeneration"/>
-       <load on="pdf_ps_eps_graphic_export"/>
-</path>        
+</path>
 
 <!-- helptools module doc generation -->
 <path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="onUse">
@@ -158,6 +154,7 @@ The option is "disableUnderMode" and can be:
 <path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar"/>
 
 <path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar"/>
+
 <path value="$SCILAB/modules/core/jar/org.scilab.modules.core.jar"/>
 
 <!-- scinotes module -->

diff --git a/scilab/modules/helptools/helptools.iss b/scilab/modules/helptools/helptools.iss
index 091eabf..11771e9 100644 (file)
--- a/scilab/modules/helptools/helptools.iss
+++ b/scilab/modules/helptools/helptools.iss
@@ -59,7 +59,6 @@ Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COM
 Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#HELPTOOLS}\VERSION.xml; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}

diff --git a/scilab/modules/scinotes/tests/nonreg_tests/bug_9012.tst b/scilab/modules/scinotes/tests/nonreg_tests/bug_9012.tst
new file mode 100644 (file)
index 0000000..17ea265
--- /dev/null
+++ b/scilab/modules/scinotes/tests/nonreg_tests/bug_9012.tst
@@ -0,0 +1,20 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- INTERACTIVE TEST -->
+// <-- TEST WITH SCINOTES -->
+//
+// <-- Non-regression test for bug 9012 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/9012
+//
+// <-- Short Description -->
+// Print preview triggered a java exception.
+
+// Open a script
+// File => Print preview