diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-21 07:32:14 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-12-23 04:20:26 +0000 |
| commit | 4cbe2e712bab42e95fb55d78da6b1daf326f7f1b (patch) | |
| tree | 4f0630309ff2a11e42831a10bed9bca7b63c847c /writerfilter | |
| parent | f804c7d0d36997db6bbbcb3b5619adf3f0064d1e (diff) | |
tdf#75573 - relocate code: alternate stream already started
moving this keeps the original fix and prevents losing a table
in this unit test
fixes regression commit ecea3431ca761369d8180a74eba2877533050516
Change-Id: I5e94760649020ddf1c468d52b91aaf0521bbfdda
Reviewed-on: https://gerrit.libreoffice.org/32269
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 34324bff1252dc5a51c9408f9502654453f319b6)
Reviewed-on: https://gerrit.libreoffice.org/32324
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 013518f59e3a..bfecc4ef89d5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5282,16 +5282,16 @@ void DomainMapper_Impl::substream(Id rName, } #endif + //finalize any waiting frames before starting alternate streams + CheckUnregisteredFrameConversion(); + ExecuteFrameConversion(); + appendTableManager(); // Appending a TableManager resets its TableHandler, so we need to append // that as well, or tables won't be imported properly in headers/footers. appendTableHandler(); getTableManager().startLevel(); - //finalize any waiting frames before starting alternate streams - CheckUnregisteredFrameConversion(); - ExecuteFrameConversion(); - //import of page header/footer switch( rName ) |