10 files changed, 4 insertions, 15 deletions
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index 06f6a1f6481c..d23a5d0b7cb1 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -21,8 +21,6 @@
 #include "dbastrings.hrc"
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <osl/diagnose.h>
-#include <tools/debug.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -78,13 +76,13 @@ void OSubComponent::release() throw ( )
                     m_xParent = nullptr;
                 }
 
-                OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (before dispose)!" );
+                SAL_WARN_IF( m_refCount != 1, "dbaccess.core", "OSubComponent::release: invalid ref count (before dispose)!" );
 
                 // First dispose
                 dispose();
 
                 // only the alive ref holds the object
-                OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (after dispose)!" );
+                SAL_WARN_IF( m_refCount != 1, "dbaccess.core", "OSubComponent::release: invalid ref count (after dispose)!" );
 
                 // release the parent in the ~
                 if (xParent.is())
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 60c877afcfa2..70a15d373bce 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -19,7 +19,6 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <osl/diagnose.h>
 #include "DatabaseDataProvider.hxx"
 #include "dbadllapi.hxx"
 
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 8262ce1a165f..08bbd94878c2 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 #include "flt_reghelper.hxx"
 #include "xmlservices.hxx"
 
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index dd05c4c9b83b..a93e63dff063 100644
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ b/dbaccess/source/shared/dbu_reghelper.cxx
@@ -20,7 +20,6 @@
 
 #include "dbu_reghelper.hxx"
 
-#include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx
index ca60a1cb4f7b..c0c3e62fb37b 100644
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ b/dbaccess/source/shared/flt_reghelper.cxx
@@ -20,7 +20,6 @@
 
 #include "flt_reghelper.hxx"
 
-#include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
 
 namespace dbaxml
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index 196674a09f2f..f955010eaff9 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -19,7 +19,6 @@
 
 #include "dbtreemodel.hxx"
 #include "dbu_resource.hrc"
-#include <osl/diagnose.h>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx
index f90cd791b446..aaa2a6d2d1c9 100644
--- a/dbaccess/source/ui/dlg/finteraction.cxx
+++ b/dbaccess/source/ui/dlg/finteraction.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "finteraction.hxx"
-#include <tools/debug.hxx>
-#include <osl/diagnose.h>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 
 namespace dbaui
@@ -33,7 +31,8 @@ namespace dbaui
         :m_xMaster( _rxMaster )
         ,m_bDoesNotExist(false)
     {
-        OSL_ENSURE( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" );
+        SAL_WARN_IF( !m_xMaster.is(), "dbaccess.ui", "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!");
+        assert(m_xMaster.is());
     }
 
     OFilePickerInteractionHandler::~OFilePickerInteractionHandler( )
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index b1bd4936cab8..96497fd944b2 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -26,7 +26,6 @@
 #include "moduledbu.hxx"
 
 #include <svl/undo.hxx>
-#include <osl/diagnose.h>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index f5cd70f2ace9..1c2687eaf7b8 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 #include "dbu_reghelper.hxx"
 #include "uiservices.hxx"
 
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index a7cf4676a0aa..fde168b9fa21 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -26,7 +26,6 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
-#include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
 
 // --- needed because of the solar mutex