diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-06 10:04:04 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-12 06:43:56 +0000 |
| commit | ecea3431ca761369d8180a74eba2877533050516 (patch) | |
| tree | b2460ab5852f586d71d6f6b46b67a0679825cc8d /writerfilter | |
| parent | 43bc09d6ddfafe4989f922ac2b41f0ac2bedc136 (diff) | |
tdf75573 docx - complete frames before starting alternate streams
An unused odd header was set to be discarded. The handling of
unregistered frames occurred at the same time, and thus ended up
being discarded as well.
Since a frame shouldn't encompass both the alternate stream
and the current stream, finalize any unfinished frames first.
Change-Id: Ie9123769724da461dd265936aa6b97de7f4dfbbc
Reviewed-on: https://gerrit.libreoffice.org/26972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index be5559174203..0bb506254bb7 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5246,6 +5246,10 @@ void DomainMapper_Impl::substream(Id rName, appendTableHandler(); getTableManager().startLevel(); + //finalize any waiting frames before starting alternate streams + CheckUnregisteredFrameConversion(); + ExecuteFrameConversion(); + //import of page header/footer switch( rName ) |