Kaydet (Commit) ecea3431 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Miklos Vajna

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/26972Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 43bc09d6
......@@ -1732,6 +1732,13 @@ DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
lcl_countTextFrames( mxComponent, 1 );
}
DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx")
{
// the problem was that an odd header was defined but not used, flagged as
// discardable, and then the unrelated frame was also discarded.
lcl_countTextFrames( mxComponent, 1 );
}
DECLARE_OOXMLIMPORT_TEST(testFdo43093, "fdo43093.docx")
{
// The problem was that the direction and alignment are not correct for RTL paragraphs.
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment