diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-31 17:20:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-31 17:46:38 +0200 |
| commit | 8fea536cebefe319a7fd5971b28e0936ac91ecb9 (patch) | |
| tree | 6ba3b9b0d059257c115acb683d94a7af8e6da91e /writerfilter | |
| parent | ddb24728b2971f6ed64a0372acb166251f1d9c8f (diff) | |
SdtHelper::createDateControl: clear the property list after reading it
Otherwise it may happen that the property list will be read twice, and
on export we'll create two <w:sdt> for a single imported one.
Change-Id: I57ab595f956c5e808fc73fe644ee3e249a1fc1ed
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index bf268a333c0f..693b248b99cf 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -131,6 +131,8 @@ void SdtHelper::createDateControl(OUString& rContentText, beans::PropertyValue a aGrabBag["CharFormat"] <<= aCharFormat.Value; // merge in properties like ooxml:CT_SdtPr_alias and friends. aGrabBag.update(comphelper::SequenceAsHashMap(m_aGrabBag)); + // and empty the property list, so they won't end up on the next sdt as well + m_aGrabBag.realloc(0); std::vector<OUString> aItems; createControlShape(lcl_getOptimalWidth(m_rDM_Impl.GetStyleSheetTable(), rContentText, aItems), xControlModel, aGrabBag.getAsConstPropertyValueList()); |