[Libreoffice-commits] .: test/source

[Caolán McNamara]

 test/source/cpp/officeconnection.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c8c48cada3b0367de2fc57542763a68cddddd2e8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 13 11:32:23 2010 +0100

    don't use the Unix splash screen app during the smoketest

diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 88a3806..d8198a0 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -76,6 +76,8 @@ void OfficeConnection::setUp() {
         rtl::OUString nofirstArg(
             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 acceptArg(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-accept=")) + desc +
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
@@ -93,7 +95,7 @@ void OfficeConnection::setUp() {
             RTL_CONSTASCII_USTRINGPARAM(
                 "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"));
         rtl_uString * args[] = {
-            noquickArg.pData, nofirstArg.pData, norestoreArg.pData,
+            noquickArg.pData, nofirstArg.pData, norestoreArg.pData, noSplashArg.pData,
             acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData };
         rtl_uString ** envs = 0;
         rtl::OUString argEnv;