diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2022-03-21 13:54:28 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-03-21 15:58:54 +0100 |
| commit | 79b5ff92b17fde902c2f9db3e806f1c77a387dff (patch) | |
| tree | 70592adfae2ab7d8b2f46268fe0a46b4376edd29 /writerfilter/source/rtftok/rtfdocumentimpl.hxx | |
| parent | f8b482f6d601b40c0263333da393bc218c8114eb (diff) | |
tdf#118047: RTF import: better deduplication for header/footer
Here are two related fixes in one patch:
1. By default current style index is 0, not -1. Due to this we
can assume usage of default "Normal" style during deduplication.
Seems there is no difference in case of no style mentioning in
run or mentioning "Normal" one (\s0), so value -1 looks
unnesesary.
2. During header/footer "substreams" processing StyleTableEntires
was not reused in new domain mapper impl instance. So deduplication
did not work well.
2a. To avoid copying of whole StyleTableEntries between instances
it is stored as pointer in domain mapper impl.
Change-Id: Id003d35554e9b43186238920d9a6373452095121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131899
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.hxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index fc5c8802b5d7..66e27a509be5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -933,7 +933,8 @@ private: /// Raw default font index, use getFont() on it to get a real one. int m_nDefaultFontIndex; - RTFReferenceTable::Entries_t m_aStyleTableEntries; + /// To avoid copying entries between DomainMapper instances it is stored as pointer + std::shared_ptr<RTFReferenceTable::Entries_t> m_pStyleTableEntries; int m_nCurrentStyleIndex; bool m_bFormField; /// For the INCLUDEPICTURE field's argument. |