diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-06 10:04:04 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-10 19:42:10 +0200 |
| commit | 377115804894411b10de93a6e53704ba468a9add (patch) | |
| tree | 164eae8acf8074dffd6c2ef795c01899c9270897 /writerfilter | |
| parent | 92ff1627e3eef3b838500e058d77d8c198ec9566 (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>
(cherry picked from commit ecea3431ca761369d8180a74eba2877533050516)
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 28091d6100ac..6ccbb830e028 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5279,6 +5279,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 ) |