diff options
| author | Christopher Hotchkiss <christopher.hotchkiss@gmail.com> | 2013-02-14 23:48:31 -0500 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-15 13:04:44 +0000 |
| commit | b4d3f5c2b0b9b5b1c4f24a0f391fb355caaef7d0 (patch) | |
| tree | 6f4a76a97d98c364f67850def090684a5d03385b /desktop | |
| parent | ba18e945fa225543ac8d9e901c98841410094177 (diff) | |
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@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/app/cmdlinehelp.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 70060ed1b306..bc75d8dc9f8b 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 73d56133c6ab..84a5159e8a39 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"\ |