From c106167f5f6ec1bff9b2291ff8791ca6d4d411c3 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jan 2013 22:14:57 +0100 Subject: 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 --- framework/source/fwe/helper/titlehelper.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'framework/source/fwe') diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index ff647422ae65..ec2ae43c84ca 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 -> @@ -530,17 +529,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) { @@ -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::getBuildIdData(sDefault); sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" [")); -- cgit