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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/fwe/helper/titlehelper.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b54c3042202a..10409e4d9050 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -490,7 +490,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_appendComponentTitle (sTitle, xComponent); impl_appendProductName (sTitle); impl_appendModuleName (sTitle); - impl_appendProductExtension (sTitle); impl_appendDebugVersion (sTitle); // SYNCHRONIZED -> @@ -531,17 +530,6 @@ void TitleHelper::impl_appendProductName (::rtl::OUStringBuffer& sTitle) } //***************************************************************************************************************** -void TitleHelper::impl_appendProductExtension (::rtl::OUStringBuffer& sTitle) -{ - rtl::OUString ext(utl::ConfigManager::getProductExtension()); - if (!ext.isEmpty()) - { - sTitle.append(' '); - sTitle.append(ext); - } -} - -//***************************************************************************************************************** void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) { // SYNCHRONIZED -> @@ -578,6 +566,9 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) #ifdef DBG_UTIL void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle) { + rtl::OUString version(utl::ConfigManager::getProductVersion()); + sTitle.append(' '); + sTitle.append(version); ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("development")); ::rtl::OUString sVersion = ::utl::Bootstrap::getProductSource(sDefault); sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" [")); |