User: rt Date: 2008-07-10 15:56:29+0000 Modified: dba/reportdesign/source/filter/xml/xmlHelper.cxx
Log: INTEGRATION: CWS rptfix02 (1.9.18); FILE MERGED 2008/07/01 14:08:37 oj 1.9.18.1: #i91253# handle old version which do not have a meta.xml file 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.9&r2=1.10 Delta lines: +3 -1 ------------------- --- xmlHelper.cxx 2008-06-16 13:36:41+0000 1.9 +++ xmlHelper.cxx 2008-07-10 15:56:27+0000 1.10 @@ -286,7 +286,7 @@ #define PROPERTY_ID_FONTKERNING 14 #define PROPERTY_ID_FONTWORDLINEMODE 15 #define PROPERTY_ID_FONTTYPE 16 -void OXMLHelper::copyStyleElements(const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) +void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) { if ( !_xProp.is() || !_sStyleName.getLength() || !_pAutoStyles ) return; @@ -324,6 +324,8 @@ try { pAutoStyle->FillPropertySet(_xProp); + if ( _bOld && _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_CHARHIDDEN) ) + _xProp->setPropertyValue(PROPERTY_CHARHIDDEN,uno::makeAny(sal_False)); uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); pAutoStyle->FillPropertySet(xProp); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
