summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-07-27 00:06:51 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-07-27 01:09:45 +0200
commit494937776956370eda868f91922c4cff34656050 (patch)
tree6b90ab4adc9a06e9a33a0aee971e915602dfc6b1 /writerfilter
parent3a46d91f8de420f38dd763028e91229c846dff52 (diff)
fdo#67365 fix RTF import of inherited row props wrt unusual group stack
Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 56e175952183..4b2b142a7e1a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4691,6 +4691,11 @@ int RTFDocumentImpl::popState()
m_aStates.top().nCells = aState.nCells;
m_aStates.top().aTableCellsSprms = aState.aTableCellsSprms;
m_aStates.top().aTableCellsAttributes = aState.aTableCellsAttributes;
+
+ // Also the inherited properties should be kept accross groups.
+ m_aStates.top().aTableInheritingCellsSprms = aState.aTableInheritingCellsSprms;
+ m_aStates.top().aTableInheritingCellsAttributes = aState.aTableInheritingCellsAttributes;
+ m_aStates.top().nInheritingCells = aState.nInheritingCells;
}
return 0;