diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-12 11:42:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-12 15:47:59 +0100 |
| commit | 48b5b7641d0df960558082e8948da8598f801264 (patch) | |
| tree | a80f51c83cb8930d41fb99acf0e63667b74502c0 /writerfilter | |
| parent | e5cb1989520baf321961dbb82437d1b00a2a499c (diff) | |
bnc#865381 DOCX import: fix btLr cell direction when having vertical merge
Change-Id: I527955671e1100f05da717bffe002131baaf0291
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 103befa5fbea..773da178d9f4 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -346,10 +346,14 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); // We're faking a text direction, so don't allow multiple lines. - TablePropertyMapPtr pRowPropMap( new TablePropertyMap ); - pRowPropMap->Insert(PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX)); - m_bRowSizeTypeInserted = true; - insertRowProps(pRowPropMap); + if (!getCellProps() || getCellProps()->find(PROP_VERTICAL_MERGE) == getCellProps()->end()) + { + // Though in case there will be a vertical merge, don't do this, it hides text that is supposed to be visible. + TablePropertyMapPtr pRowPropMap( new TablePropertyMap ); + pRowPropMap->Insert(PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX)); + m_bRowSizeTypeInserted = true; + insertRowProps(pRowPropMap); + } } break; case 4: // lrTbV |