Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)

4 files changed, 11 insertions, 12 deletions

diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 8f76cfeec73b..a89699c002a3 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -210,7 +210,7 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
                 Reference< XInteractionHandler > xHandler(_rMF->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY);
                 if (!xHandler.is())
                 {
-                    OSL_ENSURE(sal_False, "createConnection: could not instantiate an interaction handler!");
+                    OSL_FAIL("createConnection: could not instantiate an interaction handler!");
                         // TODO: a real parent!
                 }
                 else
@@ -400,8 +400,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                     &&  ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement )
                     )
                 {
-                    OSL_ENSURE(sal_False,
-                        (   ::rtl::OString("getTypeInfoFromType: assuming column type ")
+                    OSL_FAIL((  ::rtl::OString("getTypeInfoFromType: assuming column type ")
                         +=  ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding())
                         +=  ::rtl::OString("\" (expected type name ")
                         +=  ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding())
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 600fb72c68be..ceb8f6d6745e 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -974,7 +974,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG )
                 break;
             default:
             {
-                OSL_ENSURE(sal_False, "OCopyTableWizard::ImplOKHdl: invalid creation style!");
+                OSL_FAIL("OCopyTableWizard::ImplOKHdl: invalid creation style!");
             }
         }
 
@@ -1229,7 +1229,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
             }
             else
             {
-                OSL_ENSURE(sal_False, "OCopyTableWizard::appendColumns: invalid field name!");
+                OSL_FAIL("OCopyTableWizard::appendColumns: invalid field name!");
             }
 
         }
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 318856ba2345..ae68cd988f55 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -157,7 +157,7 @@ namespace dbaui
             Reference< XAppend > xAppendIndex(xIndexFactory, UNO_QUERY);
             if (!xAppendIndex.is())
             {
-                OSL_ENSURE(sal_False, "OIndexCollection::commitNewIndex: missing an interface of the index container!");
+                OSL_FAIL("OIndexCollection::commitNewIndex: missing an interface of the index container!");
                 return;
             }
 
@@ -171,7 +171,7 @@ namespace dbaui
             Reference< XAppend > xAppendCols(xColumnFactory, UNO_QUERY);
             if (!xAppendCols.is())
             {
-                OSL_ENSURE(sal_False, "OIndexCollection::commitNewIndex: invalid index descriptor returned!");
+                OSL_FAIL("OIndexCollection::commitNewIndex: invalid index descriptor returned!");
                 return;
             }
 
@@ -226,7 +226,7 @@ namespace dbaui
             Reference< XDrop > xDropIndex(m_xIndexes, UNO_QUERY);
             if (!xDropIndex.is())
             {
-                OSL_ENSURE(sal_False, "OIndexCollection::drop: no XDrop interface!");
+                OSL_FAIL("OIndexCollection::drop: no XDrop interface!");
                 return sal_False;
             }
 
@@ -273,7 +273,7 @@ namespace dbaui
         m_xIndexes->getByName(_rIndex.getOriginalName()) >>= xIndex;
         if (!xIndex.is())
         {
-            OSL_ENSURE(sal_False, "OIndexCollection::implFillIndexInfo: got an invalid index object!");
+            OSL_FAIL("OIndexCollection::implFillIndexInfo: got an invalid index object!");
         }
         else
             implFillIndexInfo(_rIndex, xIndex);
@@ -314,7 +314,7 @@ namespace dbaui
                 xCols->getByName(*pFieldNames) >>= xIndexColumn;
                 if (!xIndexColumn.is())
                 {
-                    OSL_ENSURE(sal_False, "OIndexCollection::implFillIndexInfo: invalid index column!");
+                    OSL_FAIL("OIndexCollection::implFillIndexInfo: invalid index column!");
                     --aCopyTo;
                     continue;
                 }
@@ -383,7 +383,7 @@ namespace dbaui
                 m_xIndexes->getByName(*pNames) >>= xIndex;
                 if (!xIndex.is())
                 {
-                    OSL_ENSURE(sal_False, "OIndexCollection::implConstructFrom: got an invalid index object ... ignoring!");
+                    OSL_FAIL("OIndexCollection::implConstructFrom: got an invalid index object ... ignoring!");
                     continue;
                 }
 
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 2207bbb541ad..2de49e7522d8 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -287,7 +287,7 @@ namespace dbaui
                     break;
 
                 default:
-                    OSL_ENSURE( sal_False, "OLinkedDocumentsAccess::newDocument: please use newFormWithPilot!" );
+                    OSL_FAIL( "OLinkedDocumentsAccess::newDocument: please use newFormWithPilot!" );
                     return Reference< XComponent >();
 
             }