Tag: cws_src680_oj14 User: oj Date: 2007-06-06 14:47:03+0000 Modified: dba/reportdesign/source/core/api/ReportEngineJFree.cxx dba/reportdesign/source/core/api/ReportVisitor.cxx dba/reportdesign/source/core/sdr/PropertyForward.cxx
Log: #i78102# react on property fontdescriptor on report side File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportEngineJFree.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +4 -5 ------------------- --- ReportEngineJFree.cxx 2007-05-29 13:40:23+0000 1.1.2.3 +++ ReportEngineJFree.cxx 2007-06-06 14:47:00+0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: ReportEngineJFree.cxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: fs $ $Date: 2007/05/29 13:40:23 $ + * last change: $Author: oj $ $Date: 2007/06/06 14:47:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -267,9 +267,8 @@ static const ::rtl::OUString sPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); xStorageProp->setPropertyValue( sPropName, uno::makeAny(m_xReport->getMimeType())); } - ::rtl::OUString sStyles(RTL_CONSTASCII_USTRINGPARAM("styles.xml")); - xTemp->copyElementTo(sStyles,xOut,sStyles); - //xTemp->copyToStorage(xOut); + /*::rtl::OUString sStyles(RTL_CONSTASCII_USTRINGPARAM("styles.xml")); + xTemp->copyElementTo(sStyles,xOut,sStyles);*/ aConvertedProperties[nPos++].Value <<= xOut; File [changed]: ReportVisitor.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportVisitor.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -4 ------------------- --- ReportVisitor.cxx 2007-05-09 13:50:56+0000 1.1.2.1 +++ ReportVisitor.cxx 2007-06-06 14:47:00+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportVisitor.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:50:56 $ + * last change: $Author: oj $ $Date: 2007/06/06 14:47:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,10 +51,10 @@ m_pTraverseReport->traverseReport(_xReportDefinition); m_pTraverseReport->traverseReportFunctions(_xReportDefinition->getFunctions()); - if ( _xReportDefinition->getReportHeaderOn() ) - m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader()); if ( _xReportDefinition->getPageHeaderOn() ) m_pTraverseReport->traversePageHeader(_xReportDefinition->getPageHeader()); + if ( _xReportDefinition->getReportHeaderOn() ) + m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader()); uno::Reference< report::XGroups > xGroups = _xReportDefinition->getGroups(); m_pTraverseReport->traverseGroups(xGroups); Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: PropertyForward.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/PropertyForward.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +18 -2 -------------------- --- PropertyForward.cxx 2007-05-09 13:49:15+0000 1.1.2.1 +++ PropertyForward.cxx 2007-06-06 14:47:00+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: PropertyForward.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:49:15 $ + * last change: $Author: oj $ $Date: 2007/06/06 14:47:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,6 +157,22 @@ } if ( sPropName.getLength() && xPropInfo->hasPropertyByName(sPropName) ) xProp->setPropertyValue(sPropName,evt.NewValue); + else if ( evt.PropertyName == PROPERTY_CHARFONTNAME + || evt.PropertyName == PROPERTY_CHARFONTSTYLENAME + || evt.PropertyName == PROPERTY_CHARSTRIKEOUT + || evt.PropertyName == PROPERTY_CHARWORDMODE + || evt.PropertyName == PROPERTY_CHARROTATION + || evt.PropertyName == PROPERTY_CHARSCALEWIDTH + || evt.PropertyName == PROPERTY_CHARFONTFAMILY + || evt.PropertyName == PROPERTY_CHARFONTCHARSET + || evt.PropertyName == PROPERTY_CHARFONTPITCH + || evt.PropertyName == PROPERTY_CHARHEIGHT + || evt.PropertyName == PROPERTY_CHARUNDERLINE + || evt.PropertyName == PROPERTY_CHARWEIGHT + || evt.PropertyName == PROPERTY_CHARPOSTURE) + { + xProp->setPropertyValue(PROPERTY_FONTDESCRIPTOR,m_xSource->getPropertyValue(PROPERTY_FONTDESCRIPTOR)); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
