From 69ba8e94e33c142072920fe455899c04b4e035d1 Mon Sep 17 00:00:00 2001 From: Pallavi Jadhav Date: Thu, 5 Jun 2014 19:04:36 +0530 Subject: [PATCH] fdo#79540 : DOCX: Lo exports Drawing inside Drawing Issue : - In file there is a WordArt inside Table. - In RT, LO exports inside . - The xml sequence was : // first start of drawing // second start of drawing. MSO does not allow. Implementation : - In DocxAttributeOutput::OutputFlyFrame_Impl() under "case sw::Frame::eDrawing", if drawing is already open then Postpone the Inner Drawing. - Added Export Unit Test case to check two separate drawings are now written in document.xml of RT. Change-Id: I01d06621576d60d26cd51489ee9718dd79eb9c72 Reviewed-on: https://gerrit.libreoffice.org/9653 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/qa/extras/ooxmlexport/data/fdo79540.docx | Bin 0 -> 26279 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 17 +++++++++++++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 8 +++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/fdo79540.docx diff --git a/sw/qa/extras/ooxmlexport/data/fdo79540.docx b/sw/qa/extras/ooxmlexport/data/fdo79540.docx new file mode 100644 index 0000000000000000000000000000000000000000..ce843d6616a1ef59a4b1d049edf10f70ff8fb2dd GIT binary patch literal 26279 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 UM9P>ygl}>HJ~HK{`{UdH0ILJ(E&u=k literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 4b5de65f3c5d..30f748033d48 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3510,6 +3510,23 @@ DECLARE_OOXMLEXPORT_TEST(testfdo76934, "fdo76934.docx") assertXPath ( pXmlDoc, "/w:styles[1]/w:style[36]/w:pPr[1]/w:spacing[1]", "beforeAutospacing", "1" ); } +DECLARE_OOXMLEXPORT_TEST(testfdo79540, "fdo79540.docx") +{ + /* Issue was, was getting written inside . + * So Postone the writing of Inner Drawing tag. + * MS Office does not allow Nestimg of drawing tags. + */ + + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + + if (!pXmlDoc) + return; + + // Ensure that two separate w:drawing tags are written after the code changes. + assertXPath ( pXmlDoc, "/w:document/w:body/w:p/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing",1); + assertXPath ( pXmlDoc, "/w:document/w:body/w:p/w:r[3]/mc:AlternateContent/mc:Choice/w:drawing",1); +} + DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx") { xmlDocPtr pXmlFootNotes = parseExport("word/footnotes.xml"); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 645688f74713..7e7c4a01fca9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4390,7 +4390,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po if ( m_postponedDMLDrawing == NULL ) { if ( IsAlternateContentChoiceOpen() ) - m_rExport.SdrExporter().writeDMLDrawing( pSdrObj, &rFrame.GetFrmFmt(), m_anchorId++); + { + // Do not write w:drawing inside w:drawing. Instead Postpone the Inner Drawing. + if( m_rExport.SdrExporter().IsDrawingOpen() ) + m_postponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrmFmt()), &rNdTopLeft)); + else + m_rExport.SdrExporter().writeDMLDrawing( pSdrObj, &rFrame.GetFrmFmt(), m_anchorId++); + } else m_rExport.SdrExporter().writeDMLAndVMLDrawing( pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);