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

[Christopher Hotchkiss]

 desktop/source/app/app.cxx         |    3 +++
 desktop/source/app/cmdlinehelp.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b4d3f5c2b0b9b5b1c4f24a0f391fb355caaef7d0
Author: Christopher Hotchkiss <christopher.hotchkiss at gmail.com>
Date:   Thu Feb 14 23:48:31 2013 -0500

    Added the current commit to "soffice --version". Fixes bug 60688.
    
    Change-Id: I95300b093b4fabc9a52f9c92de874f7c8e4d2869
    Reviewed-on: https://gerrit.libreoffice.org/2160
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 70060ed..bc75d8d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -72,6 +72,7 @@
 #include <toolkit/unohlp.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
+#include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -484,6 +485,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
     {
         rtl::OUString sBrandName = BrandName::get();
         rtl::OUString sVersion = Version::get();
+        rtl::OUString sBuildId = utl::Bootstrap::getBuildIdData("development");
         rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
         rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
         rtl::OUString sExtension = Extension::get();
@@ -507,6 +509,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
 
         sRet = sRet.replaceAll( "%PRODUCTNAME", sBrandName );
         sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+        sRet = sRet.replaceAll( "%BUILDID", sBuildId );
         sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
         sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
         sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 73d5613..84a5159 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -45,7 +45,7 @@ namespace desktop
     //     [OK]
 
     const char aCmdLineHelp_version[] =
-        "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION\n"\
+        "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"\
         "\n";
     const char aCmdLineHelp_head[] =
         "Usage: %CMDNAME [options] [documents...]\n"\