loplugin:reducevarscope in xmloff

Change-Id: Ib67311f84a6a7a490afb392e642d74693fde3113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103747
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 6 insertions, 9 deletions

diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 1b00ac9227cf..6ce23fb54c68 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -403,7 +403,6 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
         OUString sAttrName = getPropertySetMapper()->GetEntryXMLName( rProperty.mnIndex );
         sal_uInt16 nNameSpace = getPropertySetMapper()->GetEntryNameSpace( rProperty.mnIndex );
         OUStringBuffer sValueBuffer;
-        OUString sValue;
 
         sal_Int32 nValue = 0;
         bool bValue = false;
@@ -519,7 +518,7 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
 
         if( !sValueBuffer.isEmpty())
         {
-            sValue = sValueBuffer.makeStringAndClear();
+            OUString sValue = sValueBuffer.makeStringAndClear();
             sAttrName = rNamespaceMap.GetQNameByKey( nNameSpace, sAttrName );
             rAttrList.AddAttribute( sAttrName, sValue );
         }
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 4911d5180d03..07a1019ccc71 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2659,7 +2659,6 @@ void SchXMLExportHelper_Impl::exportSeries(
                         xSource->getDataSequences());
                     sal_Int32 nMainSequenceIndex = -1;
                     sal_Int32 nSeriesLength = 0;
-                    sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y;
                     bool bHasMeanValueLine = false;
                     Reference< beans::XPropertySet > xPropSet;
                     tLabelValuesDataPair aSeriesLabelValuesPair;
@@ -2671,10 +2670,10 @@ void SchXMLExportHelper_Impl::exportSeries(
                         sal_Int32 nSeqIdx=0;
                         for( ; nSeqIdx<aSeqCnt.getLength(); ++nSeqIdx )
                         {
-                            OUString aRole;
                             Reference< chart2::data::XDataSequence > xTempValueSeq( aSeqCnt[nSeqIdx]->getValues() );
                             if( nMainSequenceIndex==-1 )
                             {
+                                OUString aRole;
                                 Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY );
                                 if( xSeqProp.is())
                                     xSeqProp->getPropertyValue("Role") >>= aRole;
@@ -2694,6 +2693,7 @@ void SchXMLExportHelper_Impl::exportSeries(
                         // have found the main sequence, then xValuesSeq and
                         // xLabelSeq contain those.  Otherwise both are empty
                         {
+                            sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y;
                             // get property states for autostyles
                             try
                             {
@@ -3351,7 +3351,6 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
     const sal_Int32 * pPoints = aDataPointSeq.getConstArray();
     sal_Int32 nElement;
-    sal_Int32 nRepeat;
     Reference< chart2::XColorScheme > xColorScheme;
     if( xDiagram.is())
         xColorScheme.set( xDiagram->getDefaultColorScheme());
@@ -3539,7 +3538,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
             nLastIndex = nCurrIndex;
         }
         // final empty elements
-        nRepeat = nSeriesLength - nLastIndex - 1;
+        sal_Int32 nRepeat = nSeriesLength - nLastIndex - 1;
         if( nRepeat > 0 )
         {
             SchXMLDataPointStruct aPoint;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 8782ef7818ff..6507fc757ea0 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -724,7 +724,6 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        bool bHideLegend = false;
         sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_CHART )
@@ -753,7 +752,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
             }
             else if (IsXMLToken(aLocalName, XML_HIDE_LEGEND))
             {
-                bHideLegend = xAttrList->getValueByIndex(i).toBoolean();
+                bool bHideLegend = xAttrList->getValueByIndex(i).toBoolean();
                 if (bHideLegend)
                 {
                     uno::Sequence<sal_Int32> deletedLegendEntriesSeq;
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 12ea12f51aaa..65f39a9b6256 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -81,7 +81,6 @@ bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue,
 bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue,
                                                   const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
 {
-    OUStringBuffer aBuffer;
     chart::ChartErrorIndicatorType eType;
 
     rValue >>= eType;
@@ -92,6 +91,7 @@ bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue,
 
     if( bValue )
     {
+        OUStringBuffer aBuffer;
         ::sax::Converter::convertBool( aBuffer, bValue );
         rStrExpValue = aBuffer.makeStringAndClear();
     }