[ooo-build-commit] Branch 'ooo/master' - 2 commits - qadevOOo/runner smoketestoo_native/smoketest.pl testautomation/dbaccess
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Oct 14 20:17:09 PDT 2009
qadevOOo/runner/util/FormTools.java | 16 +++++++++++++---
qadevOOo/runner/util/ValueChanger.java | 6 +++---
smoketestoo_native/smoketest.pl | 4 +++-
testautomation/dbaccess/required/includes/Table.inc | 9 ---------
4 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit c3b0912f2618ab6a2e70646f19776c269143966f
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 18:48:09 2009 +0000
CWS-TOOLING: integrate CWS dba32h
2009-10-12 12:21:44 +0200 msc r276827 : remove warning for issue 102712 because the issue is fixed
2009-10-05 07:14:20 +0200 oj r276658 : #105585# add missing dependency for OOO_UI
2009-10-02 12:50:19 +0200 fs r276632 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 12:46:12 +0200 fs r276631 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 13:09:07 +0200 fs r276596 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 12:35:56 +0200 fs r276589 : #i105509# don't rely on default form component names, use indexes
2009-10-01 11:19:18 +0200 fs r276584 : copying the fix for #i105082# into this CWS
2009-10-01 11:13:22 +0200 fs r276583 : improved logs
2009-10-01 11:10:44 +0200 fs r276581 : #i105505#
2009-10-01 08:07:57 +0200 fs r276575 : manual merge of trunk, to allow cwslocalize to run
2009-09-30 22:48:30 +0200 fs r276574 : removed that strange ONLOAD definition
2009-09-30 12:58:18 +0200 fs r276553 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 12:56:45 +0200 fs r276552 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 11:47:45 +0200 fs r276549 : #i105235#
2009-09-29 12:27:40 +0200 fs r276521 : #i105367#
2009-09-28 12:08:17 +0200 oj r276485 : #i105371# export version in manifest.xml as well
2009-09-28 12:07:02 +0200 oj r276484 : #i105371# export version in manifest.xml as well
2009-09-28 09:48:01 +0200 oj r276481 : #i105366# init drivers when not empty
2009-09-25 14:31:27 +0200 fs r276466 : CWS-TOOLING: rebase CWS dba32h to trunk at 276429 (milestone: DEV300:m60)
2009-09-24 13:52:54 +0200 fs r276422 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 11:42:03 +0200 fs r276413 : #i105234# proper zoom handling for the nav bar
2009-09-24 11:41:40 +0200 fs r276412 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-23 12:21:22 +0200 oj r276377 : remove dos lineends
2009-09-23 11:44:52 +0200 oj r276376 : #i105216# load config on demand
2009-09-23 11:44:19 +0200 oj r276375 : #i105216# load config on demand
2009-09-23 11:43:35 +0200 oj r276374 : #i105216# load config on demand
2009-09-21 09:13:03 +0200 oj r276307 : #i105158# use Thread support
2009-09-18 13:06:50 +0200 fs r276277 : #i105147#
2009-09-18 11:48:23 +0200 oj r276271 : #i105158# new method for thread safety
2009-09-18 10:42:56 +0200 fs r276266 : CWS-TOOLING: rebase CWS dba32h to trunk at 276192 (milestone: DEV300:m59)
2009-09-18 08:30:03 +0200 oj r276263 : #i105016# load correct ldap so
2009-09-17 13:42:31 +0200 oj r276240 : change count of check boxes
2009-09-17 13:32:59 +0200 oj r276239 : revert false to true for currency
2009-09-17 09:14:46 +0200 oj r276220 : #i104901# add patch for every issue
2009-09-17 09:10:29 +0200 oj r276219 : #i104901# add patch for every issue
2009-09-11 13:47:49 +0200 oj r276060 : #i104901# fix for indentity
2009-09-11 12:14:14 +0200 fs r276056 : #i104594# allow to render controls without an SdrPageView
2009-09-11 11:49:31 +0200 fs r276055 : CWS-TOOLING: rebase CWS dba32h to trunk at 276043 (milestone: DEV300:m58)
2009-09-10 08:41:40 +0200 oj r276021 : #i104911# export variable-set not for repeating sections
diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java
index ef14163..b5575b2 100644
--- a/qadevOOo/runner/util/FormTools.java
+++ b/qadevOOo/runner/util/FormTools.java
@@ -41,6 +41,7 @@ import com.sun.star.awt.Size;
import com.sun.star.awt.Point;
import com.sun.star.awt.XControlModel;
import com.sun.star.container.XNameContainer;
+import com.sun.star.container.XIndexContainer;
import com.sun.star.form.XFormsSupplier;
import com.sun.star.form.XForm;
import com.sun.star.form.XLoadable;
@@ -192,12 +193,21 @@ public class FormTools {
return oControl;
} // finish createControl
- public static XNameContainer getForms ( XDrawPage oDP ) {
+ public static XNameContainer getForms ( XDrawPage oDP )
+ {
XFormsSupplier oFS = (XFormsSupplier) UnoRuntime.queryInterface(
XFormsSupplier.class,oDP);
return oFS.getForms();
} //finish getForms
+ public static XIndexContainer getIndexedForms ( XDrawPage oDP )
+ {
+ XFormsSupplier oFS = (XFormsSupplier) UnoRuntime.queryInterface(
+ XFormsSupplier.class,oDP);
+ return (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class,
+ oFS.getForms() );
+ } //finish getIndexedForms
+
public static void insertForm ( XComponent aDoc, XNameContainer Forms,
String aName ) {
try {
@@ -222,7 +232,7 @@ public class FormTools {
XLoadable formLoader = null;
try {
- Object aForm = FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName("Standard");
+ Object aForm = FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0);
XForm the_form = null;
try {
the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), aForm);
@@ -257,7 +267,7 @@ public class FormTools {
throws com.sun.star.uno.Exception {
XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class),
- FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName("Standard"));
+ FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0));
XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form);
formProps.setPropertyValue("DataSourceName",sourceName);
formProps.setPropertyValue("Command",tableName);
diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
index 2746d96..b0cdebf 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -957,9 +957,9 @@ public class ValueChanger {
}
} else
- {
- System.out.println("ValueChanger don't know type " + oldValue.getClass());
- }
+ {
+ System.out.println("ValueChanger don't know type " + oldValue.getClass());
+ }
return newValue;
diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc
index 00a9f8f..97b28ea 100755
--- a/testautomation/dbaccess/required/includes/Table.inc
+++ b/testautomation/dbaccess/required/includes/Table.inc
@@ -151,9 +151,6 @@ testcase tSortDescending
endcase
'-------------------------------------------------------------------------
testcase tAutoFilter
-
- warnlog "#102712# AutoFilter does not work"
- goto endsub
'/// open a new table
printlog "open a new table"
@@ -228,9 +225,6 @@ endcase
'-------------------------------------------------------------------------
testcase tRemoveFilter
- warnlog "#102712# AutoFilter does not work"
- goto endsub
-
'/// open a new table
printlog "open a new table"
initTable
@@ -254,9 +248,6 @@ endcase
'-------------------------------------------------------------------------
testcase tApplyFilter
- warnlog "#102712# AutoFilter does not work"
- goto endsub
-
'/// open a new table
printlog "open a new table"
initTable
commit b22666824d5ebace33dce2add2acd7a0260807a2
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 17:49:00 2009 +0000
CWS-TOOLING: integrate CWS rpm4lngx
2009-10-06 14:38:50 +0200 vg r276703 : #160779# new environment for unxlngx6
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl
index 0ed6d91..37908b1 100755
--- a/smoketestoo_native/smoketest.pl
+++ b/smoketestoo_native/smoketest.pl
@@ -702,7 +702,9 @@ sub doInstall {
if ( ($file =~ /-menus-/) or ($file =~ /^adabas/) or (/^j2re-/) or ($file =~ /-gnome-/) ) {
next;
}
- $Command = "rpm --define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file";
+ $Command = "rpm ";
+ $Command .= "--ignorearch " if (defined $ENV{HOSTTYPE} && ($ENV{HOSTTYPE} eq 'x86_64-linux'));
+ $Command .= "--define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file";
execute_Command ($Command, $error_setup, $show_Message, $command_withoutErrorcheck | $command_withoutOutput);
}
$ENV{LD_LIBRARY_PATH}=$ld_library_backup;
More information about the ooo-build-commit
mailing list