summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]connectivity/workben/testmoz/mozthread.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLExport.cxx9
2 files changed, 5 insertions, 6 deletions
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 352f12b6a060..f24be56e4b6e 100644..100755
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -322,10 +322,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
int autoTest(Reference<XResultSet> &xRes)
{
+ sal_Int32 nRows = 0;
printColumns(xRes);
if(xRes.is())
{
- sal_Int32 nRows = 0;
while( xRes.is() && xRes->next())
{
nRows++;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index ee0ad507c4db..cabb0f199a9e 100644..100755
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2748,6 +2748,7 @@ void SchXMLExportHelper_Impl::exportSeries(
SvXMLElementExport* pSeries = NULL;
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeqCnt(
xSource->getDataSequences());
+ sal_Int32 nMainSequenceIndex = -1;
sal_Int32 nSeriesLength = 0;
sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y;
sal_Bool bHasMeanValueLine = false;
@@ -2760,7 +2761,6 @@ void SchXMLExportHelper_Impl::exportSeries(
Reference< chart2::data::XDataSequence > xValuesSeq;
Reference< chart2::data::XDataSequence > xLabelSeq;
sal_Int32 nSeqIdx=0;
- sal_Int32 nMainSequenceIndex = -1;
for( ; nSeqIdx<aSeqCnt.getLength(); ++nSeqIdx )
{
OUString aRole;
@@ -3359,6 +3359,9 @@ void SchXMLExportHelper_Impl::exportDataPoints(
::std::list< SchXMLDataPointStruct > aDataPointList;
+ sal_Int32 nLastIndex = -1;
+ sal_Int32 nCurrIndex = 0;
+
// collect elements
if( bVaryColorsByPoint && xColorScheme.is() )
{
@@ -3427,10 +3430,6 @@ void SchXMLExportHelper_Impl::exportDataPoints(
}
else
{
-
- sal_Int32 nLastIndex = -1;
- sal_Int32 nCurrIndex = 0;
-
for( nElement = 0; nElement < nSize; ++nElement )
{
aPropertyStates.clear();