summaryrefslogtreecommitdiff
path: root/connectivity/source/commontools
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-30 04:57:16 +0100
committerDavid Tardon <dtardon@redhat.com>2013-03-30 17:37:54 +0000
commit083092e808ed94325f103a721cc11882c6878b06 (patch)
treea2c0f1df692585d0fbe78f996e2e0ff89489f097 /connectivity/source/commontools
parent3e0ff98f5371db2270a607306ae498f8d0d02d1d (diff)
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/source/commontools')
-rw-r--r--connectivity/source/commontools/parameters.cxx29
1 files changed, 14 insertions, 15 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!" );
}
}