Get rid of connectivity's diagnose_ex.h

...that rather trivially wrapped some osl/diagnose.h functionality

Change-Id: I4105708488114a9c87aa415affb997a783241248

23 files changed, 12 insertions, 37 deletions

diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index cd89425ae09c..1319f024c934 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include "diagnose_ex.h"
 #include "resource/sharedresources.hxx"
 #include "resource/ado_res.hrc"
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 1c2ddd406763..bed72dd5831e 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -22,7 +22,6 @@
 #include "ado/Awrapadox.hxx"
 #include <comphelper/types.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "diagnose_ex.h"
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 57ee565a3f4a..4652a11feffc 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include "dbase/DResultSet.hxx"
-#include "diagnose_ex.h"
 #include "resource/dbase_res.hrc"
 #include <unotools/sharedunocomponent.hxx>
 
@@ -365,7 +364,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rInd
 SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rIndex)
 {
     rStream.Seek(0);
-    OSL_VERIFY_EQUALS( rStream.Write(&rIndex.m_aHeader,DINDEX_PAGE_SIZE), DINDEX_PAGE_SIZE, "Write not successful: Wrong header size for dbase index!");
+    OSL_VERIFY( rStream.Write(&rIndex.m_aHeader,DINDEX_PAGE_SIZE) == DINDEX_PAGE_SIZE );
     return rStream;
 }
 
@@ -430,9 +429,8 @@ bool ODbaseIndex::DropImpl()
         m_pTable->getName() + ".inf";
 
     OUString sPhysicalPath;
-    OSL_VERIFY_RES( osl::FileBase::getSystemPathFromFileURL(sCfgFile, sPhysicalPath)
-                    == osl::FileBase::E_None,
-        "Can not convert Config Filename into Physical Name!");
+    OSL_VERIFY( osl::FileBase::getSystemPathFromFileURL(sCfgFile, sPhysicalPath)
+                    == osl::FileBase::E_None );
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 0eadcc392e7c..edbbf5c11524 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -22,7 +22,6 @@
 #include <osl/thread.h>
 #include "dbase/DIndex.hxx"
 #include <tools/debug.hxx>
-#include "diagnose_ex.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index ca465c98370e..4abd1eda5ff4 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -31,7 +31,6 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/PColumn.hxx>
-#include "diagnose_ex.h"
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include "resource/file_res.hrc"
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index bd6cf36f7fae..9958356cad56 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include "HTerminateListener.hxx"
 #include "hsqldb/HCatalog.hxx"
-#include "diagnose_ex.h"
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.h>
 #include <osl/process.h>
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 0a5b75ba3b49..0fa38b5e21b8 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/io/XStream.hpp>
 #include "hsqldb/HStorageMap.hxx"
 #include "accesslog.hxx"
-#include "diagnose_ex.h"
 #include <osl/diagnose.h>
 
 #include <string.h>
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 534b4a4cb284..64cf85895044 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include "diagnose_ex.h"
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 70633e50e396..d360a17dd8bf 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -40,7 +40,6 @@
 
 #include <jvmaccess/virtualmachine.hxx>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include "diagnose_ex.h"
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 8ad8635b6104..e24a18acfe11 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -27,7 +27,6 @@
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <comphelper/types.hxx>
 #include "TPrivilegesResultSet.hxx"
-#include "diagnose_ex.h"
 #include "resource/jdbc_log.hrc"
 
 using namespace ::comphelper;
@@ -118,7 +117,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         // execute Java-Call
         static jmethodID mID(NULL);
         obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
-        OSL_VERIFY_RES( !isExceptionOccurred(t.pEnv, true),"Exception occurred!");
+        OSL_VERIFY( !isExceptionOccurred(t.pEnv, true) );
         jvalue args[4];
 
         args[3].l = 0;
@@ -126,7 +125,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         if ( typeFilterCount )
         {
             jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) );
-            OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+            OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
             const OUString* typeFilter = _types.getConstArray();
             bool bIncludeAllTypes = false;
             for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter )
@@ -138,7 +137,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
                 }
                 jstring aT = convertwchar_tToJavaString( t.pEnv, *typeFilter );
                 t.pEnv->SetObjectArrayElement( pObjArray, (jsize)i, aT );
-                OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+                OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
             }
 
             if ( bIncludeAllTypes )
@@ -146,7 +145,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
                 // the SDBC API allows to pass "%" as table type filter, but in JDBC, "all table types"
                 // is represented by the table type being <null/>
                 t.pEnv->DeleteLocalRef( pObjArray );
-                OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+                OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
             }
             else
             {
@@ -174,23 +173,23 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         if ( aCatalogFilter.hasValue() )
         {
             t.pEnv->DeleteLocalRef(static_cast<jstring>(args[0].l));
-            OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+            OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
         }
         if(args[1].l)
         {
             t.pEnv->DeleteLocalRef(static_cast<jstring>(args[1].l));
-            OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+            OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
         }
         if(!tableNamePattern.isEmpty())
         {
             t.pEnv->DeleteLocalRef(static_cast<jstring>(args[2].l));
-            OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+            OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
         }
         //for(INT16 i=0;i<len;i++)
         if ( args[3].l )
         {
             t.pEnv->DeleteLocalRef( static_cast<jobjectArray>(args[3].l) );
-            OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, true ), "Exception occurred!" );
+            OSL_VERIFY( !isExceptionOccurred( t.pEnv, true ) );
         }
 
         if ( jThrow )
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index d4b1fe3d1518..5fed74908789 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -26,7 +26,6 @@
 #include "java/tools.hxx"
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.h>
-#include "diagnose_ex.h"
 #include "resource/jdbc_log.hrc"
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index ee71aad526b4..cba95797463b 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "diagnose_ex.h"
 #include "MNSProfileDiscover.hxx"
 #include "MConnection.hxx"
 #include "MDriver.hxx"
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 1348963caa66..f78197fa50f9 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -19,7 +19,6 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "diagnose_ex.h"
 
 #if OSL_DEBUG_LEVEL > 0
 # define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index fbfd54d3642a..bdb6edeb6ab4 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -38,7 +38,6 @@
 
 #include <algorithm>
 
-#include "diagnose_ex.h"
 #include "MDriver.hxx"
 #include "MStatement.hxx"
 #include "sqlbison.hxx"
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 9b609a0e43ee..0f55b0e15e9e 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "diagnose_ex.h"
 #include "MConnection.hxx"
 #include "MDatabaseMetaData.hxx"
 #include "MDriver.hxx"
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index ce434a19b8f8..c4a8abfc5274 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -29,7 +29,6 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "diagnose_ex.h"
 
 #if OSL_DEBUG_LEVEL > 0
 # define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 5a258b508c4c..251ec0a765ba 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -38,7 +38,6 @@
 
 #include <algorithm>
 
-#include "diagnose_ex.h"
 #include "MDriver.hxx"
 #include "MStatement.hxx"
 #include "MConnection.hxx"
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index c06559b77814..c2c2c7999338 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -30,7 +30,6 @@
 #include <connectivity/dbcharset.hxx>
 #include <connectivity/FValue.hxx>
 #include <comphelper/extract.hxx>
-#include "diagnose_ex.h"
 #include <connectivity/dbexception.hxx>
 
 #include <string.h>
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index f8a0dbef5f29..9345b7f63a0c 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include <osl/diagnose.h>
-#include "diagnose_ex.h"
 #include "odbc/OPreparedStatement.hxx"
 #include "odbc/OBoundParam.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index f464c810228d..e4cdaf2633ec 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -21,7 +21,6 @@
 #include "odbc/ODriver.hxx"
 #include "odbc/OTools.hxx"
 #include "odbc/OFunctions.hxx"
-#include "diagnose_ex.h"
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 0a98a62934d8..e30c56d11a90 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -35,7 +35,6 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include "diagnose_ex.h"
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -991,7 +990,7 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
 
     invalidateCache();
     // first unbound all columns
-    OSL_VERIFY_EQUALS( unbind(), SQL_SUCCESS, "Could not unbind columns!" );
+    OSL_VERIFY( unbind() == SQL_SUCCESS );
     //  SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE ,(SQLPOINTER)1,SQL_IS_INTEGER);
     m_bInserting = true;
 }
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 0a8128679620..ddf954d5f492 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
-#include "diagnose_ex.h"
 #include <algorithm>
 #include "resource/common_res.hrc"
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index f27bc97f9a59..695d162b7761 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <osl/diagnose.h>
 #include "odbc/OConnection.hxx"
-#include "diagnose_ex.h"
 #include <rtl/ustrbuf.hxx>
 
 #include <appendsqlwchars.hxx>