diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-05 11:08:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-05 11:12:20 +0200 |
| commit | 379a53017447fbf2a459f82ae8905b6683e80e8d (patch) | |
| tree | 0fcd95695245e48f6f25df656c1b9667b29e44fc /vcl | |
| parent | 13badfb5ccd296faf480b19b2b33f7633f4085c5 (diff) | |
Consistently use rtl_getAppCommandArg here
...2a9c1d1a75b7d4e79dfbc6be3dada1a1e959e58e "Make dialogs fail with an exception
in headless tests" missed one of the osl_getCommandArg calls, which can lead to
problems when there are any -env: arguments preceeding the --display argument.
Reported by renduly on IRC.
Change-Id: I98dd24be840d561dce51034088f3e44adff9f2ff
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index d2d91dee76b2..6edf8d1891cf 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -318,7 +318,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() rtl_getAppCommandArg( i, &aParam.pData ); if( i < nParams-1 && (aParam == "-display" || aParam == "--display" ) ) { - osl_getCommandArg( i+1, &aParam.pData ); + rtl_getAppCommandArg( i+1, &aParam.pData ); aBParm = OUStringToOString( aParam, osl_getThreadTextEncoding() ); pDisplayStr = aBParm.getStr(); break; |