summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser/genericcontroller.cxx
diff options
context:
space:
mode:
authorKenneth Venken <kenneth.venken@gmail.com>2011-02-03 00:33:36 +0100
committerDavid Tardon <dtardon@redhat.com>2011-02-03 08:59:33 +0100
commit7ca07a15538f8c923e46b59125ef7acd30417302 (patch)
treea5cf37205e1604f6255d01b8cfb7e73807d06e0c /dbaccess/source/ui/browser/genericcontroller.cxx
parentfc82a458b39dcd3ec5801c31c44fc8d48f5dc0f4 (diff)
replaced DGB_ASSERT with OSL_ENSURE
Diffstat (limited to 'dbaccess/source/ui/browser/genericcontroller.cxx')
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index fda42e1afa80..43dbaeb30555 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -35,8 +35,8 @@
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include "dataview.hxx"
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
+#include <osl/diagnose.h>
#include "dbustrings.hrc"
#include <vcl/stdtext.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -262,7 +262,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
fillSupportedFeatures();
// create the database context
- DBG_ASSERT(getORB().is(), "OGenericUnoController::Construct need a service factory!");
+ OSL_ENSURE(getORB().is(), "OGenericUnoController::Construct need a service factory!");
try
{
m_xDatabaseContext = Reference< XNameAccess >(getORB()->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
@@ -678,7 +678,7 @@ void OGenericUnoController::InvalidateAll_Impl()
{
::osl::MutexGuard aGuard( m_aFeatureMutex);
- DBG_ASSERT(m_aFeaturesToInvalidate.size(), "OGenericUnoController::InvalidateAll_Impl: to be called from within InvalidateFeature_Impl only!");
+ OSL_ENSURE(m_aFeaturesToInvalidate.size(), "OGenericUnoController::InvalidateAll_Impl: to be called from within InvalidateFeature_Impl only!");
m_aFeaturesToInvalidate.pop_front();
if(!m_aFeaturesToInvalidate.empty())
m_aAsyncInvalidateAll.Call();
@@ -914,7 +914,7 @@ void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsci
sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup )
{
#ifdef DBG_UTIL
- DBG_ASSERT( m_bDescribingSupportedFeatures, "OGenericUnoController::implDescribeSupportedFeature: bad timing for this call!" );
+ OSL_ENSURE( m_bDescribingSupportedFeatures, "OGenericUnoController::implDescribeSupportedFeature: bad timing for this call!" );
#endif
OSL_PRECOND( _nFeatureId < FIRST_USER_DEFINED_FEATURE, "OGenericUnoController::implDescribeSupportedFeature: invalid feature id!" );