diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-02-15 14:06:15 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-03 10:33:15 +0200 |
| commit | 9e47f03e1241f35972c01e9cad6ec6accb4a6bf2 (patch) | |
| tree | a5e4dce29d75366b16fea705b3fbd95144195277 /writerfilter | |
| parent | 2dd467620a43be78c3816d1cbe6eb095be8e121a (diff) | |
sw btlr writing mode: implement DOCX filter
Replace the old trick with character-level rotation with the usage of
the new writing direction.
This means that finally table cells with btlr text direction and
multiple paragraphs show all content, not only the first paragraph, as
before (seen as data loss by users).
(cherry picked from commit 8fdbda18b593e7014e44a0fd590bbf98d83258b7)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I094f36fa6ba0701579e487e8e0212707987b1b2f
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index b698fabe0c44..f7538768360f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -298,20 +298,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); break; case NS_ooxml::LN_Value_ST_TextDirection_btLr: - { - // We have to fake this text direction - pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); - pPropMap->Insert( PROP_CHAR_ROTATION, uno::makeAny( sal_Int16( 900 ) )); - SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); - - // We're faking a text direction, so don't allow multiple lines. - if (!getCellProps() || !getCellProps()->isSet(PROP_VERTICAL_MERGE)) - { - // Though in case there will be a vertical merge, don't do this, it hides text that is supposed to be visible. - m_bRowSizeTypeInserted = true; - } - m_bHasBtlrCell = true; - } + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::BT_LR )); break; case NS_ooxml::LN_Value_ST_TextDirection_lrTbV: pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); |