diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-08 09:47:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-08 09:53:13 +0100 |
| commit | 5ecd8a55ee494c1150ec552a9002c6991371437c (patch) | |
| tree | 6ae9142163a328d4ead79868c4087699d097b1fc /writerfilter/source | |
| parent | cad4afbd1444fe410aef014b01008b03ed4ecbf5 (diff) | |
DOCX filter: handle char style's qFormat, rsid and friends
Change-Id: Ie0bc9aff722d87fcd246d0cf1971ad6f34f0996a
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index b34273ace4ce..57c2c98a2fc3 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -400,6 +400,12 @@ PropertyMapPtr StyleSheetTable::GetDefaultCharProps() return m_pImpl->m_pDefaultCharProps; } +// Does the given style type support InteropGrabBag? +bool lcl_wantGrabBag(StyleType eType) +{ + return eType == STYLE_TYPE_TABLE || eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR; +} + void StyleSheetTable::lcl_attribute(Id Name, Value & val) { OSL_ENSURE( m_pImpl->m_pCurrentEntry, "current entry has to be set here"); @@ -485,7 +491,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) break; case NS_ooxml::LN_CT_Style_default: m_pImpl->m_pCurrentEntry->bIsDefaultStyle = (nIntValue != 0); - if(m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE || m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_PARA) + if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) { beans::PropertyValue aValue; aValue.Name = "default"; @@ -494,7 +500,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) } break; case NS_ooxml::LN_CT_Style_customStyle: - if(m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE || m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_PARA) + if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) { beans::PropertyValue aValue; aValue.Name = "customStyle"; @@ -617,7 +623,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_Style_uiPriority: case NS_ooxml::LN_CT_Style_link: case NS_ooxml::LN_CT_Style_locked: - if(m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE || m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_PARA) + if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) { StyleSheetEntryPtr pEntry = m_pImpl->m_pCurrentEntry; beans::PropertyValue aValue; |