diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-27 21:07:43 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-27 21:35:06 +0100 |
commit | 97dcf77841d19d344d58d5bdacdab141cdea4817 (patch) | |
tree | 37dcbb89566e71516b7a1fb24fc4873bf821bd40 /writerfilter/source/dmapper/PropertyIds.cxx | |
parent | bb562304c1e1c61a882e6db65806cfdf8601bcbf (diff) |
Related: fdo#65090 DOCX import: handle w:hMerge cell property
Change-Id: I82f334426715fd1a1f0105b86f763d41e66f32da
Diffstat (limited to 'writerfilter/source/dmapper/PropertyIds.cxx')
-rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index a05249a5c6a3..1cce816a282d 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -359,6 +359,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const case PROP_CHAR_THEME_ORIGINAL_COLOR : sName = "CharThemeOriginalColor"; break; case PROP_CHAR_THEME_COLOR_SHADE : sName = "CharThemeColorShade"; break; case PROP_CHAR_THEME_FILL : sName = "CharThemeFill"; break; + case PROP_HORIZONTAL_MERGE: sName = "HorizontalMerge"; break; } ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt = m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName )); |