summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/sbx/sbxarray.cxx10
-rw-r--r--chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx18
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx18
3 files changed, 22 insertions, 24 deletions
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 96f1bbcf01e7..9824098a6062 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -680,6 +680,8 @@ bool SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
{
sal_Int32 rlb32, rub32;
bool bRet = GetDim32( n, rlb32, rub32 );
+ rub = (short)rub32;
+ rlb = (short)rlb32;
if( bRet )
{
if( rlb32 < -SBX_MAXINDEX || rub32 > SBX_MAXINDEX )
@@ -687,8 +689,6 @@ bool SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
SetError( SbxERR_BOUNDS );
return false;
}
- rub = (short)rub32;
- rlb = (short)rlb32;
}
return bRet;
}
@@ -753,9 +753,7 @@ void SbxDimArray::Put32( SbxVariable* p, const sal_Int32* pIdx )
SbxArray::Put32( p, Offset32( pIdx ) );
}
-
// Element-Number with the help of Parameter-Array
-
sal_uInt32 SbxDimArray::Offset32( SbxArray* pPar )
{
#ifndef DISABLE_SCRIPTING
@@ -793,7 +791,7 @@ bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
rStrm.ReadInt16( nDimension );
for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
{
- sal_Int16 lb, ub;
+ sal_Int16 lb(0), ub(0);
rStrm.ReadInt16( lb ).ReadInt16( ub );
AddDim( lb, ub );
}
@@ -807,7 +805,7 @@ bool SbxDimArray::StoreData( SvStream& rStrm ) const
{
short lb, ub;
GetDim( i, lb, ub );
- rStrm.WriteInt16( (sal_Int16) lb ).WriteInt16( (sal_Int16) ub );
+ rStrm.WriteInt16( lb ).WriteInt16( ub );
}
return SbxArray::StoreData( rStrm );
}
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index e77860442c95..43d0c06d2187 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -198,7 +198,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
if( ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
@@ -216,7 +216,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( GetPropertySet(), fPos, fNeg );
if( ! ::rtl::math::approxEqual( fPos, fValue ))
@@ -234,7 +234,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
if( ! ::rtl::math::approxEqual( fNeg, fValue ))
@@ -256,7 +256,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
bool bNewIndPos = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_UP );
bool bNewIndNeg = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_DOWN );
- bool bShowPos, bShowNeg;
+ bool bShowPos(false), bShowNeg(false);
lcl_getErrorIndicatorValues( xErrorBarProp, bShowPos, bShowNeg );
if( ( bShowPos != bNewIndPos ||
@@ -369,7 +369,7 @@ void ErrorBarItemConverter::FillSpecialItem(
case SCHATTR_STAT_PERCENT:
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( GetPropertySet(), fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( ( fPos + fNeg ) / 2.0, nWhichId ));
}
@@ -377,7 +377,7 @@ void ErrorBarItemConverter::FillSpecialItem(
case SCHATTR_STAT_BIGERROR:
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( GetPropertySet(), fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( ( fPos + fNeg ) / 2.0, nWhichId ));
}
@@ -385,7 +385,7 @@ void ErrorBarItemConverter::FillSpecialItem(
case SCHATTR_STAT_CONSTPLUS:
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( GetPropertySet(), fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( fPos, nWhichId ));
}
@@ -393,7 +393,7 @@ void ErrorBarItemConverter::FillSpecialItem(
case SCHATTR_STAT_CONSTMINUS:
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( GetPropertySet(), fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( fNeg, nWhichId ));
}
@@ -402,7 +402,7 @@ void ErrorBarItemConverter::FillSpecialItem(
case SCHATTR_STAT_INDICATE:
{
SvxChartIndicate eIndicate = CHINDICATE_BOTH;
- bool bShowPos, bShowNeg;
+ bool bShowPos(false), bShowNeg(false);
lcl_getErrorIndicatorValues( GetPropertySet(), bShowPos, bShowNeg );
if( bShowPos )
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 17bb183ccc66..e5a9f3519367 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -392,7 +392,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
if( bOldHasErrorBar &&
@@ -418,7 +418,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
if( bOldHasErrorBar &&
@@ -441,7 +441,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
double fValue =
static_cast< const SvxDoubleItem & >(
rItemSet.Get( nWhichId )).GetValue();
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
if( bOldHasErrorBar &&
@@ -573,7 +573,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
bool bNewIndPos = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_UP );
bool bNewIndNeg = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_DOWN );
- bool bShowPos, bShowNeg;
+ bool bShowPos(false), bShowNeg(false);
lcl_getErrorIndicatorValues( xErrorBarProp, bShowPos, bShowNeg );
if( bOldHasErrorBar &&
@@ -704,7 +704,7 @@ void StatisticsItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is())
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( ( fPos + fNeg ) / 2.0, nWhichId ));
}
@@ -718,7 +718,7 @@ void StatisticsItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is())
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( ( fPos + fNeg ) / 2.0, nWhichId ));
}
@@ -732,7 +732,7 @@ void StatisticsItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is())
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( fPos, nWhichId ));
}
@@ -746,7 +746,7 @@ void StatisticsItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is())
{
- double fPos, fNeg;
+ double fPos(0.0), fNeg(0.0);
lcl_getErrorValues( xErrorBarProp, fPos, fNeg );
rOutItemSet.Put( SvxDoubleItem( fNeg, nWhichId ));
}
@@ -836,7 +836,7 @@ void StatisticsItemConverter::FillSpecialItem(
SvxChartIndicate eIndicate = CHINDICATE_BOTH;
if( xErrorBarProp.is())
{
- bool bShowPos, bShowNeg;
+ bool bShowPos(false), bShowNeg(false);
lcl_getErrorIndicatorValues( xErrorBarProp, bShowPos, bShowNeg );
if( bShowPos )
generated by cgit (git 2.34.1) at 2024-07-16 04:45:51 +0000