From ad913681c0e0cdaaa706329f518f59ee54b86d43 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 19 Nov 2012 12:41:39 +0100 Subject: n#780645 DOCX import: add support for fixed column width In general, DOCX tables provide a grid for the table, then use spans in case different number of cells are used in different rows. In this case, the cell width is ignored, as the wished width can be counted from the grid and span values. However, it's also valid to simply provide more cells then the amount defined by the grid, and in this case the cell width should decide the final width of the cells. This commit adds support for this later case. Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c --- writerfilter/inc/resourcemodel/TableManager.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'writerfilter/inc') diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index 71d9a819a61d..b6555cc00264 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -466,6 +466,11 @@ protected: */ sal_uInt32 getTableDepthNew() { return mnTableDepthNew; } + /** + Return the current table difference, i.e. 1 if we are in the first cell of a new table, etc. + */ + sal_uInt32 getTableDepthDifference() { return mnTableDepthNew - mnTableDepth; } + /** Action to be carried out at the end of the last paragraph of a cell. -- cgit v1.2.3