Tag: cws_src680_oj14 User: oj Date: 2007-05-15 07:46:29+0000 Modified: dba/reportdesign/source/core/api/ReportDefinition.cxx dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i77069# set back color for page File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -6 ------------------- --- ReportDefinition.cxx 2007-05-09 13:50:33+0000 1.1.2.1 +++ ReportDefinition.cxx 2007-05-15 07:46:26+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportDefinition.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:50:33 $ + * last change: $Author: oj $ $Date: 2007/05/15 07:46:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -235,7 +235,6 @@ #define MAP_LEN(x) x, sizeof(x) - 1 #define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) // page styles -#define SC_UNO_PAGE_BACKTRANS "BackTransparent" #define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" #define SC_UNO_PAGE_LEFTBORDER "LeftBorder" #define SC_UNO_PAGE_RIGHTBORDER "RightBorder" @@ -417,7 +416,7 @@ const sal_Bool bFalse = sal_False; const sal_Bool bTrue = sal_True; const sal_Int32 nMargin = 2000; - const sal_Int32 nColor = COL_WHITE; + //const sal_Int32 nColor = COL_WHITE; const sal_Int32 nTransparent = COL_TRANSPARENT; const sal_Int32 nZero = 0; const sal_Int16 n16Zero = 0; @@ -431,12 +430,12 @@ sal_Int32 i = 0; registerPropertyNoMember( PROPERTY_NAME, ++i, beans::PropertyAttribute::BOUND,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); - registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,0,::getCppuType((const sal_Int32*)0) ,&nColor); + registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,0,::getCppuType((const sal_Int32*)0) ,&nTransparent); //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,0,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ++i,0,::getBooleanCppuType() ,&bTrue); + registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,0,::getBooleanCppuType() ,&bTrue); //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); 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.1.2.5&r2=1.1.2.6 Delta lines: +7 -3 ------------------- --- ReportController.cxx 2007-05-15 07:11:11+0000 1.1.2.5 +++ ReportController.cxx 2007-05-15 07:46:26+0000 1.1.2.6 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.1.2.5 $ + * $Revision: 1.1.2.6 $ * - * last change: $Author: oj $ $Date: 2007/05/15 07:11:11 $ + * last change: $Author: oj $ $Date: 2007/05/15 07:46:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2604,7 +2604,11 @@ lcl_setStyleProperty(m_xReportDefinition,PROPERTY_NUMBERINGTYPE,static_cast<sal_Int16>(pPageItem->GetNumType())); } if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_BRUSH,sal_True,&pItem)) - lcl_setStyleProperty(m_xReportDefinition,PROPERTY_BACKCOLOR,static_cast<const SvxBrushItem*>(pItem)->GetColor().GetColor()); + { + ::Color aBackColor = static_cast<const SvxBrushItem*>(pItem)->GetColor(); + lcl_setStyleProperty(m_xReportDefinition,PROPERTY_BACKTRANSPARENT,aBackColor == COL_TRANSPARENT); + lcl_setStyleProperty(m_xReportDefinition,PROPERTY_BACKCOLOR,aBackColor.GetColor()); + } getUndoMgr()->LeaveListAction(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
