diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-02-22 16:09:53 +0000 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-02-23 11:43:21 +0100 |
| commit | f74e05d2a29f0656fee76a4d8508e7aff2806185 (patch) | |
| tree | fa38c4a684b9bbf2bdcf3b767bb19d5f5c563a4f | |
| parent | Better handling of msi (diff) | |
| download | core-f74e05d2a29f0656fee76a4d8508e7aff2806185.tar.gz core-f74e05d2a29f0656fee76a4d8508e7aff2806185.zip | |
keep paragraph's that failed to load until import is complete
LIBREOFFICE-509JU93T
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130326
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 32e8d3e45698a3cc09f66460b460db1d10ac50b5)
Change-Id: I526edb182fed4fa023cce58e78a650a7c2046ed3
| -rw-r--r-- | hwpfilter/source/hwpfile.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwpfile.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 552233dd853d..439e54d2465a 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -251,6 +251,7 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist) aplist.push_back(spNode.release()); spNode.reset( new HWPPara ); } + pfailedlist.push_back(std::move(spNode)); } bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsigned char flag) @@ -284,6 +285,7 @@ bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsi aplist.push_back(std::move(spNode)); spNode.reset( new HWPPara ); } + pfailedlist.push_back(std::move(spNode)); return true; } diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index 442b442e0514..3fe580ece7e6 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -285,6 +285,10 @@ class DLLEXPORT HWPFile std::vector<std::unique_ptr<ColumnInfo>> columnlist; // paragraph list std::vector<std::unique_ptr<HWPPara>> plist; + // keep paragraph's that failed to load until + // import is complete to avoid dangling references + // elsewhere + std::vector<std::unique_ptr<HWPPara>> pfailedlist; // floating box list std::vector<FBox*> blist; // embedded picture list(tag datas) |