User: hr Date: 2007-08-02 14:33:48+0000 Modified: dba/reportdesign/source/filter/xml/xmlHelper.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/12 14:01:43 oj 1.2.2.2: #i77295# fix some font problems 2007/07/11 10:31:00 oj 1.2.2.1: #i78377# reportdefinition now is a numberformatssupplier as ell File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.2&r2=1.3 Delta lines: +7 -5 ------------------- --- xmlHelper.cxx 2007-07-09 11:56:17+0000 1.2 +++ xmlHelper.cxx 2007-08-02 14:33:46+0000 1.3 @@ -416,6 +416,8 @@ }; try { + pAutoStyle->FillPropertySet(_xProp); + uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); pAutoStyle->FillPropertySet(xProp); xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; @@ -435,13 +437,13 @@ xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; uno::Reference<report::XReportControlFormat> xReportControlModel(_xProp,uno::UNO_QUERY); - if ( xReportControlModel.is() ) + if ( xReportControlModel.is() && aFont.Name.getLength() ) try { xReportControlModel->setFontDescriptor(aFont); } catch(beans::UnknownPropertyException){} - pAutoStyle->FillPropertySet(_xProp); + if ( xReportControlModel.is() ) { sal_Int16 nTextAlign = xReportControlModel->getParaAdjust(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
