More loplugin:cstylecast on Windows

Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) after
cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for some
more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More
loplugin:cstylecast"

Change-Id: Ib3355159dd08333e1b7a8d091caf2069cdcc7862
Reviewed-on: https://gerrit.libreoffice.org/48317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

8 files changed, 26 insertions, 26 deletions

diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 27e6acea428e..d572a8f99d9e 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -106,7 +106,7 @@ sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex )
 sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex )
 {
     GET_PARAM()
-    return (sal_Int64)m_aValue.getCurrency().int64;
+    return static_cast<sal_Int64>(m_aValue.getCurrency().int64);
 }
 
 
@@ -164,7 +164,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
     {
         pParam->put_Type(ADOS::MapJdbc2ADOType(sqlType,m_pConnection->getEngineType()));
         pParam->put_Direction(adParamOutput);
-        pParam->put_NumericScale((sal_Int8)scale);
+        pParam->put_NumericScale(static_cast<sal_Int8>(scale));
     }
 }
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 12b671ef115d..962b57aa0a4c 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -146,7 +146,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
                     sal_Int32 nVal=0;
                     rValue >>= nVal;
                     if ( !m_IsCurrency )
-                        m_aColumn.put_NumericScale((sal_Int8)nVal);
+                        m_aColumn.put_NumericScale(static_cast<sal_Int8>(nVal));
                 }
                 break;
             case PROPERTY_ID_ISNULLABLE:
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 7b98f77b147f..ad02964b85e3 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -435,10 +435,10 @@ void OConnection::buildTypeInfo()
                 sal_Int32 nPos = 1;
                 OExtendedTypeInfo* aInfo            = new OExtendedTypeInfo;
                 aInfo->aSimpleType.aTypeName        = ADOS::getField(pRecordset,nPos++).get_Value().getString();
-                aInfo->eType                        = (DataTypeEnum)ADOS::getField(pRecordset,nPos++).get_Value().getInt32();
+                aInfo->eType                        = static_cast<DataTypeEnum>(ADOS::getField(pRecordset,nPos++).get_Value().getInt32());
                 if ( aInfo->eType == adWChar && aInfo->aSimpleType.aTypeName == s_sVarChar )
                     aInfo->eType = adVarWChar;
-                aInfo->aSimpleType.nType            = (sal_Int16)ADOS::MapADOType2Jdbc(aInfo->eType);
+                aInfo->aSimpleType.nType            = static_cast<sal_Int16>(ADOS::MapADOType2Jdbc(aInfo->eType));
                 aInfo->aSimpleType.nPrecision       = ADOS::getField(pRecordset,nPos++).get_Value().getInt32();
                 nPos++; // aLiteralPrefix
                 nPos++; // aLiteralSuffix
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index cadf6fe2c793..8f546fceca92 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -378,7 +378,7 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum)
         if(_eNum & Privilege::DROP)
             nRight |= adRightDrop;
 
-    return (RightsEnum)nRight;
+    return static_cast<RightsEnum>(nRight);
 }
 
 void WpADOIndex::Create()
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 19f4d9b45749..d787532336a1 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -211,9 +211,9 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex )
     if(m_aValue.isNull())
         return 0;
     if ( !m_aValueRange.empty() && (m_aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end())
-        return (sal_Int8)(*m_aValueRangeIter).second[m_aValue.getInt32()];
+        return static_cast<sal_Int8>((*m_aValueRangeIter).second[m_aValue.getInt32()]);
     else if(m_aStrValueRange.size() && (m_aStrValueRangeIter = m_aStrValueRange.find(columnIndex)) != m_aStrValueRange.end())
-        return (sal_Int8)(*m_aStrValueRangeIter).second[m_aValue.getString()];
+        return static_cast<sal_Int8>((*m_aStrValueRangeIter).second[m_aValue.getString()]);
 
     return m_aValue.getInt8();
 }
@@ -342,9 +342,9 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
         return 0;
 
     if(m_aValueRange.size() && (m_aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end())
-        return (sal_Int16)(*m_aValueRangeIter).second[m_aValue.getInt32()];
+        return static_cast<sal_Int16>((*m_aValueRangeIter).second[m_aValue.getInt32()]);
     else if(m_aStrValueRange.size() && (m_aStrValueRangeIter = m_aStrValueRange.find(columnIndex)) != m_aStrValueRange.end())
-        return (sal_Int16)(*m_aStrValueRangeIter).second[m_aValue.getString()];
+        return static_cast<sal_Int16>((*m_aStrValueRangeIter).second[m_aValue.getString()]);
 
     return m_aValue.getInt16();
 }
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 2d6c1ece45e8..8c1b6993dabe 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -820,13 +820,13 @@ Any SAL_CALL OResultSet::getBookmark(  )
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
-    if(m_nRowPos < (sal_Int32)m_aBookmarks.size()) // this bookmark was already fetched
+    if(m_nRowPos < static_cast<sal_Int32>(m_aBookmarks.size())) // this bookmark was already fetched
         return makeAny(sal_Int32(m_nRowPos-1));
 
     OLEVariant aVar;
     m_pRecordSet->get_Bookmark(&aVar);
     m_aBookmarks.push_back(aVar);
-    return makeAny((sal_Int32)(m_aBookmarks.size()-1));
+    return makeAny(static_cast<sal_Int32>(m_aBookmarks.size()-1));
 
 }
 
@@ -838,8 +838,8 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark )
 
     sal_Int32 nPos = 0;
     bookmark >>= nPos;
-    OSL_ENSURE(nPos >= 0 && nPos < (sal_Int32)m_aBookmarks.size(),"Invalid Index for vector");
-    if(nPos < 0 || nPos >= (sal_Int32)m_aBookmarks.size())
+    OSL_ENSURE(nPos >= 0 && nPos < static_cast<sal_Int32>(m_aBookmarks.size()),"Invalid Index for vector");
+    if(nPos < 0 || nPos >= static_cast<sal_Int32>(m_aBookmarks.size()))
         ::dbtools::throwFunctionSequenceException(*this);
 
     return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos]));
@@ -854,8 +854,8 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I
     sal_Int32 nPos = 0;
     bookmark >>= nPos;
     nPos += rows;
-    OSL_ENSURE(nPos >= 0 && nPos < (sal_Int32)m_aBookmarks.size(),"Invalid Index for vector");
-    if(nPos < 0 || nPos >= (sal_Int32)m_aBookmarks.size())
+    OSL_ENSURE(nPos >= 0 && nPos < static_cast<sal_Int32>(m_aBookmarks.size()),"Invalid Index for vector");
+    if(nPos < 0 || nPos >= static_cast<sal_Int32>(m_aBookmarks.size()))
         ::dbtools::throwFunctionSequenceException(*this);
     return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos]));
 }
@@ -872,11 +872,11 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any
     if(nPos1 == nPos2)  // they should be equal
         return css::sdbcx::CompareBookmark::EQUAL;
 
-    OSL_ENSURE((nPos1 >= 0 && nPos1 < (sal_Int32)m_aBookmarks.size()) || (nPos1 >= 0 && nPos2 < (sal_Int32)m_aBookmarks.size()),"Invalid Index for vector");
+    OSL_ENSURE((nPos1 >= 0 && nPos1 < static_cast<sal_Int32>(m_aBookmarks.size())) || (nPos1 >= 0 && nPos2 < static_cast<sal_Int32>(m_aBookmarks.size())),"Invalid Index for vector");
 
     CompareEnum eNum;
     m_pRecordSet->CompareBookmarks(m_aBookmarks[nPos1],m_aBookmarks[nPos2],&eNum);
-    return ((sal_Int32)eNum) - 1;
+    return static_cast<sal_Int32>(eNum) - 1;
 }
 
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  )
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 8ffaad54f340..5bdf386468c4 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -211,7 +211,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType)
 
     sal_Int32 prec = -1;
     OTypeInfo aInfo;
-    aInfo.nType = (sal_Int16)sqlType;
+    aInfo.nType = static_cast<sal_Int16>(sqlType);
     if (!m_aTypeInfo.empty())
     {
         std::vector<OTypeInfo>::const_iterator aIter = std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo);
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index bc8c9236a623..cd06b31fc7ed 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -116,7 +116,7 @@ OLEVariant::OLEVariant(bool x)              {   VariantInit(this);  vt = VT_BOOL
 OLEVariant::OLEVariant(sal_Int8 n)              {   VariantInit(this);  vt = VT_I1;     bVal        = n;}
 OLEVariant::OLEVariant(sal_Int16 n)             {   VariantInit(this);  vt = VT_I2;     intVal      = n;}
 OLEVariant::OLEVariant(sal_Int32 n)             {   VariantInit(this);  vt = VT_I4;     lVal        = n;}
-OLEVariant::OLEVariant(sal_Int64 x)             {   VariantInit(this);  vt = VT_I4;     lVal        = (LONG)x;}
+OLEVariant::OLEVariant(sal_Int64 x)             {   VariantInit(this);  vt = VT_I4;     lVal        = static_cast<LONG>(x);}
 
 OLEVariant::OLEVariant(const OUString& us)
 {
@@ -312,7 +312,7 @@ void OLEVariant::setArray(SAFEARRAY* pSafeArray, VARTYPE vtType)
 {
     HRESULT eRet = VariantClear(this);
     OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!");
-    vt = (VARTYPE)(VT_ARRAY|vtType);
+    vt = static_cast<VARTYPE>(VT_ARRAY|vtType);
     parray = pSafeArray;
 }
 
@@ -354,7 +354,7 @@ VARIANT_BOOL OLEVariant::VariantBool(bool bEinBoolean)
 
 void OLEVariant::CHS()
 {
-    cyVal.Lo  ^= (sal_uInt32)-1;
+    cyVal.Lo  ^= sal_uInt32(-1);
     cyVal.Hi ^= -1;
     cyVal.Lo++;
     if( !cyVal.Lo )
@@ -365,12 +365,12 @@ void OLEVariant::set(double n)
 {
     if( n >= 0 )
     {
-        cyVal.Hi = (sal_Int32)(n / 4294967296.0);
-        cyVal.Lo  = (sal_uInt32)(n - ((double)cyVal.Hi * 4294967296.0));
+        cyVal.Hi = static_cast<sal_Int32>(n / 4294967296.0);
+        cyVal.Lo  = static_cast<sal_uInt32>(n - (static_cast<double>(cyVal.Hi) * 4294967296.0));
     }
     else {
-        cyVal.Hi = (sal_Int32)(-n / 4294967296.0);
-        cyVal.Lo  = (sal_uInt32)(-n - ((double)cyVal.Hi * 4294967296.0));
+        cyVal.Hi = static_cast<sal_Int32>(-n / 4294967296.0);
+        cyVal.Lo  = static_cast<sal_uInt32>(-n - (static_cast<double>(cyVal.Hi) * 4294967296.0));
         CHS();
     }
 }