summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2011-01-03 13:09:08 +0100
committersb <sb@openoffice.org>2011-01-03 13:09:08 +0100
commitab514a1743c7d5c24182f1e38ecd44b8c059894b (patch)
tree58142ffc35bdc46d033366809fd2ff4318635697 /qadevOOo
parentc767c3cbeb4d18bdd4334fd23de446be86cb041d (diff)
parent0aea5f8fa50336696d98adfe70a0b3f06ffab90a (diff)
sb135: merged in DEV300_m96
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java21
-rw-r--r--qadevOOo/runner/org/openoffice/Runner.java2
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());