summaryrefslogtreecommitdiff
path: root/desktop/source/app/cmdlinehelp.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-29 22:34:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-30 11:34:37 +0100
commitec940d35c66835217830de105f2793d61a680ebe (patch)
tree801d5bc5b3ae769bb8d722626f171fd1cd8cb81d /desktop/source/app/cmdlinehelp.cxx
parent344ff960be33144f654d2d0ce4340325757acd51 (diff)
build id isn't massively helpful here
Diffstat (limited to 'desktop/source/app/cmdlinehelp.cxx')
-rw-r--r--desktop/source/app/cmdlinehelp.cxx10
1 files changed, 2 insertions, 8 deletions
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;