fdo#74772 : File Corruption - Issue related to List Bullet Numbering
- A File containing a graphic shape bullet is captured as a numPictBullet in MS office[in numbering.xml]. - Currently LO has support for graphic bullet as Image. Graphic bullet as Shape needs to be preserved in LO. - Since the numPictBullet is not exported in LO, but in <abstractNum> <lvlPicBulletId> was exported which lead to corruption. - Fixed the corruption caused due to lvlPicBulletId. - However the shape is not getting retained. Need to add implementation for gprahic bullet as a shape. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I2fc2b1ab4b75e8a050e66837a64578b235059473
This commit is contained in:
BIN
sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
Normal file
BIN
sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
Normal file
Binary file not shown.
@@ -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();
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user