Kaydet (Commit) 9010336d authored tarafından Adam Co's avatar Adam Co Kaydeden (comit) Miklos Vajna

Add code in DOCX importer to handle 'table cell redline'

Change-Id: Ic1e2cb1873dc696311382108868abc4aee00baef
Reviewed-on: https://gerrit.libreoffice.org/7872Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst c90bc80f
...@@ -3156,6 +3156,14 @@ void DomainMapper::HandleRedline( Sprm& rSprm ) ...@@ -3156,6 +3156,14 @@ void DomainMapper::HandleRedline( Sprm& rSprm )
{ {
m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowDelete ); 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 ); resolveSprmProps(*this, rSprm );
// now the properties author, date and id should be available // now the properties author, date and id should be available
...@@ -3168,6 +3176,8 @@ void DomainMapper::HandleRedline( Sprm& rSprm ) ...@@ -3168,6 +3176,8 @@ void DomainMapper::HandleRedline( Sprm& rSprm )
case ooxml::OOXML_ParagraphFormat : case ooxml::OOXML_ParagraphFormat :
case ooxml::OOXML_tableRowInsert: case ooxml::OOXML_tableRowInsert:
case ooxml::OOXML_tableRowDelete: case ooxml::OOXML_tableRowDelete:
case ooxml::OOXML_tableCellInsert:
case ooxml::OOXML_tableCellDelete:
break; break;
default: OSL_FAIL( "redline token other than mod, ins, del or table row" ); break; default: OSL_FAIL( "redline token other than mod, ins, del or table row" ); break;
} }
......
...@@ -75,6 +75,12 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties() ...@@ -75,6 +75,12 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties()
case ooxml::OOXML_tableRowDelete: case ooxml::OOXML_tableRowDelete:
sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE ); sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE );
break; 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 ); pRedlineProperties[0].Name = rPropNameSupplier.GetName( PROP_REDLINE_TYPE );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment