diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 10:16:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 10:28:47 +0100 |
| commit | 819149fb1f71fc13ffdc288736ce65bb3c6c75d8 (patch) | |
| tree | 55e663505dce8b7a36ec5aab1f8d6cc956522cf5 /connectivity | |
| parent | 00055d49f35bbabd46d00fefd395b46872ed45aa (diff) | |
loplugin:collapseif in accessibility..cui
Change-Id: I1437b493f3289b4ac97d061bd71973580571e792
Reviewed-on: https://gerrit.libreoffice.org/62933
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/FValue.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 5 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FDatabaseMetaData.cxx | 33 |
3 files changed, 19 insertions, 26 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index dc302ceb5921..b12170775213 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -993,12 +993,9 @@ OUString ORowSetValue::getString( ) const { Any aValue( getAny() ); Reference< XClob > xClob; - if ( aValue >>= xClob ) + if ( (aValue >>= xClob) && xClob.is() ) { - if ( xClob.is() ) - { - aRet = xClob->getSubString(1,static_cast<sal_Int32>(xClob->length()) ); - } + aRet = xClob->getSubString(1,static_cast<sal_Int32>(xClob->length()) ); } } break; diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 9b030637723a..c5df337a7468 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -74,9 +74,8 @@ static bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const { bool bVisible; Any aVisAny = xProp->getPropertyValue("IsVisible"); - if ( aVisAny >>= bVisible ) - if (!bVisible) - return true; // hidden + if ( (aVisAny >>= bVisible) && !bVisible) + return true; // hidden } // use the same data area as in OCalcTable to test for empty table diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 51326c343717..14b37131b679 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -405,28 +405,25 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( if(xTunnel.is()) { OFileTable* pTable = reinterpret_cast< OFileTable* >( xTunnel->getSomething(OFileTable::getUnoTunnelImplementationId()) ); - if(pTable) + if(pTable && !pTable->isReadOnly()) { - if(!pTable->isReadOnly()) + aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); + aRows.push_back(aRow); + if(!m_pConnection->showDeleted()) { - aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); - aRows.push_back(aRow); - if(!m_pConnection->showDeleted()) - { - aRow[6] = ODatabaseMetaDataResultSet::getDeleteValue(); - aRows.push_back(aRow); - } - aRow[6] = ODatabaseMetaDataResultSet::getUpdateValue(); - aRows.push_back(aRow); - aRow[6] = ODatabaseMetaDataResultSet::getCreateValue(); - aRows.push_back(aRow); - aRow[6] = ODatabaseMetaDataResultSet::getReadValue(); - aRows.push_back(aRow); - aRow[6] = ODatabaseMetaDataResultSet::getAlterValue(); - aRows.push_back(aRow); - aRow[6] = ODatabaseMetaDataResultSet::getDropValue(); + aRow[6] = ODatabaseMetaDataResultSet::getDeleteValue(); aRows.push_back(aRow); } + aRow[6] = ODatabaseMetaDataResultSet::getUpdateValue(); + aRows.push_back(aRow); + aRow[6] = ODatabaseMetaDataResultSet::getCreateValue(); + aRows.push_back(aRow); + aRow[6] = ODatabaseMetaDataResultSet::getReadValue(); + aRows.push_back(aRow); + aRow[6] = ODatabaseMetaDataResultSet::getAlterValue(); + aRows.push_back(aRow); + aRow[6] = ODatabaseMetaDataResultSet::getDropValue(); + aRows.push_back(aRow); } } } |