[Libreoffice-commits] core.git: cui/source

Tor Lillqvist tml at iki.fi
Thu Aug 29 04:52:05 PDT 2013


 cui/source/dialogs/about.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c83ee34a642ead0007b69b2dd93e18d25e6606fa
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 29 14:50:10 2013 +0300

    Include <config_buildid.h> for EXTRA_BUILDID
    
    Fix loplugin error: checking whether a config macro EXTRA_BUILDID is defined.
    
    Change-Id: Ieb04a8da4dc54b41f4df1d63b5e70ffb7ca7bb01

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 73fe04e..54d4fbf 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_buildid.h>
+
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
@@ -242,10 +244,11 @@ OUString AboutDialog::GetVersionString()
         sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId);
     }
 
-#ifdef EXTRA_BUILDID
-    sVersion += "\n";
-    sVersion += EXTRA_BUILDID;
-#endif
+    if (strlen(EXTRA_BUILDID) > 0)
+    {
+        sVersion += "\n";
+        sVersion += EXTRA_BUILDID;
+    }
 
     return sVersion;
 }


More information about the Libreoffice-commits mailing list