diff options
author | Justin Luth <justin.luth@collabora.com> | 2019-11-29 12:22:15 +0300 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2019-11-29 19:48:32 +0100 |
commit | a070fb8e87e0712de5336a9683208b6b277ce9b9 (patch) | |
tree | 14b2f2f8fd0368b5e176d57d4a35120cb9b4d4fb /writerfilter | |
parent | f9fd9d4cd4f792cd4ec8e14df78f3193653dae67 (diff) |
tdf#118947 writerfilter: remove obsolete tablestyle fontsize hack
LO 6.5 commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c
obsoletes this old hack. The default paragraph style has
(almost) nothing to do with table styles.
*Any* specified (non-inherited) paragraph style property
should override a table style, including the default paratyle.
One exception is the default occurance of the
not-yet-supported word/settings.xml compat option
overrideTableStyleFontSizeAndJustification = false.
The default case should cause the table-style font to override
a size 11 or 12 default-paragraph-style font. So that is actually
double-reason to remove this old hack which threw out
the table-style size altogether.
Change-Id: Id1687f32b8431b6fa8770b01c344e75e0ffb344f
Reviewed-on: https://gerrit.libreoffice.org/84044
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4f7648f0967f..0744c5673b68 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1684,7 +1684,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } else { - bool bIgnore = false; const RubyInfo &aInfo = m_pImpl->GetRubyInfo(); if (aInfo.nSprmId == NS_ooxml::LN_CT_Ruby_rt && aInfo.nHps > 0 ) { @@ -1696,23 +1695,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) fVal = double(aInfo.nHpsBaseText) / 2.; aVal <<= fVal; } - else if (m_pImpl->m_bInTableStyleRunProps) - { - // If the default para style contains PROP_CHAR_HEIGHT, that should have priority over the table style. - StyleSheetEntryPtr pTable = m_pImpl->GetStyleSheetTable()->FindDefaultParaStyle(); - if (pTable && pTable->pProperties->isSet(PROP_CHAR_HEIGHT) ) - bIgnore = true; - } - if (!bIgnore) - { - //Asian get the same value as Western - rContext->Insert( PROP_CHAR_HEIGHT, aVal ); - rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); + //Asian get the same value as Western + rContext->Insert( PROP_CHAR_HEIGHT, aVal ); + rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); - uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle()); - if (xCharStyle.is()) - xCharStyle->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), aVal); - } + uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle()); + if (xCharStyle.is()) + xCharStyle->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), aVal); } m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, (nSprmId == NS_ooxml::LN_EG_RPrBase_sz ? OUString("sz") : OUString("szCs")), OUString::number(nIntValue)); } |