Kaydet (Commit) bd98c467 authored tarafından Miklos Vajna's avatar Miklos Vajna

DOCX import: handle <w:alias> in <w:sdtPr>

Change-Id: Ia064421ac9c6f84015b1527a3d179dede3f6f832
üst 5a3d129a
...@@ -2304,6 +2304,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) ...@@ -2304,6 +2304,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case NS_ooxml::LN_CT_SdtPr_group: case NS_ooxml::LN_CT_SdtPr_group:
case NS_ooxml::LN_CT_SdtPr_text: case NS_ooxml::LN_CT_SdtPr_text:
case NS_ooxml::LN_CT_SdtPr_id: case NS_ooxml::LN_CT_SdtPr_id:
case NS_ooxml::LN_CT_SdtPr_alias:
{ {
// this is an unsupported SDT property, create a grab bag for it // this is an unsupported SDT property, create a grab bag for it
OUString sName; OUString sName;
...@@ -2319,6 +2320,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) ...@@ -2319,6 +2320,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case NS_ooxml::LN_CT_SdtPr_group: sName = "ooxml:CT_SdtPr_group"; break; case NS_ooxml::LN_CT_SdtPr_group: sName = "ooxml:CT_SdtPr_group"; break;
case NS_ooxml::LN_CT_SdtPr_text: sName = "ooxml:CT_SdtPr_text"; break; case NS_ooxml::LN_CT_SdtPr_text: sName = "ooxml:CT_SdtPr_text"; break;
case NS_ooxml::LN_CT_SdtPr_id: sName = "ooxml:CT_SdtPr_id"; break; case NS_ooxml::LN_CT_SdtPr_id: sName = "ooxml:CT_SdtPr_id"; break;
case NS_ooxml::LN_CT_SdtPr_alias: sName = "ooxml:CT_SdtPr_alias"; break;
default: assert(false); default: assert(false);
}; };
enableInteropGrabBag(sName); enableInteropGrabBag(sName);
...@@ -2328,7 +2330,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) ...@@ -2328,7 +2330,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
if (pProperties.get() != NULL) if (pProperties.get() != NULL)
pProperties->resolve(*this); pProperties->resolve(*this);
m_pImpl->m_pSdtHelper->appendToInteropGrabBag(getInteropGrabBag()); if (nSprmId == NS_ooxml::LN_CT_SdtPr_alias)
{
beans::PropertyValue aValue;
aValue.Name = sName;
aValue.Value <<= sStringValue;
m_pImpl->m_pSdtHelper->appendToInteropGrabBag(aValue);
}
else
m_pImpl->m_pSdtHelper->appendToInteropGrabBag(getInteropGrabBag());
m_pImpl->disableInteropGrabBag(); m_pImpl->disableInteropGrabBag();
} }
break; break;
......
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