diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-04 11:16:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-04 12:42:45 +0100 |
| commit | 832586588c3ed5f1686a4ecebc2ed198ce049b24 (patch) | |
| tree | b6095280069772918fb60f193b89f0a06b11a624 /writerfilter | |
| parent | 2bb5f4773cc73a13bcd1460c02bc33bb4e60225c (diff) | |
DOCX filter: more run properties table style roundtrip work
Implement roundtrip of smallCaps, spacing, caps and color's themeColor
attribute.
Change-Id: I1ac88de030356a5ce08a28ac16cd159a426d2be9
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 0d48d9998b32..d026fa5e0866 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -20,6 +20,7 @@ #include <resourcemodel/ResourceModelHelper.hxx> #include <SdtHelper.hxx> +#include <TDefTableHandler.hxx> #include <DomainMapper_Impl.hxx> #include <ConversionHelper.hxx> #include <ModelEventListener.hxx> @@ -1440,6 +1441,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_FtnEdnRef_id: // footnote or endnote reference id - not needed case NS_ooxml::LN_CT_Color_themeColor: + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "themeColor", TDefTableHandler::getThemeColorTypeString(nIntValue)); + break; case NS_ooxml::LN_CT_Color_themeTint: case NS_ooxml::LN_CT_Color_themeShade: //unsupported @@ -2196,10 +2199,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_CFSmallCaps: /*sprmCFSmallCaps*/ rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue)); break; case NS_sprm::LN_CFCaps: /*sprmCFCaps*/ rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "caps", OUString::number(nIntValue)); break; case NS_sprm::LN_CFEmboss: /*sprmCFEmboss*/ rContext->Insert(ePropertyId, @@ -2305,6 +2310,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType nResult = static_cast<sal_Int16>(nIntValue); } rContext->Insert(PROP_CHAR_CHAR_KERNING, uno::makeAny(nResult)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "spacing", OUString::number(nIntValue)); } break; case NS_sprm::LN_CHpsKern: // sprmCHpsKern auto kerning is bound to a minimum font size in Word - but not in Writer :-( |