Tag: cws_src680_reportdesign03 User: oj Date: 2007-12-06 07:37:02+0000 Modified: dba/reportdesign/source/filter/xml/xmlHelper.cxx dba/reportdesign/source/filter/xml/xmlHelper.hxx dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: #i83153# import both old and new cell background 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.4.44.1&r2=1.4.44.2 Delta lines: +39 -14 --------------------- --- xmlHelper.cxx 2007-11-29 14:49:45+0000 1.4.44.1 +++ xmlHelper.cxx 2007-12-06 07:37:00+0000 1.4.44.2 @@ -175,8 +175,32 @@ #define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0} // ----------------------------------------------------------------------------- -UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap() +UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat) { + if ( _bOldFormat ) + { + static const XMLPropertyMapEntry s_aXMLCellStylesProperties[] = + { + MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), + + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_P( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), + MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), + MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), + MAP_CONST_C_ASCII( "BorderBottom", FO, BORDER_BOTTOM, XML_TYPE_BORDER, 0 ), + MAP_END() + }; + return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aXMLCellStylesProperties,new OPropertyHandlerFactory()); + } + else + { static const XMLPropertyMapEntry s_aXMLCellStylesProperties[] = { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), @@ -192,6 +216,7 @@ MAP_END() }; return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aXMLCellStylesProperties,new OPropertyHandlerFactory()); + } } // ----------------------------------------------------------------------------- const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps() File [changed]: xmlHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.hxx?r1=1.2&r2=1.2.52.1 Delta lines: +4 -4 ------------------- --- xmlHelper.hxx 2007-07-09 11:56:17+0000 1.2 +++ xmlHelper.hxx 2007-12-06 07:37:00+0000 1.2.52.1 @@ -86,7 +86,7 @@ class OXMLHelper { public: - static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(); + static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat = false); static const SvXMLEnumMapEntry* GetReportPrintOptions(); static const SvXMLEnumMapEntry* GetForceNewPageOptions(); File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.4&r2=1.4.44.1 Delta lines: +1 -1 ------------------- --- xmlfilter.cxx 2007-08-03 09:58:48+0000 1.4 +++ xmlfilter.cxx 2007-12-06 07:37:00+0000 1.4.44.1 @@ -434,7 +434,7 @@ XML_NAMESPACE_REPORT ); m_xPropHdlFactory = new OXMLRptPropHdlFactory; - m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap(); + m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap(true); m_xColumnStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory); m_xRowStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory); m_xTableStylesPropertySetMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
