Tag: cws_src680_oj17 User: oj Date: 06/04/10 23:55:33 Modified: /dba/dbaccess/source/ui/control/ toolboxcontroller.cxx
Log: #i53480# change item text File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/toolboxcontroller.cxx?r1=1.8.96.2&r2=1.8.96.3 Delta lines: +21 -13 --------------------- --- toolboxcontroller.cxx 10 Mar 2006 10:26:39 -0000 1.8.96.2 +++ toolboxcontroller.cxx 11 Apr 2006 06:55:30 -0000 1.8.96.3 @@ -4,9 +4,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.8.96.2 $ + * $Revision: 1.8.96.3 $ * - * last change: $Author: oj $ $Date: 2006/03/10 10:26:39 $ + * last change: $Author: oj $ $Date: 2006/04/11 06:55:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,6 +112,20 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui; + namespace + { + void lcl_copy(Menu* _pMenu,USHORT _nMenuId,USHORT _nMenuPos,ToolBox* _pToolBox,USHORT _nToolId,const ::rtl::OUString& _sCommand) + { + if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING ) + _pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId)); + _pToolBox->SetItemCommand( _nToolId, _sCommand); + _pToolBox->SetHelpId(_nToolId, _pMenu->GetHelpId(_nMenuId)); + _pToolBox->SetHelpText(_nToolId, _pMenu->GetHelpText(_nMenuId)); + _pToolBox->SetQuickHelpText(_nToolId, _pMenu->GetTipHelpText(_nMenuId)); + _pToolBox->SetItemText(_nToolId, _pMenu->GetItemText(_nMenuId)); + } + } + OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB) : m_nToolBoxId(1) { @@ -207,12 +221,8 @@ { m_aCommandURL = aFind->first; - if ( pMenu->GetItemType(i) != MENUITEM_STRING ) - { ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); - pToolBox->SetItemImage(m_nToolBoxId, pMenu->GetItemImage(nItemId)); - pToolBox->SetItemCommand( m_nToolBoxId, m_aCommandURL); - } + lcl_copy(pMenu.get(),nItemId,i,pToolBox,m_nToolBoxId, m_aCommandURL); break; } } @@ -229,7 +239,7 @@ sal_Bool bIsWriterInstalled = SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SWRITER); ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); - sal_Bool bHighContrast = ::dbaui::isHiContrast(pToolBox); + sal_Bool bHighContrast = isHighContrast(); try { @@ -292,11 +302,9 @@ if ( nSelected ) { - if ( pMenu->GetItemType(pMenu->GetItemPos(nSelected)) != MENUITEM_STRING ) - pToolBox->SetItemImage(m_nToolBoxId, pMenu->GetItemImage(nSelected)); - m_aCommandURL = pMenu->GetItemCommand(nSelected); - pToolBox->SetItemCommand( m_nToolBoxId, m_aCommandURL); + lcl_copy(pMenu.get(),nSelected,pMenu->GetItemPos(nSelected),pToolBox,m_nToolBoxId, m_aCommandURL); + Reference<XDispatch> xDispatch = m_aListenerMap.find(m_aCommandURL)->second; if ( xDispatch.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
