summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-23 09:47:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-23 09:48:10 +0000
commited76d1d3504c92bff6bb3e6417e4440572fcd959 (patch)
tree6d06b4a20bef5acf0c1a4118685f09acdd27fbb7 /basic
parenta61c4ae9cef23a53ea88f957e090bd5ee9b28ca6 (diff)
loplugins:redundantcast teach it about c-style typedef casts
Change-Id: I1ac11a2481c0f4d8be1e1fd7c7637ac0ece3d65c Reviewed-on: https://gerrit.libreoffice.org/35558 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sb.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx14
-rw-r--r--basic/source/runtime/iosys.cxx2
-rw-r--r--basic/source/runtime/methods.cxx6
-rw-r--r--basic/source/sbx/sbxbool.cxx4
-rw-r--r--basic/source/sbx/sbxint.cxx2
6 files changed, 15 insertions, 15 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index bc89862e9f21..ac87ff6b753e 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -560,7 +560,7 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
sal_Int32 ub = 0;
for ( sal_Int32 j = 1 ; j <= pSource->GetDims(); ++j )
{
- pSource->GetDim32( (sal_Int32)j, lb, ub );
+ pSource->GetDim32( j, lb, ub );
pDest->AddDim32( lb, ub );
}
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9d4d00d60c0f..971d7b475d0d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1225,7 +1225,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
else if( rType == cppu::UnoType<oleautomation::Currency>::get())
{
// assumes per previous code that ole Currency is Int64
- aRetVal <<= (sal_Int64)( pVar->GetInt64() );
+ aRetVal <<= pVar->GetInt64();
break;
}
else if( rType == cppu::UnoType<oleautomation::Date>::get())
@@ -1442,12 +1442,12 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
aRetVal <<= nByteVal;
break;
}
- case TypeClass_SHORT: aRetVal <<= (sal_Int16)( pVar->GetInteger() ); break;
- case TypeClass_LONG: aRetVal <<= (sal_Int32)( pVar->GetLong() ); break;
- case TypeClass_HYPER: aRetVal <<= (sal_Int64)( pVar->GetInt64() ); break;
- case TypeClass_UNSIGNED_SHORT: aRetVal <<= (sal_uInt16)( pVar->GetUShort() ); break;
- case TypeClass_UNSIGNED_LONG: aRetVal <<= (sal_uInt32)( pVar->GetULong() ); break;
- case TypeClass_UNSIGNED_HYPER: aRetVal <<= (sal_uInt64)( pVar->GetUInt64() ); break;
+ case TypeClass_SHORT: aRetVal <<= pVar->GetInteger(); break;
+ case TypeClass_LONG: aRetVal <<= pVar->GetLong(); break;
+ case TypeClass_HYPER: aRetVal <<= pVar->GetInt64(); break;
+ case TypeClass_UNSIGNED_SHORT: aRetVal <<= pVar->GetUShort(); break;
+ case TypeClass_UNSIGNED_LONG: aRetVal <<= pVar->GetULong(); break;
+ case TypeClass_UNSIGNED_HYPER: aRetVal <<= pVar->GetUInt64(); break;
default: break;
}
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 2f816884cfcf..b019f27ad5a4 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -281,7 +281,7 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos )
}
else
{
- rc = maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos );
+ rc = maFile.setPos( osl_Pos_Absolut, nPos );
}
OSL_VERIFY(rc == ::osl::FileBase::E_None);
sal_uInt64 nRealPos(0);
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b5746d01427d..3016a4eae7f5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3494,7 +3494,7 @@ RTLFUNC(Format)
(void)pBasic;
(void)bWrite;
- sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
+ sal_uInt16 nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -4518,7 +4518,7 @@ RTLFUNC(MsgBox)
};
- sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
+ sal_uInt16 nArgCount = rPar.Count();
if( nArgCount < 2 || nArgCount > 6 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -4677,7 +4677,7 @@ RTLFUNC(DumpAllObjects)
(void)pBasic;
(void)bWrite;
- sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
+ sal_uInt16 nArgCount = rPar.Count();
if( nArgCount < 2 || nArgCount > 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 8e7e9ccad9fe..2e789bd3d100 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -168,7 +168,7 @@ void ImpPutBool( SbxValues* p, sal_Int16 n )
p->uInt64 = (sal_uInt64) n; break;
case SbxDECIMAL:
case SbxBYREF | SbxDECIMAL:
- ImpCreateDecimal( p )->setInt( (sal_Int16)n );
+ ImpCreateDecimal( p )->setInt( n );
break;
case SbxBYREF | SbxSTRING:
@@ -195,7 +195,7 @@ void ImpPutBool( SbxValues* p, sal_Int16 n )
*p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
- *p->pInteger = (sal_Int16) n; break;
+ *p->pInteger = n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
*p->pUShort = (sal_uInt16) n; break;
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 41886a68e648..d92a0aadb2c0 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -632,7 +632,7 @@ start:
{
SbxBase::SetError( ERRCODE_SBX_OVERFLOW ); n = 0;
}
- *p->puInt64 = (sal_Int64) n; break;
+ *p->puInt64 = n; break;
default:
SbxBase::SetError( ERRCODE_SBX_CONVERSION );