Kaydet (Commit) 701c2862 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Andras Timar

tdf#118702: partially revert the fix for tdf#78907

This is a regression from 2df0d9d3

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: 's avatarJustin Luth <justin_luth@sil.org>
(cherry picked from commit b0e2dbca)
Reviewed-on: https://gerrit.libreoffice.org/57390Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit ded5c0dd)
üst 12cbe8e1
......@@ -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.
......
......@@ -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"));
......
......@@ -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 )
......
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