summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-10-02 18:00:34 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-10-02 18:07:26 +0200
commit78766aaa12ae4fae9dd2f3274617ba41de57eefd (patch)
tree5a76ccb91ad339df101f10632ea59421b196add8 /writerfilter
parentdc358107b88badba60bc348564034ac2ad19c65c (diff)
DOCX import: handle <w:tcPr> directly under <w:style>
Change-Id: I10dfb947bbd9e792c98932608acb2f0987fd8605
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index eb22ecf80a18..6fee9e2008bd 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -574,6 +574,9 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
StyleSheetEntry* pEntry = m_pImpl->m_pCurrentEntry.get();
TableStyleSheetEntry& rTableEntry = dynamic_cast<TableStyleSheetEntry&>(*pEntry);
rTableEntry.AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tcPr"));
+
+ // This is a <w:tcPr> directly under <w:style>, so it affects the whole table.
+ rTableEntry.pProperties->InsertProps(pTblStylePrHandler->getProperties());
}
}
break;