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>
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index e78ed74..d88a2c0 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 2e96226..47a2424 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 f9f66e3..719233d1 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
