diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-07-12 14:12:05 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-18 17:26:15 +0200 |
commit | ded5c0dd0f8146f7b6b77b43114458259d72d6d3 (patch) | |
tree | db3e4b49a161994ce47173a9e8d9d2a326d0850d | |
parent | cc124e47db9e0302b5a07ace961b061b8dca15ad (diff) |
tdf#118702: partially revert the fix for tdf#78907
This is a regression from 2df0d9d32d05f08ccf673fd0f61f650438511acb
Reverting it as the unitest from tdf#78907 still passes.
Besides, adding a new unittest for tdf#118702
Finally, adapt ooxmlexport9 and remove pointless assert which fails
with:
ooxmlexport9.cxx:557:Assertion
Test name: testBnc519228OddBreaks::Import_Export_Import
equality assertion failed
- Expected: <Any: (void)>
- Actual : <Any: (string) Converted2>
Failures !!!
Run: 155 Failure total: 1 Failures: 1 Errors: 0
Change-Id: I486e9489ef6c3978cbcf90f3b9885248f4f92110
Reviewed-on: https://gerrit.libreoffice.org/57338
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit b0e2dbca5164c494a669bd48f8ff058f4c1ad710)
Reviewed-on: https://gerrit.libreoffice.org/57390
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf118702.odt | bin | 0 -> 8620 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 9 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118702.odt b/sw/qa/extras/ooxmlexport/data/tdf118702.odt Binary files differnew file mode 100644 index 000000000000..d55099242d04 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf118702.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 11401fe20323..9823f4e13de0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -555,6 +555,15 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78907,"fdo78907.docx") assertXPath ( pXmlDoc1, "/w:ftr[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl", 0 ); } +DECLARE_OOXMLEXPORT_TEST(tdf118702,"tdf118702.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath ( pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:sectPr/w:type", "val", "nextPage" ); + assertXPath ( pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:sectPr/w:pgSz", "orient", "landscape" ); +} + DECLARE_OOXMLEXPORT_TEST(testfdo79822, "fdo79822.docx") { /* File getting crash while saving in LO. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index dddc7b2b918c..c1a908db83ff 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -531,10 +531,6 @@ DECLARE_OOXMLEXPORT_TEST(testBnc519228OddBreaks, "bnc519228_odd-breaksB.docx") // Page2 comes from follow of style for page 1 and should be a normal page. Also check the two page style have the same properties, // since page style for page1 was created from page style for page 2. - uno::Any page2StyleAny = uno::Reference<beans::XPropertySet>( - getParagraph(2, "This is page 2, which is obviously an even page."), - uno::UNO_QUERY_THROW)->getPropertyValue("PageDescName"); - CPPUNIT_ASSERT_EQUAL(uno::Any(), page2StyleAny); OUString page2StyleName = getProperty<OUString>( page1Style, "FollowStyle" ); uno::Reference<beans::XPropertySet> page2Style(getStyles("PageStyles")->getByName(page2StyleName), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL), page2Style->getPropertyValue("PageStyleLayout")); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 252e5dfde4ce..208417c5c3d9 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -492,7 +492,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode } } } - bNewPageDesc = false; // if next node has RES_BREAK(page break) then bNewPageDesc value should be false. bBreakSet = true; if ( !bRemoveHardBreakInsideTable ) |