From 060633b4b06eb5c64c2710cb6df3027d411b8f7f Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 18 Nov 2010 13:53:40 +0100 Subject: rpttestcleanup01: #115649# fix for graphical compare tests in odb report designer documents --- .../OpenOfficeDatabaseReportExtractor.java | 21 ++++++++++++++------- qadevOOo/runner/org/openoffice/Runner.java | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java index a0592d5ce143..c42a437028fc 100644 --- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java +++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java @@ -373,13 +373,20 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance { String sReportName = sElementNames[i]; XComponent xDoc = loadComponent(sReportName, _xNameAccess, _aPropertyList); -// util.utils.shortWait(1000); - // print? or store? - String sDocumentPathName = storeComponent(sReportName, xDoc /*, _nType*/); - aList.add(sDocumentPathName); -// util.utils.shortWait(1000); - closeComponent(xDoc); -// util.utils.shortWait(1000); + if (xDoc != null) + { + // util.utils.shortWait(1000); + // print? or store? + String sDocumentPathName = storeComponent(sReportName, xDoc /*, _nType*/); + aList.add(sDocumentPathName); + // util.utils.shortWait(1000); + closeComponent(xDoc); + // util.utils.shortWait(1000); + } + else + { + System.out.println("Leave out maybe due to errors."); + } // sBackPath contains the path where to find the extracted ODB Document } } diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index f6397deb3e2b..ca995bc9b4f4 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -184,7 +184,7 @@ public class Runner public static boolean run(String... args) { - System.out.println("OOoRunner Main() version from 20100922 (yyyymmdd)"); + System.out.println("OOoRunner Main() version from 20101118 (yyyymmdd)"); setStartTime(getTime()); -- cgit