diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-05 11:08:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-05 12:06:19 +0000 |
| commit | 39808b3e742684a1238dcddb1a057a89769ccb71 (patch) | |
| tree | 5a767f6caa40d5fbfbcc0f85cb8c92e46796abf9 | |
| parent | 628ed5e89b6c92d41c4ba411ec53ff6bb0f3fbc8 (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
(cherry picked from commit 379a53017447fbf2a459f82ae8905b6683e80e8d)
Reviewed-on: https://gerrit.libreoffice.org/5822
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -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 8b7714dc030c..b005b79f8a7f 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -317,7 +317,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; |