Tag: cws_dev300_dba30beta User: oj Date: 2008-04-21 10:00:59+0000 Modified: dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlExport.hxx
Log: #i88524# check index 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.20.14.1 Delta lines: +13 -6 -------------------- --- xmlExport.cxx 2008-04-10 13:29:28+0000 1.20 +++ xmlExport.cxx 2008-04-21 10:00:56+0000 1.20.14.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.14.1 $ * * This file is part of OpenOffice.org. * @@ -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() File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.hxx?r1=1.10&r2=1.10.14.1 Delta lines: +5 -3 ------------------- --- xmlExport.hxx 2008-04-10 13:29:46+0000 1.10 +++ xmlExport.hxx 2008-04-21 10:00:56+0000 1.10.14.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.14.1 $ * * This file is part of OpenOffice.org. * @@ -135,6 +135,7 @@ ::std::auto_ptr< TStringPair > m_aAutoIncrement; ::std::auto_ptr< TDelimiter > m_aDelimiter; ::std::vector< Any> m_aDataSourceSettings; + ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; TPropertyStyleMap m_aAutoStyleNames; TPropertyStyleMap m_aCellAutoStyleNames; TPropertyStyleMap m_aRowAutoStyleNames; @@ -176,7 +177,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 + ); void exportComponent(XPropertySet* _xProp); void exportQuery(XPropertySet* _xProp); void exportTable(XPropertySet* _xProp); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
