From ec940d35c66835217830de105f2793d61a680ebe Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 29 Jun 2011 22:34:59 +0100
Subject: build id isn't massively helpful here

---
 desktop/source/app/app.cxx         |  4 ++--
 desktop/source/app/cmdlinehelp.cxx | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 61e5d20baadf..03382365d302 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1682,9 +1682,9 @@ int Desktop::Main()
 
 #ifdef DBG_UTIL
         //include version ID in non product builds
-        ::rtl::OUString aDefault;
+        ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
         aTitle += DEFINE_CONST_UNICODE(" [");
-        String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
+        String aVerId( utl::Bootstrap::getProductSource(aDefault));
         aTitle += aVerId;
         aTitle += ']';
 #endif
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 00754d91631e..82c9eb560178 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -55,7 +55,7 @@ namespace desktop
     //     [OK]
 
     const char *aCmdLineHelp_version =
-        "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION %BUILDID\n"\
+        "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n"\
         "\n";
     const char *aCmdLineHelp_head =
         "Usage: %CMDNAME [options] [documents...]\n"\
@@ -147,9 +147,6 @@ namespace desktop
         String aHelpMessage_right(aCmdLineHelp_right, RTL_TEXTENCODING_ASCII_US);
         String aHelpMessage_bottom(aCmdLineHelp_bottom, RTL_TEXTENCODING_ASCII_US);
         ReplaceStringHookProc(aHelpMessage_version);
-        ::rtl::OUString aDefault;
-        String aVerId( ::utl::Bootstrap::getBuildIdData( aDefault ));
-        aHelpMessage_version.SearchAndReplaceAscii( "%BUILDID", aVerId );
         aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
 #ifdef UNX
         // on unix use console for output
@@ -184,11 +181,8 @@ namespace desktop
     {
         String aVersionMsg(aCmdLineHelp_version, RTL_TEXTENCODING_ASCII_US);
         ReplaceStringHookProc(aVersionMsg);
-        ::rtl::OUString aDefault;
-        String aVerId = ::utl::Bootstrap::getBuildIdData(aDefault);
-        aVersionMsg.SearchAndReplaceAscii("%BUILDID", aVerId);
 #ifdef UNX
-        fprintf(stdout, "%s", ByteString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).GetBuffer());
+        fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr());
 #else
         // Just re-use the help dialog for now.
         CmdlineHelpDialog aDlg;
-- 
cgit