[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx

[Stephan Bergmann]

 vcl/unx/generic/desktopdetect/desktopdetector.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4065524c3fa0167f195146cc4858fc9013a01cbb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 5 11:08:23 2013 +0200

    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/5821
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index f1d6c26..bdec96d3 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -315,7 +315,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;