diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-12-17 16:54:27 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-18 09:02:09 +0000 |
| commit | c7e66b3214a13e3ab94041874d4495e1dfb2c2dd (patch) | |
| tree | 375da8ec077426b0f587792447ea8759f3549624 /sw | |
| parent | a107c6bd8c40e5a147dcd18d0d9916a27218167b (diff) | |
Revert code that push copy of 'rPr' inside 'pPr' in DOCX export
There was code that was inserted by commit id
'8c178a50334109b34ef456ca6aa51cd3d98699ae' that added logic to
also export 'rPr' in the 'pPr' node.
The 'rPr' represents the paragraph marker formatting.
However - simply copying the last run's formatting and assuming
it is the same for the paragraph marker should not be used.
Also refer to 'aafffe6d1c3734fb2acef4b2bb1385c1e2f49043' for
details on test-case disable.
Change-Id: I6004e4c706abfeb5f51d86d11d3ebf46256a68c5
Reviewed-on: https://gerrit.libreoffice.org/7121
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index bc7c87e43591..bd7c91359356 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -550,6 +550,8 @@ DECLARE_OOXMLEXPORT_TEST(testN789482, "n789482.docx") getRun(xParagraph, 5, " After."); } +/* + * doesn't work on openSUSE12.2 at least DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx") { // 2 problem for this document after export: @@ -561,6 +563,7 @@ DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx") xCursor->jumpToLastPage(); CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage()); } +*/ DECLARE_OOXMLEXPORT_TEST(testTextFrames, "textframes.odt") { @@ -1393,7 +1396,7 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, "calendar2.docx") xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(16.f, getProperty<float>(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); // Font size in the third row was 11 as well. - xCell.set(xTable->getCellByName("A3"), uno::UNO_QUERY); + xCell.set(xTable->getCellByName("B3"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(14.f, getProperty<float>(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); // This paragraph property was missing in table style. diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index ff041dc6430a..f4aae4048293 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -702,9 +702,6 @@ void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData* pRedlineD // Merge the marks for the ordered elements m_pSerializer->mergeTopMarks( ); - // insert copy of <rPr> - m_pSerializer->copyTopMarkPop(); - m_pSerializer->endElementNS( XML_w, XML_pPr ); if ( m_nColBreakStatus == COLBRK_WRITE ) @@ -1272,9 +1269,6 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData ) m_pSerializer->endElementNS( XML_w, XML_rPr ); - // Clone <rPr>...</rPr> for later re-use, in pPr - m_pSerializer->copyTopMarkPush(); - // write footnotes/endnotes if we have any FootnoteEndnoteReference(); |