tdf#43157: convert connectivity module away from OSL_ASSERT to assert

Change-Id: I1f1296836b07df6e147c8be845486ac4acd15abd

12 files changed, 15 insertions, 15 deletions

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a63e1cd6ffe7..14a6d93ef334 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1987,7 +1987,7 @@ void release(oslInterlockedCount& _refCount,
             }
 
             // only the alive ref holds the object
-            OSL_ASSERT( _refCount == 1 );
+            assert( _refCount == 1 );
 
             // release the parent in the ~
             if (xParent.is())
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 22ac35d02d9f..ce33cb7dde00 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -317,7 +317,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
 Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
                             const OUString& _rPath)
 {
-    OSL_ASSERT(_rxConfProvider.is());
+    assert(_rxConfProvider.is());
     Sequence< Any > args(1);
     args[0] <<= NamedValue( "nodepath", makeAny(_rPath));
     Reference< XInterface > xInterface(
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 283700649dea..c1a8c3e7da2c 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -199,7 +199,7 @@ bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
     }
     catch (Exception&)
     {
-        OSL_ASSERT(false);
+        assert(false);
         return false;
     }
     return true;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8a343a3404a9..b1a5949af405 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -658,7 +658,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
     }
     catch(const Exception&)
     {
-        OSL_ASSERT(false);
+        assert(false);
     }
     return sURL;
 }
@@ -2564,7 +2564,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
         }
         else
         {
-            OSL_ASSERT(false);
+            assert(false);
         }
     } // for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos)
 }
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 9fe66357e010..af4cabf2f4dd 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -274,7 +274,7 @@ namespace connectivity
                     _pObject->dispose();
 
                     // only the alive ref holds the object
-                    OSL_ASSERT( _refCount == 1 );
+                    assert( _refCount == 1 );
 
                     // release the parent in the ~
                     if (xParent.is())
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 06ae56b2fea7..31e44ca95f20 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -486,7 +486,7 @@ OUString OFlatTable::getEntry()
     }
     catch(const Exception&)
     {
-        OSL_ASSERT(false);
+        assert(false);
     }
     return sURL;
 }
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index fce0c21ccd8e..0dca4e127767 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -130,7 +130,7 @@ bool loadClass(
     OUString const & classPath, OUString const & name,
     LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr)
 {
-    OSL_ASSERT(classLoaderPtr != nullptr);
+    assert(classLoaderPtr != nullptr);
     // For any jweak entries still present in the map upon destruction,
     // DeleteWeakGlobalRef is not called (which is a leak):
     ClassMapData * d =
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index eb80ca6590a7..e3050a50da81 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -222,7 +222,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
     lcl_throwError(STR_QUERY_TOO_COMPLEX);
 
     // Unreachable:
-    OSL_ASSERT(false);
+    assert(false);
     return nullptr;
 }
 
@@ -268,7 +268,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo
     }
     lcl_throwError(STR_QUERY_TOO_COMPLEX);
     // Unreachable:
-    OSL_ASSERT(false);
+    assert(false);
     return nullptr;
 }
 
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index e86ea64efa4d..b9c036670fc9 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -79,7 +79,7 @@ sal_uInt32 findKabField(const OUString& columnName)
          ) );
     ::dbtools::throwGenericSQLException(sError,nullptr);
     // Unreachable:
-    OSL_ASSERT(false);
+    assert(false);
     return 0;
 }
 
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 721bbe36c087..cac20fa7e341 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -222,7 +222,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
     }
     impl_throwError(STR_QUERY_TOO_COMPLEX);
     // Unreachable:
-    OSL_ASSERT(false);
+    assert(false);
     return nullptr;
 }
 
@@ -268,7 +268,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar
     }
     impl_throwError(STR_QUERY_TOO_COMPLEX);
     // Unreachable:
-    OSL_ASSERT(false);
+    assert(false);
     return nullptr;
 }
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 122efca9e511..d3fcf9e2d026 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -155,7 +155,7 @@ Any Container::getByName( const OUString& aName )
             "Element " + aName + " unknown in " + m_type + "-Container",
             *this );
     }
-    OSL_ASSERT( ii->second >= 0 && ii->second < (int)m_values.size() );
+    assert( ii->second >= 0 && ii->second < (int)m_values.size() );
     return m_values[ ii->second ];
 }
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index b2f1d43a05d9..8130cff131b1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1186,7 +1186,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
         }
         catch ( Exception& )
         {
-            OSL_ASSERT(false);
+            assert(false);
         }
 
         if (m_nFormatKey && m_xFormatter.is())