summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-03-18 10:59:12 +0100
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2014-03-20 10:28:22 +0100
commitde1f5cb2ad67d94dfac46b3577a7c0b8ed06ba6d (patch)
tree3911228e829428c3a4a3762878a6d0eef25f9b14 /sw
parent53fc63e351a99aed8027622aa30228850ed72fcb (diff)
ooxml: preserve docPartList property in sdt blocks
This patch strictly reuses the code introduced at commit 55211e612d2cbed03dd81c039d07ea4e936c2804. Change-Id: Ie9151c81c2cb63d0f4a320293b6e5d27f20d4043
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1ff6305efb87..a97fa11fcfa6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6889,9 +6889,14 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
else if (i->first == "ParaSdtPr")
{
beans::PropertyValue aPropertyValue = i->second.get<beans::PropertyValue>();
- if (aPropertyValue.Name == "ooxml:CT_SdtPr_docPartObj")
+ if (aPropertyValue.Name == "ooxml:CT_SdtPr_docPartObj" ||
+ aPropertyValue.Name == "ooxml:CT_SdtPr_docPartList")
{
- m_nSdtPrToken = FSNS( XML_w, XML_docPartObj );
+ if (aPropertyValue.Name == "ooxml:CT_SdtPr_docPartObj")
+ m_nSdtPrToken = FSNS( XML_w, XML_docPartObj );
+ else if (aPropertyValue.Name == "ooxml:CT_SdtPr_docPartList")
+ m_nSdtPrToken = FSNS( XML_w, XML_docPartList );
+
uno::Sequence<beans::PropertyValue> aGrabBag;
aPropertyValue.Value >>= aGrabBag;
for (sal_Int32 j=0; j < aGrabBag.getLength(); ++j)