From cbd0fbc287051f918e4adb32b3e9b58dfbf8059d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 6 Nov 2014 15:15:29 +0100 Subject: DOCX import: fix handling when cells have fixed widths Commit 74c5ed19f430327988194cdcd6bdff09591a93fa (DOCX import fix for table with auto size, 2013-06-26) correctly recognized that in case the width type is auto, that doesn't always mean text::SizeType::VARIABLE. However, when the size is fixed, then we should simply not do anything, and that'll lead to the right behavior (by setting the column separators on each row), don't try to be smart and try to set TablePropertyMap::TABLE_WIDTH here. Change-Id: I997b88e5fa34bbabe7c6940879c81a1d62d69043 --- writerfilter/source/dmapper/DomainMapperTableManager.cxx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index cad79e9f350b..0caba6530041 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -202,16 +202,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) } // Check whether the total width of given row is compared with the maximum value of rows (m_nMaxFixedWidth). - if (bFixed ) - { - // Check if total width - if (m_nMaxFixedWidth < nRowFixedWidth) - m_nMaxFixedWidth = nRowFixedWidth; - - pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::FIX ); - pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nMaxFixedWidth ); - } - else + if (!bFixed) { // Set the width type of table with 'Auto' and set the width value to 100(%) pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE ); -- cgit