summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2011-07-27 13:58:27 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2011-07-29 17:32:40 +0200
commit5cf93d289c1041ef3658d7242d8fb310bbf4cfa5 (patch)
tree59bcfb871d6fd6113d759c2de8a6aae829398fa3 /writerfilter/source
parentcbc5dcab8d3ad265b77f42c5de63983c786b52be (diff)
RTF_SL: ignore zero parameter, that means auto, which is the default
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx21
1 files changed, 7 insertions, 14 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7ad1c548a..87e344ad0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1672,20 +1672,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
return 0;
}
- // Trivial paragraph attributes.
- switch (nKeyword)
- {
- // NS_sprm::LN_PDyaLine could be used, but that won't work with slmult
- case RTF_SL: nSprm = NS_ooxml::LN_CT_Spacing_line; break;
- default: break;
- }
- if (nSprm > 0)
- {
- m_aStates.top().aParagraphAttributes.push_back(make_pair(nSprm, pIntValue));
- skipDestination(bParsed);
- return 0;
- }
-
// Trivial character attributes.
switch (nKeyword)
{
@@ -1851,6 +1837,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
m_aStates.top().aCharacterAttributes.push_back(make_pair(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets, pIntValue));
}
break;
+ case RTF_SL:
+ if (nParam > 0)
+ {
+ // NS_sprm::LN_PDyaLine could be used, but that won't work with slmult
+ m_aStates.top().aParagraphAttributes.push_back(make_pair(nSprm, pIntValue));
+ }
+ break;
case RTF_SLMULT:
if (nParam > 0)
{