diff options
| author | Michaël Lefèvre <lefevre00@yahoo.fr> | 2014-04-04 00:13:31 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-04 07:23:43 -0500 |
| commit | 453ee351f32494b1f30b477069cc7a1834352377 (patch) | |
| tree | 2e5fc2a57d2a2f3eb839e929cae42d7d61451e05 /connectivity | |
| parent | 4da62012fea1796c1fed5bb2d87a353d1be79ea5 (diff) | |
fdo#43157 : clean up more OSL_POSTCOND
Change-Id: Iaca31b4e12c258b762b3d88fbad0fb08b4f1fc16
Reviewed-on: https://gerrit.libreoffice.org/8832
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/parameters.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HConnection.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/kab/KDriver.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/macab/MacabDriver.cxx | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 77599d86afa3..09f5dca4c4d2 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -322,7 +322,8 @@ namespace dbtools if ( bValidLink ) aStrippedMasterFields.push_back( *pMasterFields ); } - OSL_POSTCOND( aStrippedMasterFields.size() == aStrippedDetailFields.size(), + SAL_WARN_IF( aStrippedMasterFields.size() != aStrippedDetailFields.size(), + "connectivity.commontools", "ParameterManager::classifyLinks: inconsistency in new link pairs!" ); if ( bNeedExchangeLinks ) @@ -502,7 +503,9 @@ namespace dbtools return; } // if ( !initializeComposerByComponent( m_xComponent ) ) } - OSL_POSTCOND( m_xInnerParamColumns.is(), "ParameterManager::updateParameterInfo: initializeComposerByComponent did nonsense (1)!" ); + SAL_WARN_IF( !m_xInnerParamColumns.is(), + "connectivity.commontools", + "ParameterManager::updateParameterInfo: initializeComposerByComponent did nonsense (1)!" ); // collect all parameters which are defined by the "inner parameters" collectInnerParameters( false ); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 407931cfeabe..aa2bc4af0643 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -265,7 +265,7 @@ namespace connectivity { namespace hsqldb throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() ); } - OSL_POSTCOND( xTables.is(), "OHsqlConnection::impl_getTableContainer_throw: post condition not met!" ); + SAL_WARN_IF( !xTables.is(), "connectivity.hsqldb", "OHsqlConnection::impl_getTableContainer_throw: post condition not met!" ); return xTables; } diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index a4ef7cae3363..b023eaa1136f 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -379,7 +379,7 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const // create a new connection with the given properties and append it to our vector KabConnection* pConnection = m_aImplModule.createConnection( this ); - OSL_POSTCOND( pConnection, "KabDriver::connect: no connection has been created by the factory!" ); + SAL_WARN_IF( !pConnection, "connectivity.kab", "KabDriver::connect: no connection has been created by the factory!" ); // by definition, the factory function returned an object which was acquired once Reference< XConnection > xConnection = pConnection; diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 08f4b51ff08e..2567a57fde19 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -247,7 +247,7 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, con // create a new connection with the given properties and append it to our vector MacabConnection* pConnection = m_aImplModule.createConnection( this ); - OSL_POSTCOND( pConnection, "MacabDriver::connect: no connection has been created by the factory!" ); + SAL_WARN_IF( !pConnection, "connectivity.macab", "MacabDriver::connect: no connection has been created by the factory!" ); // by definition, the factory function returned an object which was acquired once Reference< XConnection > xConnection = pConnection; |