diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-05 10:07:18 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-05 10:07:18 +0100 |
commit | 7fabea3b2b4590a5204568f3d4b539333458eab4 (patch) | |
tree | 8d2eb2068a585a4bd4f4b86c6468125f47cb0ef8 /qadevOOo | |
parent | Automated merge with http://hg.services.openoffice.org/cws/dba34b (diff) | |
parent | CWS-TOOLING: integrate CWS dv22 (diff) | |
download | core-7fabea3b2b4590a5204568f3d4b539333458eab4.tar.gz core-7fabea3b2b4590a5204568f3d4b539333458eab4.zip |
dba34b: merged DEV300m96
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 21 | ||||
-rw-r--r-- | qadevOOo/runner/org/openoffice/Runner.java | 2 |
2 files changed, 15 insertions, 8 deletions
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()); |