diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-18 16:41:09 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-18 17:05:57 +0200 |
| commit | 085ab61bfd63d7610f2ccc52aa2483d795c9bc1a (patch) | |
| tree | 1115ee02368ad05031ffd94a7c095ec901e890c7 | |
| parent | 7916ca62209ee32c46c264b8cbf0a28b1c23a2a8 (diff) | |
DOCX import: handle <w:alias> for the date SDT
Change-Id: I4a58fd9fc1db4e0fd3f9e2142fc208cec9f99f9d
| -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 18c3c066a4f4..2b1a111822d1 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -128,6 +128,8 @@ void SdtHelper::createDateControl(OUString& rContentText, beans::PropertyValue a aGrabBag["DateFormat"] <<= sDateFormat; aGrabBag["Locale"] <<= m_sLocale.makeStringAndClear(); aGrabBag["CharFormat"] <<= aCharFormat.Value; + // merge in properties like ooxml:CT_SdtPr_alias and friends. + aGrabBag.update(comphelper::SequenceAsHashMap(m_aGrabBag)); std::vector<OUString> aItems; createControlShape(lcl_getOptimalWidth(m_rDM_Impl.GetStyleSheetTable(), rContentText, aItems), xControlModel, aGrabBag.getAsConstPropertyValueList()); |