summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-29 13:39:04 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-29 14:33:51 -0500
commita94c30350ef662a7897d4a274a7168ba16eec238 (patch)
treef324ea13b5245bd98b837ddb94cd3ce4fa8afab4 /vcl
parent47514b528e271c9afc7b68e09946b9ca0f0abaee (diff)
add support for --headless
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/source/desktopdetect/desktopdetector.cxx3
-rw-r--r--vcl/unx/source/plugadapt/salplug.cxx5
2 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index e94861705864..cb3574591bcf 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 c27646cf1fd7..1852b9550f2b 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;
}