summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-12-04 10:38:53 +0100
committerAndras Timar <atimar@suse.com>2013-01-13 22:00:23 +0100
commit2747bb9c4d814f64b1a2bf6a9cba99575695cd2e (patch)
treef4dfadfd2ded126d5bd4ebad3065d5d08cb6d7c0
parentb5c39d6842f7489f4782d7e771cf8822ee1f262c (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.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b84e303dacbc..51f4966199ef 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2438,7 +2438,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);