Tag: cws_src680_oj14 User: oj Date: 2007-06-06 10:15:38+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/ui/report/ReportSection.cxx
Log: no feature mail for changed items 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.1.2.23&r2=1.1.2.24 Delta lines: +7 -7 ------------------- --- ReportController.cxx 2007-06-06 09:29:56+0000 1.1.2.23 +++ ReportController.cxx 2007-06-06 10:15:34+0000 1.1.2.24 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.1.2.23 $ + * $Revision: 1.1.2.24 $ * - * last change: $Author: fs $ $Date: 2007/06/06 09:29:56 $ + * last change: $Author: oj $ $Date: 2007/06/06 10:15:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2590,7 +2590,7 @@ new SfxAllEnumItem(RPTUI_ID_PAGE_MODE,SVX_PAGE_MODE_STANDARD), new SfxAllEnumItem(RPTUI_ID_START,SVX_PAPER_A4), new SfxAllEnumItem(RPTUI_ID_END,SVX_PAPER_E), - new SvxBrushItem(), + new SvxBrushItem(ITEMID_BRUSH), new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<UINT16>(eUserMetric)) }; @@ -2609,16 +2609,16 @@ ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); // fill it if ( _xSection.is() ) - pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()))); + pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),ITEMID_BRUSH)); else { //view::PaperFormat eUnoPaperFormat = m_xReportDefinition->getPaperFormat(); //pDescriptor->Put(SfxAllEnumItem(RPTUI_ID_START,lcl_convertPaperFormat(eUnoPaperFormat))); pDescriptor->Put(SvxSizeItem(RPTUI_ID_SIZE,VCLSize(lcl_getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE)))); pDescriptor->Put(SvxLRSpaceItem(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_LEFTMARGIN) - ,lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN))); + ,lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN),0,0,RPTUI_ID_LRSPACE)); pDescriptor->Put(SvxULSpaceItem(static_cast<USHORT>(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_TOPMARGIN)) - ,static_cast<USHORT>(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BOTTOMMARGIN)))); + ,static_cast<USHORT>(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BOTTOMMARGIN)),RPTUI_ID_ULSPACE)); pDescriptor->Put(SfxUInt16Item(SID_ATTR_METRIC,static_cast<UINT16>(eUserMetric))); uno::Reference< style::XStyle> xPageStyle(lcl_usedStyle(m_xReportDefinition)); @@ -2632,7 +2632,7 @@ aPageItem.SetLandscape(lcl_getStyleProperty<sal_Bool>(m_xReportDefinition,PROPERTY_ISLANDSCAPE)); aPageItem.SetNumType((SvxNumType)lcl_getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE)); pDescriptor->Put(aPageItem); - pDescriptor->Put(SvxBrushItem(::Color(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BACKCOLOR)))); + pDescriptor->Put(SvxBrushItem(::Color(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BACKCOLOR)),RPTUI_ID_BRUSH)); } } File [changed]: ReportSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportSection.cxx?r1=1.1.2.7&r2=1.1.2.8 Delta lines: +3 -3 ------------------- --- ReportSection.cxx 2007-06-05 11:45:43+0000 1.1.2.7 +++ ReportSection.cxx 2007-06-06 10:15:35+0000 1.1.2.8 @@ -4,9 +4,9 @@ * * $RCSfile: ReportSection.cxx,v $ * - * $Revision: 1.1.2.7 $ + * $Revision: 1.1.2.8 $ * - * last change: $Author: oj $ $Date: 2007/06/05 11:45:43 $ + * last change: $Author: oj $ $Date: 2007/06/06 10:15:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -608,7 +608,7 @@ } if ( !bAttributesAppliedFromGallery ) { - pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER ) ); + pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER ,ITEMID_ADJUST) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
