User: ihi Date: 2007-11-19 17:24:00+0000 Modified: dba/reportdesign/source/ui/misc/toolboxcontroller.cxx
Log: INTEGRATION: CWS fwk74 (1.3.22); FILE MERGED 2007/09/13 09:43:07 cd 1.3.22.2: #i74437# Remove obsolete code 2007/09/07 12:18:35 cd 1.3.22.1: #i74437# Don't use obsolete old font height toolbox controller File Changes: Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/toolboxcontroller.cxx?r1=1.4&r2=1.5 Delta lines: +0 -22 -------------------- --- toolboxcontroller.cxx 2007-10-23 14:38:58+0000 1.4 +++ toolboxcontroller.cxx 2007-11-19 17:23:57+0000 1.5 @@ -241,13 +241,6 @@ m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAscii(".uno:FontHeight") ) - { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontHeight")),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True)); - m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontHeightToolBoxControl(m_nSlotId = SID_ATTR_CHAR_FONTHEIGHT,m_nToolBoxId,*pToolBox)); - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ))); - } else if ( m_aCommandURL.equalsAscii(".uno:CharFontName") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True)); @@ -333,18 +326,6 @@ static_cast<SvxColorToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled ? SFX_ITEM_SET : SFX_ITEM_DISABLED,&aColorItem); } break; - case SID_ATTR_CHAR_FONTHEIGHT: - { - /*::std::auto_ptr<SfxPoolItem> pState; - if ( Event.FeatureURL.Complete == m_aCommandURL ) - pState.reset(new SvxFontHeightItem()); - else - pState.reset(new SvxFontItem()); - pState->PutValue(Event.State);*/ - //static_cast<SvxFontHeightToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled ? SFX_ITEM_AVAILABLE : SFX_ITEM_DISABLED,pState.get()); - static_cast<SvxFontHeightToolBoxControl*>(m_pToolbarController.get())->statusChanged(Event); - } - break; case SID_ATTR_CHAR_FONT: { SvxFontItem aItem(ITEMID_FONT); @@ -415,9 +396,6 @@ { switch(m_nSlotId) { - case SID_ATTR_CHAR_FONTHEIGHT: - xWindow = VCLUnoHelper::GetInterface(static_cast<SvxFontHeightToolBoxControl*>(m_pToolbarController.get())->CreateItemWindow(VCLUnoHelper::GetWindow(_xParent))); - break; case SID_ATTR_CHAR_FONT: xWindow = VCLUnoHelper::GetInterface(static_cast<SvxFontNameToolBoxControl*>(m_pToolbarController.get())->CreateItemWindow(VCLUnoHelper::GetWindow(_xParent))); break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
