diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-30 04:57:16 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-03-30 17:37:54 +0000 |
commit | 083092e808ed94325f103a721cc11882c6878b06 (patch) | |
tree | a2c0f1df692585d0fbe78f996e2e0ff89489f097 /connectivity | |
parent | Prefer prefix ++/-- operators for non-primitive types (diff) | |
download | core-083092e808ed94325f103a721cc11882c6878b06.tar.gz core-083092e808ed94325f103a721cc11882c6878b06.zip |
OSL_FAIL -> SAL_WARN
Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7
Reviewed-on: https://gerrit.libreoffice.org/3121
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/commontools/parameters.cxx | 29 | ||||
-rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 20 |
2 files changed, 23 insertions, 26 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 972e6831eee6..5f2a7079f193 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -214,7 +214,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::collectInnerParameters: caught an exception!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::collectInnerParameters: caught an exception!" ); } } } @@ -404,7 +404,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::analyzeFieldLinks: caught an exception!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::analyzeFieldLinks: caught an exception!" ); } } @@ -560,7 +560,7 @@ namespace dbtools // does the name denote a valid column in the parent? if ( !_rxParentColumns->hasByName( *pMasterFields ) ) { - OSL_FAIL( "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" ); continue; } @@ -570,7 +570,7 @@ namespace dbtools || ( aParamInfo->second.aInnerIndexes.empty() ) ) { - OSL_FAIL( "ParameterManager::fillLinkedParameters: nothing known about this detail field!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::fillLinkedParameters: nothing known about this detail field!" ); continue; } @@ -609,9 +609,8 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( ( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " ) - += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) ) - += ::rtl::OString( " could not be filled!" ) ).getStr() ); + SAL_WARN( "connectivity.commontools", "ParameterManager::fillLinkedParameters: master-detail parameter number " << + sal_Int32( *aPosition + 1 ) << " could not be filled!" ); } } } @@ -650,7 +649,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::completeParameters: caught an exception while calling the handler!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while calling the handler!" ); } if ( !pParams->wasSelected() ) @@ -680,7 +679,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::completeParameters: caught an exception while propagating the values!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while propagating the values!" ); } return true; } @@ -751,7 +750,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::getConnection: could not retrieve the connection of the !" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::getConnection: could not retrieve the connection of the !" ); } return _rxConnection.is(); } @@ -774,7 +773,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::cacheConnectionInfo: caught an exception!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::cacheConnectionInfo: caught an exception!" ); } } @@ -830,7 +829,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::getParentColumns: caught an exception!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::getParentColumns: caught an exception!" ); } return _out_rxParentColumns.is(); } @@ -885,7 +884,7 @@ namespace dbtools { // if this name is unknown in the parent columns, then we don't have a source // for copying the value to the detail columns - OSL_FAIL( "ParameterManager::resetParameterValues: this should have been stripped long before!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: this should have been stripped long before!" ); continue; } @@ -897,7 +896,7 @@ namespace dbtools || ( aParamInfo->second.aInnerIndexes.empty() ) ) { - OSL_FAIL( "ParameterManager::resetParameterValues: nothing known about this detail field!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: nothing known about this detail field!" ); continue; } @@ -929,7 +928,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "ParameterManager::resetParameterValues: caught an exception!" ); + SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: caught an exception!" ); } } diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 3ab3f752719d..59de7dbeb58c 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -366,24 +366,23 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath)) { if (!::cppu::extractInterface(xNode, xDirectAccess->getByName(_rPath))) - OSL_FAIL("OConfigurationNode::openNode: could not open the node!"); + SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: could not open the node!"); } else if (xHierarchyAccess.is()) { if (!::cppu::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath))) - OSL_FAIL("OConfigurationNode::openNode: could not open the node!"); + SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: could not open the node!"); } } catch(const NoSuchElementException&) { - OSL_FAIL((::rtl::OString("::openNode: there is no element named ") - += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")).getStr()); + SAL_WARN("connectivity.cpool", "::openNode: there is no element named " << + _rPath << "!"); } catch(Exception&) { - OSL_FAIL("OConfigurationNode::openNode: caught an exception while retrieving the node!"); + SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught an exception while retrieving the node!"); } return xNode; } @@ -406,10 +405,9 @@ Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference< } catch(NoSuchElementException& e) { - OSL_UNUSED( e ); // make compiler happy - OSL_FAIL((::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ") - += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")).getStr()); + SAL_WARN("connectivity.cpool", "::getNodeValue: caught a " << + "NoSuchElementException while trying to open " << + e.Message << "!" ); } return aReturn; } @@ -446,7 +444,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (Run } catch(const Exception&) { - OSL_FAIL("Exception caught"); + SAL_WARN("connectivity.cpool", "Exception caught"); } } } |