summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2024-02-22 22:05:21 +0600
committerMike Kaganski <mike.kaganski@collabora.com>2024-02-23 01:34:45 +0100
commitff23937c34d8d6a0870bb326a52192535f7b4810 (patch)
tree236bfe7695f0c7d6119dff985f5294b7ae406826 /oox
parent33553540eb0109caac74bd8c401b5fa9f2528943 (diff)
Fix warning C4459 when building with MSVC without -Wv:18
Discovered by https://gerrit.libreoffice.org/c/core/+/163717 Like these: C:/lo/core/oox/source/export/shapes.cxx(2411): warning C4459: declaration of 'XML_line' hides global declaration Change-Id: I74738753254ad1c468025d25bfb0bfe21787180f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163779 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8c003bcdb438..4151c61798f2 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2408,7 +2408,7 @@ void ShapeExport::WriteTableCellProperties(const Reference< XPropertySet>& xCell
mpFS->endElementNS( XML_a, XML_tcPr );
}
-void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& rBorderLine)
+void ShapeExport::WriteBorderLine(const sal_Int32 xml_line_element, const BorderLine2& rBorderLine)
{
// While importing the table cell border line width, it converts EMU->Hmm then divided result by 2.
// To get original value of LineWidth need to multiple by 2.
@@ -2418,7 +2418,7 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r
if ( nBorderWidth > 0 )
{
- mpFS->startElementNS(XML_a, XML_line, XML_w, OString::number(nBorderWidth));
+ mpFS->startElementNS(XML_a, xml_line_element, XML_w, OString::number(nBorderWidth));
if ( rBorderLine.Color == sal_Int32( COL_AUTO ) )
mpFS->singleElementNS(XML_a, XML_noFill);
else
@@ -2446,13 +2446,13 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r
break;
}
mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, sBorderStyle);
- mpFS->endElementNS(XML_a, XML_line);
+ mpFS->endElementNS(XML_a, xml_line_element);
}
else if( nBorderWidth == 0)
{
- mpFS->startElementNS(XML_a, XML_line);
+ mpFS->startElementNS(XML_a, xml_line_element);
mpFS->singleElementNS(XML_a, XML_noFill);
- mpFS->endElementNS( XML_a, XML_line );
+ mpFS->endElementNS(XML_a, xml_line_element);
}
}