diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-12-04 10:38:53 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-12-04 10:57:08 +0000 |
| commit | 3d43dc3318a0692287e877b2e70e873372d2c248 (patch) | |
| tree | c4b78ac6678b9ef64976662323fadaf50b6d0dc7 | |
| parent | 0a6d705e9dc1bcf225b7bba684e98f29a1781c54 (diff) | |
fdo#54473 fdo#57133 fix RTF import of character styles
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd
(cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090)
Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
Reviewed-on: https://gerrit.libreoffice.org/1235
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -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 a910401e99fa..9a348b84f7f2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2479,7 +2479,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); |