[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/generic

[Yousuf Philips]

 vcl/generic/app/geninst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b4e78d6bec6e4cf4d9fc5afdf8604f034fc0b82
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Dec 1 08:48:55 2015 +0400

    Add 'Linux' string to about dialog OS version info
    
    Change-Id: I651fa1ba23e5630508d94c05202d1af7b31fb0f9
    Reviewed-on: https://gerrit.libreoffice.org/20318
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 1a39e0d6a61942d2259f9406c298f1d14460a7a6)
    Reviewed-on: https://gerrit.libreoffice.org/20494
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 27923a1..b5e5969 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -151,9 +151,9 @@ OUString SalGenericInstance::getOSVersion()
             // "3.16.7-29-desktop ..."
             sal_Int32 nTooDetailed = aVers.indexOf( '.', 2);
             if (nTooDetailed < 1 || nTooDetailed > 8)
-                aKernelVer = "misparse";
+                aKernelVer = "Linux (misparsed version)";
             else // "3.16.7-29-desktop ..."
-                aKernelVer = aVers.copy(0, nTooDetailed);
+                aKernelVer = "Linux " + aVers.copy(0, nTooDetailed);
         }
         fclose( pVersion );
     }