[Libreoffice-commits] .: 2 commits - i18npool/qa vcl/unx

[Norbert Thiebaud]

 i18npool/qa/cppunit/makefile.mk                  |    2 +-
 vcl/unx/source/desktopdetect/desktopdetector.cxx |    3 ++-
 vcl/unx/source/plugadapt/salplug.cxx             |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit ef3125ee115b829eef99086f0469532209aa10a3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 29 13:39:19 2011 -0500

    use --xxx instead of -xxx for command line options

diff --git a/i18npool/qa/cppunit/makefile.mk b/i18npool/qa/cppunit/makefile.mk
index 2f0eecb..75f4a91 100644
--- a/i18npool/qa/cppunit/makefile.mk
+++ b/i18npool/qa/cppunit/makefile.mk
@@ -101,7 +101,7 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/t
     @echo ----------------------------------------------------------
     @echo - start unit test \#2 on library $(SHL1TARGETN)
     @echo ----------------------------------------------------------
-    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+    $(CPPUNITTESTER) $(SHL1TARGETN) --headless --invisible \
         -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
         -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
         -env:OOO_INBUILD_SHAREDLIB_DIR="$(my_file)$(PWD)/$(DLLDEST)"
commit 61b417296615ffdafa846284b03812925b2715ca
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 29 13:39:04 2011 -0500

    add support for --headless

diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index e1065be..6c989ad 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/source/desktopdetect/desktopdetector.cxx
@@ -293,7 +293,8 @@ VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
             for( int i = 0; i < nParams; i++ )
             {
                 osl_getCommandArg( i, &aParam.pData );
-                if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-headless" ) ) )
+                if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-headless" ) ) ||
+                    aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--headless" ) ) )
                 {
                     pDisplayStr = NULL;
                     break;
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index d2cee46..7bebeeb 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -215,8 +215,11 @@ static SalInstance* check_headless_plugin()
     for( int i = 0; i < nParams; i++ )
     {
         osl_getCommandArg( i, &aParam.pData );
-        if( aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-headless")) )
+        if( aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-headless")) ||
+            aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--headless")) )
+        {
             return tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "svp" ) ) );
+        }
     }
     return NULL;
 }