diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 11:58:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 11:58:14 +0000 |
| commit | a086ad052dd364fa6aba48dc70ecc32c4e214b77 (patch) | |
| tree | 167889906921c880c3e644b7fb8a916707dc6c3f | |
| parent | d5f456915115d43394b53f8821cf8a39e7f40f26 (diff) | |
INTEGRATION: CWS pbfinal01 (1.18.8); FILE MERGED
2005/02/10 12:19:51 pb 1.18.8.2: RESYNC: (1.18-1.20); FILE MERGED
2005/02/01 13:58:03 pb 1.18.8.1: fix: #118597# remove 'Beta Forum' hack
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f2ad96e8e712..8bef046367d8 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menubarmanager.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: vg $ $Date: 2005-02-16 16:32:00 $ + * last change: $Author: vg $ $Date: 2005-02-25 12:58:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,9 +190,6 @@ #ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> #endif -#ifndef _UTL_CONFIGMGR_HXX_ -#include <unotools/configmgr.hxx> -#endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif @@ -1448,17 +1445,6 @@ String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL ) } } - // --> PB 2004-11-25 #118595# HACK!!! only for SO8 Beta - if ( aCmdURL.CompareToAscii( ".uno:HelpSupport" ) == COMPARE_EQUAL ) - { - Any aAny = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); - rtl::OUString sName; - aAny >>= sName; - if ( sName.equalsAscii( "StarOffice" ) || sName.equalsAscii( "StarSuite" ) ) - aLabel = rtl::OUString::createFromAscii( "Beta ~Support Forum..." ); - } - // <-- - return aLabel; } |