diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:40:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:40:42 +0000 |
| commit | c176f1d6ba6f7e9c9e8c9b335fb4838bab68fe74 (patch) | |
| tree | c6548ee2c7918e9dac93a3df463060a457acf892 /framework | |
| parent | 120ee42e8c47ca95cc0a51b5bfaf6788df88c4c4 (diff) | |
INTEGRATION: CWS supdremove02 (1.8.132); FILE MERGED
2008/01/31 13:46:54 rt 1.8.132.1: #i85482# Remove UPD from resource name.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 47dc53303f0f..5ae0c8fabc09 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: controlmenucontroller.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:16:39 $ + * last change: $Author: obo $ $Date: 2008-02-25 15:40:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -293,7 +293,6 @@ ControlMenuController::~ControlMenuController() void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); - aResName += rtl::OUString::valueOf( sal_Int32( SUPD )); ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); @@ -497,7 +496,6 @@ void SAL_CALL ControlMenuController::setPopupMenu( const Reference< css::awt::XP { rtl::OStringBuffer aBuf( 32 ); aBuf.append( "svx" ); - aBuf.append( sal_Int32( SUPD ) ); ResMgr* pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); if ( pResMgr ) |