diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-12-04 10:38:53 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-12-04 10:59:19 +0100 |
commit | 41890bf714803969515578b47e63fa9730ea7090 (patch) | |
tree | edcb686683025ed1e193119e6b6b6627e1e8d376 /writerfilter | |
parent | 5da8bdb4d4bde5175c9e89182956043ffc991c50 (diff) |
fdo#54473 fdo#57133 fix RTF import of character styles
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd
Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9c988d7400c7..aa90d3b07b7e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2673,7 +2673,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD, pIntValue); break; case RTF_CS: - if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET) + if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET || m_aStates.top().nDestinationState == DESTINATION_STYLEENTRY) { m_nCurrentStyleIndex = nParam; m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD, pIntValue); |