1 files changed, 13 insertions, 14 deletions

diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 09ebd2096b9c..870727b23b3b 100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -227,7 +227,7 @@ namespace dbtools
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "ParameterManager::collectInnerParameters: caught an exception!" );
+                OSL_FAIL( "ParameterManager::collectInnerParameters: caught an exception!" );
             }
         }
     }
@@ -417,7 +417,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::analyzeFieldLinks: caught an exception!" );
+            OSL_FAIL( "ParameterManager::analyzeFieldLinks: caught an exception!" );
         }
     }
 
@@ -574,7 +574,7 @@ namespace dbtools
                 // does the name denote a valid column in the parent?
                 if ( !_rxParentColumns->hasByName( *pMasterFields ) )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
+                    OSL_FAIL( "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
                     continue;
                 }
 
@@ -584,7 +584,7 @@ namespace dbtools
                     || ( aParamInfo->second.aInnerIndexes.empty() )
                     )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
+                    OSL_FAIL( "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
                     continue;
                 }
 
@@ -623,8 +623,7 @@ namespace dbtools
                     }
                     catch( const Exception& )
                     {
-                        OSL_ENSURE( sal_False,
-                                    ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+                        OSL_FAIL( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
                                 +=  ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
                                 +=  ::rtl::OString( " could not be filled!" ) );
                     }
@@ -665,7 +664,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while calling the handler!" );
+            OSL_FAIL( "ParameterManager::completeParameters: caught an exception while calling the handler!" );
         }
 
         if ( !pParams->wasSelected() )
@@ -695,7 +694,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while propagating the values!" );
+            OSL_FAIL( "ParameterManager::completeParameters: caught an exception while propagating the values!" );
         }
         return true;
     }
@@ -766,7 +765,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::getConnection: could not retrieve the connection of the !" );
+            OSL_FAIL( "ParameterManager::getConnection: could not retrieve the connection of the !" );
         }
         return _rxConnection.is();
     }
@@ -789,7 +788,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::cacheConnectionInfo: caught an exception!" );
+            OSL_FAIL( "ParameterManager::cacheConnectionInfo: caught an exception!" );
         }
     }
 
@@ -845,7 +844,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::getParentColumns: caught an exception!" );
+            OSL_FAIL( "ParameterManager::getParentColumns: caught an exception!" );
         }
         return _out_rxParentColumns.is();
     }
@@ -900,7 +899,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_ENSURE( sal_False, "ParameterManager::resetParameterValues: this should have been stripped long before!" );
+                    OSL_FAIL( "ParameterManager::resetParameterValues: this should have been stripped long before!" );
                     continue;
                 }
 
@@ -912,7 +911,7 @@ namespace dbtools
                     || ( aParamInfo->second.aInnerIndexes.empty() )
                     )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: nothing known about this detail field!" );
+                    OSL_FAIL( "ParameterManager::resetParameterValues: nothing known about this detail field!" );
                     continue;
                 }
 
@@ -944,7 +943,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: caught an exception!" );
+            OSL_FAIL( "ParameterManager::resetParameterValues: caught an exception!" );
         }
 
     }