diff options
| author | Rajashri <rajashri.udhoji@synerzip.com> | 2014-03-12 10:44:57 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-13 09:56:50 +0100 |
| commit | 3075b062261435d568d0680c3405ca61a7a40f39 (patch) | |
| tree | 09918acd5a914582d44d15bc681da602d127ae4f | |
| parent | aa6fe2a0e62bdde897697c4e254d4256ff2accde (diff) | |
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
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx | bin | 0 -> 32450 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx Binary files differnew file mode 100644 index 000000000000..28e656bdd415 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx 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); } } } |