diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-18 22:14:57 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-21 09:27:06 +0000 |
| commit | ac8199288502744e1fdd01b1c62ea25fd7f4f091 (patch) | |
| tree | 312ea189611c61310814c3a415100b9825f5c8db /desktop | |
| parent | 6d779eb1c65b0ce73b1a275dc4534387b97bc927 (diff) | |
PRODUCTEXTENSION: fix various obvious strings and such...
... to look pretty; most of these expect PRODUCTEXTENSION to be a word
like "Beta" but nowadays it is ".micro.rc.alphabeta" numbers so there
should be no space before it.
ReplaceStringHookProc adds insult to injury by refusing to
replace %ABOUTBOX variables unless some %PRODUCT is in the string.
Change-Id: Ib676f3837ab0785529a226fc9359e8defacf3459
(cherry picked from commit c106167f5f6ec1bff9b2291ff8791ca6d4d411c3)
Reviewed-on: https://gerrit.libreoffice.org/1763
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/cmdlinehelp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 9ac63a5a5948..86a545bdeeda 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -467,7 +467,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) { rtl::OUString sRet(rStr); - if ( sRet.indexOf( "%PRODUCT" ) != -1 ) + if (sRet.indexOf("%PRODUCT") != -1 || sRet.indexOf("%ABOUTBOX") != -1) { rtl::OUString sBrandName = BrandName::get(); rtl::OUString sVersion = Version::get(); diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 8ed32f72c63f..73d56133c6ab 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\n"\ "\n"; const char aCmdLineHelp_head[] = "Usage: %CMDNAME [options] [documents...]\n"\ |