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

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;
 }