diff options
| author | Pallavi Jadhav <pallavi.jadhav@synerzip.com> | 2014-01-07 17:10:42 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-10 15:30:50 +0100 |
| commit | 3a6fdd146a37a1dbdec56b6a1d4eff3a8a28a3f8 (patch) | |
| tree | 741766ce9c69ea4a0bafce35fd309eac0d9a8fae /sw/source/filter/ww8/docxsdrexport.hxx | |
| parent | b69864f3f8c9be2e1f28f4b422074d2040b084a0 (diff) | |
fdo#73227: Fix for corruption after RT
Issue:
1] Document containing SmartArt inside <wp:anchor>
tag gets saved with <wp:inline>, due to which
value of attribute "id" of <wp:docPr> gets
incorrectly written.
Which was causing the corruption.
2] LO was exporting SmartArt inside <wp:inline>
bydefault. Hence "ids" of <wp:inline> and <wp:anchor>
were same for value 1 and document gets corrupt.
Implementation:
1] Added code to export SmartArt inside <wp:anchor>
in DocxSdrExport::writeDiagram().
2] Added export Unit test.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7292
Change-Id: I5b2efcba030d1736203cf4571d8498fd87600d79
Diffstat (limited to 'sw/source/filter/ww8/docxsdrexport.hxx')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index 70054b4c4117..bae4a35c5e6e 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -74,10 +74,10 @@ public: void writeVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft); /// Writes shape in both DML and VML format. void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft, int nAnchorId); - /// Writes a diagram (smartart). - void writeDiagram(const SdrObject* sdrObject, const Size& size); /// Write <a:effectLst>, the effect list. void writeDMLEffectLst(const SwFrmFmt& rFrmFmt); + /// Writes a diagram (smartart). + void writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt, int nAnchorId); /// Writes text frame in VML format. void writeVMLTextFrame(sw::Frame* pParentFrame); /// Undo the text direction mangling done by the frame btLr handler in writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup() |