writerfilter/source/dmapper/DomainMapper.cxx | 10 ++++++++++ writerfilter/source/dmapper/TrackChangesHandler.cxx | 6 ++++++ 2 files changed, 16 insertions(+)
New commits: commit 9010336d0eab3cd0d4f1ac17126900e12ffa846c Author: Adam Co <rattles2...@gmail.com> Date: Wed Feb 5 13:31:50 2014 +0200 Add code in DOCX importer to handle 'table cell redline' Change-Id: Ic1e2cb1873dc696311382108868abc4aee00baef Reviewed-on: https://gerrit.libreoffice.org/7872 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 8c5ace6..4151d89 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3156,6 +3156,14 @@ void DomainMapper::HandleRedline( Sprm& rSprm ) { m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowDelete ); } + else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellIns) + { + m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableCellInsert ); + } + else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellDel) + { + m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableCellDelete ); + } resolveSprmProps(*this, rSprm ); // now the properties author, date and id should be available @@ -3168,6 +3176,8 @@ void DomainMapper::HandleRedline( Sprm& rSprm ) case ooxml::OOXML_ParagraphFormat : case ooxml::OOXML_tableRowInsert: case ooxml::OOXML_tableRowDelete: + case ooxml::OOXML_tableCellInsert: + case ooxml::OOXML_tableCellDelete: break; default: OSL_FAIL( "redline token other than mod, ins, del or table row" ); break; } diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx index d34dca3..0773fdc 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.cxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx @@ -75,6 +75,12 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties() case ooxml::OOXML_tableRowDelete: sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE ); break; + case ooxml::OOXML_tableCellInsert: + sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_INSERT ); + break; + case ooxml::OOXML_tableCellDelete: + sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_DELETE ); + break; } pRedlineProperties[0].Name = rPropNameSupplier.GetName( PROP_REDLINE_TYPE ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits