Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-24 09:58:52+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i77181# set background color File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.2&r2=1.2.4.1 Delta lines: +8 -2 ------------------- --- ReportController.cxx 2007-07-09 11:56:32+0000 1.2 +++ ReportController.cxx 2007-07-24 09:58:49+0000 1.2.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.4.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:32 $ + * last change: $Author: oj $ $Date: 2007/07/24 09:58:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3217,6 +3217,8 @@ ::rtl::OUString sUrl = aMap.getUnpackedValueOrDefault(PROPERTY_IMAGEURL,::rtl::OUString()); if ( sUrl.getLength() && xInfo->hasPropertyByName(PROPERTY_IMAGEURL) ) xUnoProp->setPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( sUrl ) ); + if ( xInfo->hasPropertyByName(PROPERTY_BACKGROUNDCOLOR) ) + xUnoProp->setPropertyValue(PROPERTY_BACKGROUNDCOLOR,xShapeProp->getPropertyValue(PROPERTY_CONTROLBACKGROUND)); pObj->CreateMediator(sal_True); const sal_Int32 nShapeWidth = xShapeProp->getWidth(); @@ -3484,6 +3486,8 @@ ReportFormula aFormula( ReportFormula::Field, sName ); xUnoProp->setPropertyValue( PROPERTY_DATAFIELD, uno::makeAny( aFormula.getCompleteFormula() ) ); } + if ( xInfo->hasPropertyByName(PROPERTY_BACKGROUNDCOLOR) ) + xUnoProp->setPropertyValue(PROPERTY_BACKGROUNDCOLOR,xShapeProp->getPropertyValue(PROPERTY_CONTROLBACKGROUND)); pObjs[i]->CreateMediator(sal_True); // need SectionView from the above or follow Section @@ -3666,6 +3670,7 @@ if ( m_xReportDefinition.is() ) { + const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getReportHeaderOn(); if ( SID_REPORTHEADERFOOTER == _nId ) { @@ -3712,6 +3717,7 @@ OSL_ENSURE(_nId == SID_PAGEHEADERFOOTER || _nId == SID_PAGEHEADER_WITHOUT_UNDO || _nId == SID_PAGEFOOTER_WITHOUT_UNDO ,"Illegal id given!"); if ( m_xReportDefinition.is() ) { + const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getPageHeaderOn(); if ( SID_PAGEHEADERFOOTER == _nId ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
