diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:27:27 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:27:27 +0100 |
commit | f8558f844674c7ba541699708e95f509026c9407 (patch) | |
tree | b402baade1bf3b1bfe1cf89b3cacb275c020e44b /connectivity/source/drivers/component | |
parent | More loplugin:cstylecast: cppcanvas (diff) | |
download | core-f8558f844674c7ba541699708e95f509026c9407.tar.gz core-f8558f844674c7ba541699708e95f509026c9407.zip |
More loplugin:cstylecast: connectivity
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: Idbefb16acae20ab137497e78c9bc5dc5634c07fe
Diffstat (limited to 'connectivity/source/drivers/component')
-rw-r--r-- | connectivity/source/drivers/component/CDatabaseMetaData.cxx | 18 | ||||
-rw-r--r-- | connectivity/source/drivers/component/CResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/component/CTable.cxx | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx b/connectivity/source/drivers/component/CDatabaseMetaData.cxx index dca201015cb0..7834e53c18b7 100644 --- a/connectivity/source/drivers/component/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx @@ -64,13 +64,13 @@ Reference< XResultSet > OComponentDatabaseMetaData::impl_getTypeInfo_throw( ) aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); - aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535)); + aRow.push_back(new ORowSetValueDecorator(sal_Int32(65535))); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // ORowSetValue((sal_Int32)ColumnValue::NULLABLE) aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); - aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::CHAR)); + aRow.push_back(new ORowSetValueDecorator(sal_Int32(ColumnSearch::CHAR))); aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); @@ -79,7 +79,7 @@ Reference< XResultSet > OComponentDatabaseMetaData::impl_getTypeInfo_throw( ) aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator((sal_Int32)10)); + aRow.push_back(new ORowSetValueDecorator(sal_Int32(10))); aRows.push_back(aRow); @@ -93,9 +93,9 @@ Reference< XResultSet > OComponentDatabaseMetaData::impl_getTypeInfo_throw( ) aRow[1] = new ORowSetValueDecorator(OUString("BOOL")); aRow[2] = new ORowSetValueDecorator(DataType::BIT); - aRow[3] = new ORowSetValueDecorator((sal_Int32)20); + aRow[3] = new ORowSetValueDecorator(sal_Int32(20)); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); - aRow[15] = new ORowSetValueDecorator((sal_Int32)15); + aRow[15] = new ORowSetValueDecorator(sal_Int32(15)); aRows.push_back(aRow); aRow[1] = new ORowSetValueDecorator(OUString("DATE")); @@ -142,7 +142,7 @@ Reference< XResultSet > SAL_CALL OComponentDatabaseMetaData::getColumns( ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); - aRow[10] = new ORowSetValueDecorator((sal_Int32)10); + aRow[10] = new ORowSetValueDecorator(sal_Int32(10)); Sequence< OUString> aTabNames(xNames->getElementNames()); const OUString* pTabIter = aTabNames.getConstArray(); @@ -186,13 +186,13 @@ Reference< XResultSet > SAL_CALL OComponentDatabaseMetaData::getColumns( { case DataType::CHAR: case DataType::VARCHAR: - aRow[16] = new ORowSetValueDecorator((sal_Int32)254); + aRow[16] = new ORowSetValueDecorator(sal_Int32(254)); break; case DataType::LONGVARCHAR: - aRow[16] = new ORowSetValueDecorator((sal_Int32)65535); + aRow[16] = new ORowSetValueDecorator(sal_Int32(65535)); break; default: - aRow[16] = new ORowSetValueDecorator((sal_Int32)0); + aRow[16] = new ORowSetValueDecorator(sal_Int32(0)); } aRow[17] = new ORowSetValueDecorator(i); switch(sal_Int32(aRow[11]->getValue())) diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx index d760285810d3..faa80e00a116 100644 --- a/connectivity/source/drivers/component/CResultSet.cxx +++ b/connectivity/source/drivers/component/CResultSet.cxx @@ -80,7 +80,7 @@ Any SAL_CALL OComponentResultSet::getBookmark( ) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); + return makeAny(static_cast<sal_Int32>((m_aRow->get())[0]->getValue())); } sal_Bool SAL_CALL OComponentResultSet::moveToBookmark( const Any& bookmark ) diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx index a6c0e68248d4..04237c7cfb48 100644 --- a/connectivity/source/drivers/component/CTable.cxx +++ b/connectivity/source/drivers/component/CTable.cxx @@ -169,18 +169,18 @@ bool OComponentTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In break; case IResultSetHelper::RELATIVE1: m_nFilePos = (m_nFilePos + nOffset < 0) ? 0 - : (sal_uInt32)(m_nFilePos + nOffset); + : static_cast<sal_uInt32>(m_nFilePos + nOffset); break; case IResultSetHelper::ABSOLUTE1: case IResultSetHelper::BOOKMARK: - m_nFilePos = (sal_uInt32)nOffset; + m_nFilePos = static_cast<sal_uInt32>(nOffset); break; } - if (m_nFilePos > (sal_Int32)nNumberOfRecords) - m_nFilePos = (sal_Int32)nNumberOfRecords + 1; + if (m_nFilePos > static_cast<sal_Int32>(nNumberOfRecords)) + m_nFilePos = static_cast<sal_Int32>(nNumberOfRecords) + 1; - if (m_nFilePos == 0 || m_nFilePos == (sal_Int32)nNumberOfRecords + 1) + if (m_nFilePos == 0 || m_nFilePos == static_cast<sal_Int32>(nNumberOfRecords) + 1) { switch(eCursorPosition) { |