[Libreoffice-commits] .: 3 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 4d62313de5dd568230fa06634569e5d098bef7be
Merge: cb7dc5b... 51e73a5...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jun 6 12:53:10 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'

commit 51e73a5871c5d2fb2e2aeeaa9c9d08d84f0f7450
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue May 31 14:58:48 2011 +0200

    use --nologo to prevent oosplash smoketest hangs

diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 9bdddca..9225411 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -76,7 +76,7 @@ void OfficeConnection::setUp() {
             RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
         rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
         //Disable use of the unix standalone splash screen app for the tests
-        rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
+        rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--nologo"));
         rtl::OUString acceptArg(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
commit 4a57e4bdad0ace4b5bc784a98750b7da1761e460
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu May 19 00:26:52 2011 +0200

    fdo#37325: make toolkit.UnoScrollBarControl not fail headless

diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 640365f..6d9db8d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -76,7 +76,7 @@ public class UnoScrollBarControl extends TestCase {
             XWindow xWin = xFrame.getContainerWindow();
             
             Toolkit tk = Toolkit.getDefaultToolkit();
-            Dimension dim = tk.getScreenSize();
+            Dimension dim = new Dimension(800, 600);
             
             Rectangle newPosSize = xWin.getPosSize();
             newPosSize.Width = new Double(dim.getWidth()).intValue();