diff options
Diffstat (limited to 'writerfilter/source')
4 files changed, 0 insertions, 26 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 01c7f59fc314..cf36a7abd1c7 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 DEBUG_WRITERFILTER TagLogger::getInstance().endElement(); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index f7538768360f..4eaa51823c24 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -281,13 +281,6 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TcPrBase_textDirection: { TablePropertyMapPtr pPropMap( new TablePropertyMap ); - - // Remember the cell direction, so later in - // DomainMapperTableHandler::endTableGetCellProperties() can we - // handle the combination of the cell direction and paragraph - // alignment as necessary. - pPropMap->Insert(PROP_CELL_DIRECTION, uno::Any(nIntValue)); - bool bInsertCellProps = true; switch ( nIntValue ) { diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index b11b27ce7bcb..8faa6f63508c 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -338,7 +338,6 @@ OUString getPropertyName( PropertyIds eId ) case PROP_CELL_INTEROP_GRAB_BAG : sName = "CellInteropGrabBag"; break; case PROP_TABLE_INTEROP_GRAB_BAG : sName = "TableInteropGrabBag"; break; case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = "ApplyParagraphMarkFormatToNumbering"; break; - case PROP_CELL_DIRECTION: sName = "CellDirection"; break; case PROP_SDT_END_BEFORE: sName = "SdtEndBefore"; break; case PROP_PARA_SDT_END_BEFORE: sName = "ParaSdtEndBefore"; break; case META_PROP_TABLE_LOOK: sName = "TableStyleLook"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index a936b93d6470..ca2c4b6d5498 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -336,7 +336,6 @@ enum PropertyIds ,PROP_TABLE_INTEROP_GRAB_BAG ,PROP_INDEX_ENTRY_TYPE ,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING - ,PROP_CELL_DIRECTION ,PROP_SDT_END_BEFORE ,PROP_PARA_SDT_END_BEFORE ,META_PROP_TABLE_LOOK |