tdf#123393 RTF import: fix too big font size in table cell

The reason was that A2 had an explicit paragraph style reference, but A1
did not, so table buffering caused A2 style to affect A1 style as well.

Combine this with style deduplication, and then A2 style considered the
direct formatting (font size) in A1 to be redundant, so it was lost on
import.

Fix the problem by moving the copy&pasted properties buffering to a
single function, and there buffering not only the properties, but also
the active style index.

Change-Id: I99f2020b8bef237849fd622b25ac5ef0516d69e4
Reviewed-on: https://gerrit.libreoffice.org/68361
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index e3b212a1dfdd..6d7d9cefabaa 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -184,10 +184,10 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
                 // There were no runs in the cell, so we need to send paragraph and character properties here.
                 auto pPValue = new RTFValue(m_aStates.top().aParagraphAttributes,
                                             m_aStates.top().aParagraphSprms);
-                m_aTableBufferStack.back().emplace_back(Buf_t(BUFFER_PROPS, pPValue, nullptr));
+                bufferProperties(m_aTableBufferStack.back(), pPValue, nullptr);
                 auto pCValue = new RTFValue(m_aStates.top().aCharacterAttributes,
                                             m_aStates.top().aCharacterSprms);
-                m_aTableBufferStack.back().emplace_back(Buf_t(BUFFER_PROPS, pCValue, nullptr));
+                bufferProperties(m_aTableBufferStack.back(), pCValue, nullptr);
             }
 
             RTFValue::Pointer_t pValue;