diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-04-11 21:37:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-12 12:07:50 +0200 |
| commit | 0013f21ecd918e0541f165c3526a58f42dd75481 (patch) | |
| tree | 52b2578ce1c6734863bc57ec4b7009568bc0c223 /writerfilter/source/dmapper/DomainMapperTableHandler.cxx | |
| parent | 4e7e3670c31329d60f5cc782abc4568c2aba33a7 (diff) | |
tdf#124344 sw btlr writing mode, DOCX import: fix vertical alignment
The hack added in commit 3325e0f206ce864730468c3556ce06760042c157
(bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLr,
2014-07-02) is no longer needed, actually just reverting it fixes the
problem, as then layout does the right thing.
No need to center paragraph adjustment to any kind of vertical
orientation, now that we have proper layout support.
Change-Id: I6aa74f5289a014c148fbd7c7ab03ec885d931daf
Reviewed-on: https://gerrit.libreoffice.org/70610
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableHandler.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 15a7c558820a..6d4e4c86537b 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -29,9 +29,7 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include "TablePositionHandler.hxx" #include "ConversionHelper.hxx" #include "util.hxx" @@ -848,21 +846,6 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl } (*aCellIterator)->Erase(PROP_HORIZONTAL_MERGE); } - - // Cell direction is not an UNO Property, either. - const boost::optional<PropertyMap::Property> aCellDirectionVal = (*aCellIterator)->getProperty(PROP_CELL_DIRECTION); - if (aCellDirectionVal) - { - if (aCellDirectionVal->second.get<sal_Int32>() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_TextDirection_btLr)) - { - // btLr, so map ParagraphAdjust_CENTER to VertOrientation::CENTER. - uno::Reference<beans::XPropertySet> xPropertySet(m_aTableRanges[nRow][nCell][0], uno::UNO_QUERY); - if (xPropertySet.is() && xPropertySet->getPropertyValue("ParaAdjust").get<sal_Int16>() == sal_Int16(style::ParagraphAdjust_CENTER)) - (*aCellIterator)->Insert(PROP_VERT_ORIENT, uno::makeAny(text::VertOrientation::CENTER)); - } - (*aCellIterator)->Erase(PROP_CELL_DIRECTION); - } - pSingleCellProperties[nCell] = (*aCellIterator)->GetPropertyValues(); #ifdef DBG_UTIL TagLogger::getInstance().endElement(); |