diff --git a/sw/qa/extras/rtfexport/data/tdf104085.rtf b/sw/qa/extras/rtfexport/data/tdf104085.rtf new file mode 100755 index 000000000000..7deda534eaee Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf104085.rtf differ diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 1e353dc2a99d..4288d3fb7dcf 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1142,6 +1142,22 @@ DECLARE_RTFEXPORT_TEST(testTdf104228, "tdf104228.rtf") CPPUNIT_ASSERT_EQUAL(static_cast(0), getProperty(xParagraph, "ParaLeftMargin")); } + +DECLARE_RTFEXPORT_TEST(testTdf104085, "tdf104085.rtf") +{ + uno::Reference xPara(getParagraph(1)); + uno::Reference< beans::XPropertySet > properties( xPara, uno::UNO_QUERY); + uno::Reference xLevels( properties->getPropertyValue("NumberingRules"), uno::UNO_QUERY); + uno::Sequence aProps; + xLevels->getByIndex(0) >>= aProps; + for (int i = 0; i < aProps.getLength(); ++i) + { + if (aProps[i].Name == "BulletChar") + return; + } + CPPUNIT_FAIL("no BulletChar property"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index aa3c41ce05db..98b212b48386 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -969,14 +969,14 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) break; case RTF_PNDEC: { - auto pValue = std::make_shared(0); // decimal, same as \levelnfc0 + auto pValue = std::make_shared(NS_ooxml::LN_Value_ST_NumberFormat_decimal); m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, pValue); } break; case RTF_PNLVLBLT: { m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, std::make_shared(1)); - m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, std::make_shared(23)); // bullets, same as \levelnfc23 + m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, std::make_shared(NS_ooxml::LN_Value_ST_NumberFormat_bullet)); } break; case RTF_LANDSCAPE: