ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#120511 writerfilter: track inserted frame per section

Browse Source 
The logic using IsTextFrameInserted is worried about whether
a frame has been inserted before a table *in this section*,
so track frame's existence per section, not per document.

Change-Id: I8aa8a695b89727832e65535adae3fc3c94f95be5
Reviewed-on: https://gerrit.libreoffice.org/65720
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
This commit is contained in:
Justin Luth
2018-12-29 19:25:58 +01:00
parent c5ab681957
commit 6aeba04b31
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/qa/extras/ooxmlexport/data/tdf120511_eatenSection.docx
BIN
View File
Binary file not shown.
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+11
View File
@@ -462,6 +462,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing, "tdf113258_noBeforeA
getProperty<sal_Int32>(xShape->getStart(), "ParaTopMargin"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf120511_eatenSection, "tdf120511_eatenSection.docx")
{
xmlDocPtr pXmlDoc = parseLayoutDump();
sal_Int32 nHeight = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds", "height").toInt32();
sal_Int32 nWidth = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds", "width").toInt32();
CPPUNIT_ASSERT_MESSAGE( "Page1 is portrait", nWidth < nHeight );
nHeight = getXPath(pXmlDoc, "/root/page[2]/infos/prtBounds", "height").toInt32();
nWidth = getXPath(pXmlDoc, "/root/page[2]/infos/prtBounds", "width").toInt32();
CPPUNIT_ASSERT_MESSAGE( "Page2 is landscape", nWidth > nHeight );
}
DECLARE_OOXMLEXPORT_TEST(testTdf104354, "tdf104354.docx")
{
uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY);
writerfilter/source/dmapper/DomainMapper.cxx
+1
View File
@@ -2882,6 +2882,7 @@ void DomainMapper::lcl_endSectionGroup()
if (m_pImpl->GetIsDummyParaAddedForTableInSection())
m_pImpl->RemoveDummyParaForTableInSection();
}
m_pImpl->SetIsTextFrameInserted( false );
m_pImpl->PopProperties(CONTEXT_SECTION);
}
}
writerfilter/source/dmapper/DomainMapper_Impl.hxx
+3
View File
@@ -604,8 +604,11 @@ public:
bool GetIsFirstParagraphInShape() { return m_bIsFirstParaInShape; }
void SetIsDummyParaAddedForTableInSection( bool bIsAdded );
bool GetIsDummyParaAddedForTableInSection() { return m_bDummyParaAddedForTableInSection;}
/// Track if a textframe has been inserted into this section
void SetIsTextFrameInserted( bool bIsInserted );
bool GetIsTextFrameInserted() { return m_bTextFrameInserted;}
void SetIsPreviousParagraphFramed( bool bIsFramed ) { m_bIsPreviousParagraphFramed = bIsFramed; }
bool GetIsPreviousParagraphFramed() { return m_bIsPreviousParagraphFramed; }
void SetParaSectpr(bool bParaSectpr);