User: rt Date: 2008-06-16 12:31:58+0000 Modified: dba/dbaccess/source/filter/xml/xmlExport.cxx
Log: INTEGRATION: CWS rptchart02 (1.20.6); FILE MERGED 2008/04/18 08:46:49 oj 1.20.6.1: #i86850# use of ComponentContext File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.20&r2=1.21 Delta lines: +11 -4 -------------------- --- xmlExport.cxx 2008-04-10 13:29:28+0000 1.20 +++ xmlExport.cxx 2008-06-16 12:31:56+0000 1.21 @@ -831,7 +831,8 @@ ,enum ::xmloff::token::XMLTokenEnum _eComponents ,enum ::xmloff::token::XMLTokenEnum _eSubComponents ,sal_Bool _bExportContext - ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc) + ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc + ) { if ( _xCollection.is() ) { @@ -1109,7 +1110,7 @@ { const TExportPropMapperPair pExportHelper[] = { TExportPropMapperPair(m_xExportHelper,TEnumMapperPair(&m_aAutoStyleNames,XML_STYLE_FAMILY_TABLE_TABLE )) - ,TExportPropMapperPair(m_xCellExportHelper,TEnumMapperPair(&m_aCellAutoStyleNames,XML_STYLE_FAMILY_TABLE_CELL)) + // ,TExportPropMapperPair(m_xCellExportHelper,TEnumMapperPair(&m_aCellAutoStyleNames,XML_STYLE_FAMILY_TABLE_CELL)) ,TExportPropMapperPair(m_xRowExportHelper,TEnumMapperPair(&m_aRowAutoStyleNames,XML_STYLE_FAMILY_TABLE_ROW)) }; @@ -1132,8 +1133,10 @@ { // not interested in } + m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp); ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportAutoStyle); exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc); + m_aCurrentPropertyStates.clear(); } else { // here I know I have a column @@ -1169,11 +1172,15 @@ } } ++aItr; - } + } // while ( aItr != aEnd ) + + } // if ( !aPropStates.empty() ) + if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second ) + ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates )); + if ( !aPropStates.empty() ) pExportHelper[i].second.first->insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( pExportHelper[i].second.second, aPropStates ))); } } - } } // ----------------------------------------------------------------------------- void ODBExport::_ExportContent() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
