User: hr Date: 2007-08-03 10:03:25+0000 Modified: dba/reportdesign/source/ui/misc/toolboxcontroller.cxx
Log: INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED 2007/07/30 05:36:12 oj 1.2.4.2: #80161# apply gcc3 patch for strings 2007/07/27 12:21:58 oj 1.2.4.1: #i77907# remove entries from context when propbrw is destroyed 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.2&r2=1.3 Delta lines: +8 -4 ------------------- --- toolboxcontroller.cxx 2007-07-09 11:56:32+0000 1.2 +++ toolboxcontroller.cxx 2007-08-03 10:03:22+0000 1.3 @@ -158,11 +158,13 @@ return *(new OToolboxController(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY))); } // ----------------------------------------------------------------------------- +DBG_NAME(rpt_OToolboxController) OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB) : m_pToolbarController(NULL) ,m_nToolBoxId(1) ,m_nSlotId(0) { + DBG_CTOR(rpt_OToolboxController,NULL); osl_incrementInterlockedCount(&m_refCount); m_xServiceManager = _rxORB; osl_decrementInterlockedCount(&m_refCount); @@ -171,6 +173,7 @@ // ----------------------------------------------------------------------------- OToolboxController::~OToolboxController() { + DBG_DTOR(rpt_OToolboxController,NULL); } // ----------------------------------------------------------------------------- // XInterface @@ -325,7 +328,8 @@ { util::Color nColor(COL_TRANSPARENT); Event.State >>= nColor; - SvxColorItem aColorItem(::Color(nColor),1); + ::Color aGcc3WorkaroundTemporary( nColor); + SvxColorItem aColorItem(aGcc3WorkaroundTemporary,1); if ( SID_ATTR_CHAR_COLOR2 == m_nSlotId ) static_cast<SvxFontColorExtToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled ? SFX_ITEM_SET : SFX_ITEM_DISABLED,&aColorItem); else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
