diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2023-01-05 18:32:39 +0300 |
---|---|---|
committer | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2023-01-06 07:26:15 +0000 |
commit | f011a13b3e9d3edf85fa8cb17d612934e589e672 (patch) | |
tree | e43f4f909729435a18315993cf90cc903ed4deab | |
parent | 72fc34cdf8e2a3d4fa3a2de9a8a96f33aa19dbc4 (diff) |
writerfilter: removed remains of GAP_HALF define and its usage
Change-Id: I8dee16f923686f557c8213d9a7870392bd5fe9bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145090
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
-rw-r--r-- | compilerplugins/clang/unusedenumconstants.writeonly.results | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results index e78ed74414cd..d88a2c0a3c16 100644 --- a/compilerplugins/clang/unusedenumconstants.writeonly.results +++ b/compilerplugins/clang/unusedenumconstants.writeonly.results @@ -5884,8 +5884,6 @@ writerfilter/source/dmapper/PropertyMap.hxx:563 enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget TABLE_WIDTH writerfilter/source/dmapper/PropertyMap.hxx:564 enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget TABLE_WIDTH_TYPE -writerfilter/source/dmapper/PropertyMap.hxx:565 - enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget GAP_HALF writerfilter/source/dmapper/PropertyMap.hxx:566 enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget LEFT_MARGIN writerfilter/source/dmapper/PropertyMap.hxx:567 diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 2e962260c79c..47a2424c298a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -354,9 +354,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if( m_aTableProperties ) { //create properties from the table attributes - //...pPropMap->Insert( PROP_LEFT_MARGIN, uno::makeAny( m_nLeftMargin - m_nGapHalf )); - //pPropMap->Insert( PROP_HORI_ORIENT, uno::makeAny( text::HoriOrientation::RIGHT )); - sal_Int32 nGapHalf = 0; sal_Int32 nLeftMargin = 0; comphelper::SequenceAsHashMap aGrabBag; @@ -509,8 +506,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo m_aTableProperties->Insert( PROP_TABLE_INTEROP_GRAB_BAG, uno::Any( aGrabBag.getAsConstPropertyValueList() ) ); } - m_aTableProperties->getValue( TablePropertyMap::GAP_HALF, nGapHalf ); - std::optional<PropertyMap::Property> oLeftMarginFromStyle = m_aTableProperties->getProperty(PROP_LEFT_MARGIN); if (oLeftMarginFromStyle) { @@ -625,7 +620,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if (((nMode < 0) || (0 < nMode && nMode <= 14)) && rInfo.nNestLevel == 1) { - const sal_Int32 nAdjustedMargin = nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance; + const sal_Int32 nAdjustedMargin = nLeftMargin - rInfo.nLeftBorderDistance; m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::Any( nAdjustedMargin ) ); } else @@ -635,7 +630,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // so emulate that by adding the half the width. (also see docxattributeoutput) if ( rInfo.nNestLevel > 1 && nLeftMargin < 0 ) nLeftMargin = 0; - const sal_Int32 nAdjustedMargin = nLeftMargin - nGapHalf + (aLeftBorder.LineWidth / 2); + const sal_Int32 nAdjustedMargin = nLeftMargin + (aLeftBorder.LineWidth / 2); m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::Any( nAdjustedMargin ) ); } diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index f9f66e3dcc0b..719233d1ee73 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -575,7 +575,6 @@ public: CELL_MAR_BOTTOM, TABLE_WIDTH, TABLE_WIDTH_TYPE, - GAP_HALF, LEFT_MARGIN, HORI_ORIENT, TablePropertyMapTarget_MAX |