[Libreoffice-commits] core.git: 2 commits - oox/source sw/source

[Miklos Vajna]

 oox/source/token/tokens.txt                  |    1 +
 sw/source/filter/ww8/docxattributeoutput.cxx |    7 +++++--
 sw/source/filter/ww8/docxexport.cxx          |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1957303363ea9bd308b5781da09beaa09df7420c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Dec 12 11:48:29 2013 +0100

    DOCX: when writing a group shape, require wpg
    
    Change-Id: I046c778cd998582446e96ac1e55f3e2da1e61081

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b30604d..f4aefbb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -76,6 +76,7 @@
 #include <editeng/editobj.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
+#include <svx/svdogrp.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
 #include <svl/grabbagitem.hxx>
@@ -3433,8 +3434,9 @@ void DocxAttributeOutput::WriteDMLDrawing( const SdrObject* pSdrObject, const Sw
     m_pSerializer->startElementNS( XML_a, XML_graphic,
             FSNS( XML_xmlns, XML_a ), "http://schemas.openxmlformats.org/drawingml/2006/main",
             FSEND );
+    const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, pSdrObject);
     m_pSerializer->startElementNS( XML_a, XML_graphicData,
-            XML_uri, "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
+            XML_uri, (pObjGroup ? "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" : "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"),
             FSEND );
 
     uno::Reference<drawing::XShape> xShape(const_cast<SdrObject*>(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW);
@@ -3450,8 +3452,9 @@ void DocxAttributeOutput::WriteDMLAndVMLDrawing(const SdrObject* sdrObj, const S
 {
     m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND);
 
+    const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj);
     m_pSerializer->startElementNS(XML_mc, XML_Choice,
-            XML_Requires, "wps",
+            XML_Requires, (pObjGroup ? "wpg" : "wps"),
             FSEND);
     WriteDMLDrawing(sdrObj, &rFrmFmt);
     m_pSerializer->endElementNS(XML_mc, XML_Choice);
commit ae6b44c32582d40cd63e7b475cb76047aea49e65
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Dec 12 11:38:47 2013 +0100

    DOCX export: declare wpg namespace
    
    Change-Id: If204d95142826d4cc194aed8a97c68a121187b8a

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 648162e..fbdd2fc 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5663,6 +5663,7 @@ wrapTopAndBottom
 wrapTrailSpaces
 wrapcoords
 writeProtection
+wpg
 wps
 wsp
 wsDr
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 17cf70f..35383d4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1058,6 +1058,7 @@ XFastAttributeListRef DocxExport::MainXmlNamespaces( FSHelperPtr serializer )
     pAttr->add( FSNS( XML_xmlns, XML_w10 ), "urn:schemas-microsoft-com:office:word" );
     pAttr->add( FSNS( XML_xmlns, XML_wp ), "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" );
     pAttr->add( FSNS( XML_xmlns, XML_wps ), "http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
+    pAttr->add( FSNS( XML_xmlns, XML_wpg ), "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
     pAttr->add( FSNS( XML_xmlns, XML_mc ), "http://schemas.openxmlformats.org/markup-compatibility/2006" );
     return XFastAttributeListRef( pAttr );
 }