mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cppcheck cleaning

Browse Source 
Change-Id: I425ed98a721ded162c2ae08d145aaa9dbf548632
This commit is contained in:
Julien Nabet
2013-04-07 22:18:57 +02:00
parent 5bd53db1ae
commit 3f3980ff24
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
chart2/source/controller/dialogs/ObjectNameProvider.cxx
View File

@@ -509,9 +509,8 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
//replace data point index
sal_Int32 nIndex = -1;
OUString aWildcard( "%POINTNUMBER" );
nIndex = aRet.indexOf( aWildcard );
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::valueOf(nPointIndex+1) );
@@ -569,9 +568,8 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
// replace formula
sal_Int32 nIndex = -1;
OUString aWildcard( "%FORMULA" );
nIndex = aRet.indexOf( aWildcard );
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), xCalculator->getRepresentation());
@@ -620,9 +618,8 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
sal_Unicode aDecimalSep( '.' );
sal_Int32 nIndex = -1;
OUString aWildcard( "%AVERAGE_VALUE" );
nIndex = aRet.indexOf( aWildcard );
sal_Int32 nIndex = aRet.indexOf( aWildcard );
// as the curve is constant, the value at any x-value is ok
if( nIndex != -1 )
{

7
chart2/source/tools/ObjectIdentifier.cxx
View File

@@ -764,8 +764,7 @@ bool ObjectIdentifier::isMultiClickObject( const OUString& rClassifiedIdentifier
//was selected before;
//!!!!! by definition the name of a MultiClickObject starts with "CID/MultiClick:"
bool bRet = false;
bRet = rClassifiedIdentifier.match( m_aMultiClick, m_aProtocol.getLength() );
bool bRet = rClassifiedIdentifier.match( m_aMultiClick, m_aProtocol.getLength() );
return bRet;
}
@@ -1027,11 +1026,9 @@ OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType,
sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticleOrCID )
{
sal_Int32 nRet = -1;
OUString aIndexString = lcl_getIndexStringAfterString( rParticleOrCID, "=" );
sal_Int32 nCharacterIndex=0;
nRet = lcl_StringToIndex( aIndexString.getToken( 0, ',', nCharacterIndex ) );
sal_Int32 nRet = lcl_StringToIndex( aIndexString.getToken( 0, ',', nCharacterIndex ) );
return nRet;
}

3
sc/source/filter/qpro/qpro.cxx
View File

@@ -126,9 +126,8 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
FltError ScFormatFilterPluginImpl::ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc )
{
FltError eRet = eERR_OK;
ScQProReader aReader( rMedium );
eRet = aReader.import( pDoc );
FltError eRet = aReader.import( pDoc );
return eRet;
}

3
xmloff/source/core/xmluconv.cxx
View File

@@ -431,11 +431,10 @@ sal_Bool SvXMLUnitConverter::convertDateTime( double& fDateTime,
if (bSuccess)
{
double fTempDateTime = 0.0;
const Date aTmpNullDate(aTempNullDate.Day, aTempNullDate.Month, aTempNullDate.Year);
const Date aTempDate((sal_uInt16)aDateTime.Day, (sal_uInt16)aDateTime.Month, (sal_uInt16)aDateTime.Year);
const sal_Int32 nTage = aTempDate - aTmpNullDate;
fTempDateTime = nTage;
double fTempDateTime = nTage;
double Hour = aDateTime.Hours;
double Min = aDateTime.Minutes;
double Sec = aDateTime.Seconds;