tdf#136855 writerfilter: RTF import: buffer annotations inside tables
The problem is that one of the annotations is inside a table that
happens to start with a covered cell (vertically merged).
The table row is buffered, but the annotation is not, so it is inserted
before any of the text of the table cells is inserted, so it ends up in
the covered cell.
The strucuture of annotations is a bit icky; to fix this, buffer both the
\annotation destination and \atrfstart \atrfend start and end
destinations.
Change-Id: Ie955a75a2d254f8d7e965259698b688eece7cbd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103016
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 9574224..f545d86 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -335,7 +335,19 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
case RTF_ANNOTATION:
if (!m_pSuperstream)
{
resolveSubstream(m_nGroupStartPos - 1, NS_ooxml::LN_annotation);
if (!m_aStates.top().getCurrentBuffer())
{
resolveSubstream(m_nGroupStartPos - 1, NS_ooxml::LN_annotation);
}
else
{
RTFSprms aAttributes;
aAttributes.set(Id(0), new RTFValue(m_nGroupStartPos - 1));
aAttributes.set(Id(1), new RTFValue(NS_ooxml::LN_annotation));
aAttributes.set(Id(2), new RTFValue(OUString()));
m_aStates.top().getCurrentBuffer()->push_back(
Buf_t(BUFFER_RESOLVESUBSTREAM, new RTFValue(aAttributes), nullptr));
}
m_aStates.top().setDestination(Destination::SKIP);
}
else
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7edeccd..bbcec87 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2725,7 +2725,15 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState)
aAttributes.set(NS_ooxml::LN_EG_RangeMarkupElements_commentRangeEnd, pValue);
writerfilter::Reference<Properties>::Pointer_t pProperties
= new RTFReferenceProperties(aAttributes);
Mapper().props(pProperties);
if (!m_aStates.top().getCurrentBuffer())
{
Mapper().props(pProperties);
}
else
{
auto const pValue2 = new RTFValue(aAttributes, RTFSprms());
bufferProperties(*m_aStates.top().getCurrentBuffer(), pValue2, nullptr);
}
}
break;
case Destination::ANNOTATIONREFERENCE:
