diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-22 09:24:06 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-20 20:34:10 +0200 |
| commit | 6b7b2915df0676eb16f51fc72fe34f411b9cd5c1 (patch) | |
| tree | de0380e5bdb1ac1f5171e988958ec9bf8239debf /writerfilter | |
| parent | c0d7ce09a160a1cd07c92fd4a461d9c2d394a457 (diff) | |
tdf#86374 DOCX import: fix btLr text table direction without <w:cantSplit/>
Commit 0208ead70a9412ccd554fcef3e9308f8ca17037b (DOCX import: improve
btLr table cell support, 2013-02-22) made any table row that has at
least one btLr cell fixed height. This causes problems in case a table
has a minimal height with lots of content, where the fixed height gives
wrong layout, but the minimal height is correct.
Fix the problem by only making the row fixed height if <w:cantSplit/> is
set (as seen in the old bugdoc), and revert to setting the height type
to minimal in any other case.
(cherry picked from commit 233a634a112e6dae07dca5fb1296764cb0001503)
Conflicts:
writerfilter/source/dmapper/TableManager.hxx
Change-Id: Ibaf91f542e64e5caa7904df97eb6eb52618e0023
Reviewed-on: https://gerrit.libreoffice.org/17392
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index c13303c31859..9e06575d4665 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -315,6 +315,7 @@ protected: mState.resetCellProps(); } +public: PropertiesPointer getRowProps() { return mState.getRowProps(); @@ -330,6 +331,7 @@ protected: mState.resetRowProps(); } +protected: void setInCell(bool bInCell) { mState.setInCell(bInCell); diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index c9516120f696..453aec99a824 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -103,8 +103,14 @@ namespace dmapper { const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames. if (!pManager || !pManager->HasBtlrCell() || pMeasureHandler->getMeasureValue() > ConversionHelper::convertTwipToMM100(MINLAY)) { - // In case a cell already wanted fixed size, we should not overwrite it here. - if (!pManager || !pManager->IsRowSizeTypeInserted()) + bool bCantSplit = false; + if (pManager && pManager->getRowProps()) + { + boost::optional<PropertyMap::Property> oIsSplitAllowed = pManager->getRowProps()->getProperty(PROP_IS_SPLIT_ALLOWED); + bCantSplit = oIsSplitAllowed && !oIsSplitAllowed->second.get<bool>(); + } + // In case a cell already wanted fixed size and the row has <w:cantSplit/>, we should not overwrite it here. + if (!pManager || !pManager->IsRowSizeTypeInserted() || !bCantSplit) pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny( pMeasureHandler->GetRowHeightSizeType() ), false); else pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX), false); |