diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-03-22 20:45:53 +0100 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-03-22 23:58:16 +0100 |
| commit | 452469f1b825ac4dfa2b9b096175f7cfc9a1aa36 (patch) | |
| tree | d1f26dc70264dab17e6ac031a4436ea92d33e326 /writerfilter | |
| parent | b825b336caec720acfdc97766ebfd96bb077a5af (diff) | |
ooxml: preserve text sdt property
Change-Id: I46b857298ae5d86fe6055efb86d046da48882e8a
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d8d14e6f62db..ed3dc13953b5 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2250,6 +2250,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_SdtPr_picture: case NS_ooxml::LN_CT_SdtPr_citation: case NS_ooxml::LN_CT_SdtPr_group: + case NS_ooxml::LN_CT_SdtPr_text: { // this is an unsupported SDT property, create a grab bag for it OUString sName = OUString::createFromAscii((*QNameToString::Instance())(nSprmId).c_str()); @@ -2667,6 +2668,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) // there are unsupported SDT properties in the document // save them in the paragraph interop grab bag if(m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_checkbox") || + m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_text") || m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_dataBinding")) m_pImpl->GetTopContextOfType(CONTEXT_CHARACTER)->Insert(PROP_SDTPR, uno::makeAny(m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear()), true, CHAR_GRAB_BAG); diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index e60d60e50881..16039bc63898 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -18907,7 +18907,7 @@ <ref name="CT_Empty"/> </element> <element name="text"> - <ref name="CT_SdtText"/> + <ref name="CT_OnOff"/> </element> <element name="citation"> <ref name="CT_OnOff"/> |