[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

Takeshi Abe (via logerrit) logerrit at kemper.freedesktop.org
Sat Jun 1 17:59:14 UTC 2019


 cui/source/dialogs/about.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit df67a9ae9c1e9f3e21b1674deb4036f61eced05c
Author:     Takeshi Abe <tabe at fixedpoint.jp>
AuthorDate: Thu May 30 23:56:25 2019 +0900
Commit:     Xisco FaulĂ­ <xiscofauli at libreoffice.org>
CommitDate: Sat Jun 1 19:58:36 2019 +0200

    tdf#124936 Show "(x86)" in About dialog on the 32-bit version
    
    ... installed on Windows.
    
    Change-Id: I2a4d846265b69f0e46e4c711430689ce39d60fcd
    Reviewed-on: https://gerrit.libreoffice.org/73211
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 932c1bd99f4b99705c3948d0babaa1f4160f37c3)
    Reviewed-on: https://gerrit.libreoffice.org/73313
    Tested-by: Jenkins
    Reviewed-by: Xisco FaulĂ­ <xiscofauli at libreoffice.org>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a99a814d28e1..2059ac7f10c3 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -304,6 +304,8 @@ OUString AboutDialog::GetVersionString()
 
 #ifdef _WIN64
     sVersion += " (x64)";
+#elif defined(_WIN32)
+    sVersion += " (x86)";
 #endif
 
     OUString sBuildId = GetBuildId();


More information about the Libreoffice-commits mailing list