diff --git a/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx new file mode 100644 index 000000000000..28e656bdd415 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index b7fdef7d40fd..045d41e14a03 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2744,6 +2744,15 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx") assertXPath(pXmlDoc,"/rels:Relationships/rels:Relationship[1]","Id","rId1"); } +DECLARE_OOXMLEXPORT_TEST(testlvlPicBulletId, "lvlPicBulletId.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:numbering[1]/w:abstractNum[1]/w:lvl[1]/w:lvlPicBulletId[1]", 0); + +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 82b0fbd56cc1..9832e183801e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1423,7 +1423,9 @@ int MSWordExportBase::CollectGrfsOfBullets() } if (!bHas) { - m_vecBulletPic.push_back(pGraf); + Size aSize(pGraf->GetPrefSize()); + if (0 != aSize.Height() && 0 != aSize.Width()) + m_vecBulletPic.push_back(pGraf); } } }