chart2/qa/extras/chart2export.cxx | 9 ++++++ chart2/qa/extras/data/odt/axis-position.odt |binary oox/source/export/chartexport.cxx | 7 +++++ sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt |binary sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 8 +++++ sw/source/filter/ww8/wrtw8nds.cxx | 18 +++++++------ 6 files changed, 35 insertions(+), 7 deletions(-)
New commits: commit 54f9576aa43e3d6d687469aa0b2ea56ce0bbaca3 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 13:27:32 2015 +0100 Related: tdf#93675 'new' ms-alike numbering has same problem as old numbering when it comes to nodes which were numbered, but have their number deleted, where the indent from the numbering is still in effect in writer, but not in msoffice. Change-Id: I700f34171d8c9e9f6fb725d115ff1fe704ceb4bb diff --git a/sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt b/sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt new file mode 100644 index 0000000..e435acd Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index a9858f4..76ff02a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1068,6 +1068,14 @@ DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx") CPPUNIT_ASSERT ( (followCount >= 6) && (precedeCount >= 6) ); } +DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "//w:ind", "start", "1418"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index a6fdbd6..14ac38b 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2627,15 +2627,19 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode ) SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { aLRSpace.SetTextLeft( aLRSpace.GetLeft() + rNumFormat.GetAbsLSpace() ); + } + else + { + aLRSpace.SetTextLeft( aLRSpace.GetLeft() + rNumFormat.GetIndentAt() ); + } - // new first line indent = 0 - // (first line indent is ignored for NO_NUMLEVEL) - if (!bParaRTL) - aLRSpace.SetTextFirstLineOfst( 0 ); + // new first line indent = 0 + // (first line indent is ignored for NO_NUMLEVEL) + if (!bParaRTL) + aLRSpace.SetTextFirstLineOfst( 0 ); - // put back the new item - pTmpSet->Put( aLRSpace ); - } + // put back the new item + pTmpSet->Put( aLRSpace ); // assure that numbering rule is in <pTmpSet> if (SfxItemState::SET != pTmpSet->GetItemState(RES_PARATR_NUMRULE, false) ) commit 10654c038c0bc20fb348be7164e08f3de98718f4 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Sep 3 17:24:04 2015 +0100 Related: tdf#93676 in msword chart appears with axis positioned between ticks not on them Change-Id: I048f86270ee12a38967c81e832619fd5018db6b1 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 1e73718..7004e97 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -99,6 +99,7 @@ public: void testBarChartVaryColorsXLSX(); void testMultipleAxisXLSX(); void testAxisTitleRotationXLSX(); + void testAxisCrossBetweenXSLX(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -162,6 +163,7 @@ public: CPPUNIT_TEST(testBarChartVaryColorsXLSX); CPPUNIT_TEST(testMultipleAxisXLSX); CPPUNIT_TEST(testAxisTitleRotationXLSX); + CPPUNIT_TEST(testAxisCrossBetweenXSLX); CPPUNIT_TEST_SUITE_END(); protected: @@ -1473,6 +1475,13 @@ void Chart2ExportTest::testAxisTitleRotationXLSX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", "rot", "0"); } +void Chart2ExportTest::testAxisCrossBetweenXSLX() +{ + load("/chart2/qa/extras/data/odt/", "axis-position.odt"); + xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/odt/axis-position.odt b/chart2/qa/extras/data/odt/axis-position.odt new file mode 100644 index 0000000..35ea152 Binary files /dev/null and b/chart2/qa/extras/data/odt/axis-position.odt differ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 3c0fcaf..5851e0c 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2806,6 +2806,13 @@ void ChartExport::_exportAxis( exportTextProps(xAxisProp); + if (nAxisType == XML_valAx) + { + pFS->singleElement( FSNS( XML_c, XML_crossBetween ), + XML_val, "midCat", + FSEND ); + } + pFS->singleElement( FSNS( XML_c, XML_crossAx ), XML_val, I32S( rAxisIdPair.nCrossAx ), FSEND );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits