From 2493df3e7d4ddf3011028a724a941988ca786c62 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 26 Jun 2007 15:52:28 +0000 Subject: INTEGRATION: CWS ab35 (1.14.28); FILE MERGED 2007/05/25 11:47:25 ab 1.14.28.1: #i77640# StateChangedHdl_Impl removed --- basctl/source/basicide/tbxctl.cxx | 44 ++------------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index ad7d1126413a..4c889b448f26 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tbxctl.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2007-01-16 16:33:48 $ + * last change: $Author: hr $ $Date: 2007-06-26 16:52:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -146,49 +146,9 @@ SfxPopupWindowType TbxControls::GetPopupWindowType() const return(SFX_POPUPWINDOW_ONTIMEOUT); } -IMPL_STATIC_LINK( TbxControls, StateChangedHdl_Impl, StateChangedInfo*, pStateChangedInfo ) -{ - (void)pThis; - try - { - if ( pStateChangedInfo ) - { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager( pStateChangedInfo->xLayoutManager ); - if ( xLayoutManager.is() ) - { - if ( pStateChangedInfo->bDisabled ) - { - xLayoutManager->destroyElement( aSubToolBarResName ); - } - else - { - xLayoutManager->createElement( aSubToolBarResName ); - xLayoutManager->requestElement( aSubToolBarResName ); - } - } - } - } - catch ( Exception& ) - { - // no update - } - - delete pStateChangedInfo; - - return 0; -} - void TbxControls::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( nSID == SID_CHOOSE_CONTROLS ) - { - StateChangedInfo* pStateChangedInfo = new StateChangedInfo; - pStateChangedInfo->xLayoutManager = getLayoutManager(); - pStateChangedInfo->bDisabled = eState & SFX_ITEM_DISABLED; - Application::PostUserEvent( STATIC_LINK( 0, TbxControls, StateChangedHdl_Impl ), pStateChangedInfo ); - } - if( pState ) { SfxAllEnumItem* pItem = PTR_CAST(SfxAllEnumItem, pState); -- cgit v1.2.3