diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-05-20 17:28:14 +0200 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-05-20 17:28:14 +0200 |
| commit | 7687340730f26a559367fad971f95c0bd15a995a (patch) | |
| tree | a93ae02c3b4a6bfc26df3bcb56a2c0926ef97700 /qadevOOo | |
| parent | 9f124082f800eed4f436203fd309b17fd7584f95 (diff) | |
chart47: #i111102# close chart documents after testing
Diffstat (limited to 'qadevOOo')
6 files changed, 38 insertions, 20 deletions
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index 8ec11a9360b9..6fe4765389da 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -91,11 +91,14 @@ public class XMLContentExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xChartDoc " ); - xChartDoc.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 1c5970c7d5e0..5e48b073fc9f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -91,11 +91,15 @@ public class XMLContentImporter extends TestCase { } /** - * Disposes document. - */ + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index a5027b3f989d..c0edd4f82cda 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -92,7 +92,7 @@ public class XMLExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index b8d441751540..83a422df9128 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -91,11 +91,15 @@ public class XMLImporter extends TestCase { } /** - * Disposes document. - */ + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index 9435907adb3c..4405b5c5ac60 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -90,11 +90,14 @@ public class XMLStylesExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xChartDoc " ); - xChartDoc.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index 617b2f92cbc4..7bd02228203d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -88,12 +88,16 @@ public class XMLStylesImporter extends TestCase { comp = xChartDoc; } - /** - * Disposes document. - */ + /** + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** |