chart47: #i109770# #i110253# reduce assertions 'already disposed or closed' -…

chart47: #i109770# #i110253# reduce assertions 'already disposed or closed' - don't close the document twice

qadevOOo/tests/java/mod/_sch/AccArea.java

@@ -111,9 +111,11 @@ public class AccArea extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccAxis.java

@@ -109,9 +109,11 @@ public class AccAxis extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccDataPoint.java

@@ -110,9 +110,11 @@ public class AccDataPoint extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccDataSeries.java

@@ -110,9 +110,11 @@ public class AccDataSeries extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccDiagram.java

@@ -110,9 +110,11 @@ public class AccDiagram extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccFloor.java

@@ -135,9 +135,11 @@ public class AccFloor extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccGrid.java

@@ -111,9 +111,11 @@ public class AccGrid extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccLegend.java

@@ -109,9 +109,11 @@ public class AccLegend extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccLegendEntry.java

@@ -109,9 +109,11 @@ public class AccLegendEntry extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java

@@ -114,9 +114,11 @@ public class AccStatisticsObject extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccTitle.java

@@ -109,9 +109,11 @@ public class AccTitle extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccWall.java

@@ -134,9 +134,11 @@ public class AccWall extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 }

qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java

@@ -102,8 +102,11 @@ public class AccessibleDocumentView extends TestCase {
     * @param log writer to log information while testing
     */
     protected void cleanup( TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXChartAxis.java

@@ -86,8 +86,11 @@ public class ChXChartAxis extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXChartData.java

@@ -73,8 +73,11 @@ public class ChXChartData extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java

@@ -76,8 +76,11 @@ public class ChXChartDataArray extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXChartDocument.java

@@ -77,10 +77,16 @@ public class ChXChartDocument extends TestCase {
     * Disposes Chart documents.
     */
     protected void cleanup(TestParameters Param, PrintWriter log) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
-        log.println( "    closing xChartDoc2 " );
-        util.DesktopTools.closeDoc(doc2);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
+        if( doc2!=null ) {
+            log.println( "    closing xChartDoc2" );
+            util.DesktopTools.closeDoc(doc2);
+            doc2 = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXChartView.java

@@ -84,8 +84,11 @@ public class ChXChartView extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXDataPoint.java

@@ -101,8 +101,11 @@ public class ChXDataPoint extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChXDataRow.java

@@ -107,8 +107,11 @@ public class ChXDataRow extends TestCase {
     * Disposes Chart document.
     */
     protected synchronized void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
 

qadevOOo/tests/java/mod/_sch/ChartArea.java

@@ -92,8 +92,11 @@ public class ChartArea extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChartGrid.java

@@ -81,8 +81,11 @@ public class ChartGrid extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChartLegend.java

@@ -109,8 +109,11 @@ public class ChartLegend extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChartLine.java

@@ -79,8 +79,11 @@ public class ChartLine extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_sch/ChartTitle.java

@@ -91,8 +91,11 @@ public class ChartTitle extends TestCase {
     * Disposes Chart document.
     */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    closing xChartDoc " );
-        util.DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**

qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java

@@ -95,8 +95,11 @@ public class XMLExporter extends TestCase {
      * Document disposed here.
      */
     protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    close xChartDoc " );
-        DesktopTools.closeDoc(xChartDoc);
+        if( xChartDoc!=null ) {
+            log.println( "    closing xChartDoc" );
+            util.DesktopTools.closeDoc(xChartDoc);
+            xChartDoc = null;
+        }
     }
 
     /**