diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-08 13:46:33 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-08 14:23:12 +0100 |
| commit | 961e319da7e8aa16b64ceee421e896802cbb82c1 (patch) | |
| tree | 752a57ec8c67fa1283ac4221e8f9dec5c655c49c /writerfilter/source | |
| parent | d632598049b473a6e06dde853b54cf5206604a9e (diff) | |
DOCX filter: handle numbering style's qFormat, rsid and friends
Change-Id: Ia261995b98e2108ab673c7b240a1aa822d3db96e
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 57c2c98a2fc3..941ab3ea684c 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -400,12 +400,6 @@ 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"); @@ -491,7 +485,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(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) + if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN) { beans::PropertyValue aValue; aValue.Name = "default"; @@ -500,7 +494,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) } break; case NS_ooxml::LN_CT_Style_customStyle: - if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) + if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN) { beans::PropertyValue aValue; aValue.Name = "customStyle"; @@ -623,7 +617,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(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode)) + if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN) { StyleSheetEntryPtr pEntry = m_pImpl->m_pCurrentEntry; beans::PropertyValue aValue; |