Kaydet (Commit) de1f5cb2 authored tarafından Jacobo Aragunde Pérez's avatar Jacobo Aragunde Pérez

ooxml: preserve docPartList property in sdt blocks

This patch strictly reuses the code introduced at commit
55211e61.

Change-Id: Ie9151c81c2cb63d0f4a320293b6e5d27f20d4043
üst 53fc63e3
...@@ -6889,9 +6889,14 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem) ...@@ -6889,9 +6889,14 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
else if (i->first == "ParaSdtPr") else if (i->first == "ParaSdtPr")
{ {
beans::PropertyValue aPropertyValue = i->second.get<beans::PropertyValue>(); 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; uno::Sequence<beans::PropertyValue> aGrabBag;
aPropertyValue.Value >>= aGrabBag; aPropertyValue.Value >>= aGrabBag;
for (sal_Int32 j=0; j < aGrabBag.getLength(); ++j) for (sal_Int32 j=0; j < aGrabBag.getLength(); ++j)
......
...@@ -2235,6 +2235,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) ...@@ -2235,6 +2235,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
break; break;
case NS_ooxml::LN_CT_SdtPr_equation: case NS_ooxml::LN_CT_SdtPr_equation:
case NS_ooxml::LN_CT_SdtPr_docPartObj: case NS_ooxml::LN_CT_SdtPr_docPartObj:
case NS_ooxml::LN_CT_SdtPr_docPartList:
case NS_ooxml::LN_CT_SdtPr_picture: case NS_ooxml::LN_CT_SdtPr_picture:
case NS_ooxml::LN_CT_SdtPr_citation: case NS_ooxml::LN_CT_SdtPr_citation:
case NS_ooxml::LN_CT_SdtPr_group: case NS_ooxml::LN_CT_SdtPr_group:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment