diff options
| author | Kenneth Venken <kenneth.venken@gmail.com> | 2011-02-03 00:33:36 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-02-03 08:59:33 +0100 |
| commit | 7ca07a15538f8c923e46b59125ef7acd30417302 (patch) | |
| tree | a5cf37205e1604f6255d01b8cfb7e73807d06e0c /dbaccess/source/ui/app/AppController.cxx | |
| parent | cppcheck reduce scope of a variable (diff) | |
| download | core-7ca07a15538f8c923e46b59125ef7acd30417302.tar.gz core-7ca07a15538f8c923e46b59125ef7acd30417302.zip | |
replaced DGB_ASSERT with OSL_ENSURE
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 7ba35ca39d21..3d88509ebdc2 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -78,8 +78,8 @@ #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> #include <com/sun/star/container/XHierarchicalName.hpp> /** === end UNO includes === **/ -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <osl/diagnose.h> #include <tools/string.hxx> #include <svl/urihelper.hxx> @@ -483,7 +483,7 @@ sal_Bool OApplicationController::Construct(Window* _pParent) return sal_False; } - DBG_ASSERT( getView(), "OApplicationController::Construct: have no view!" ); + OSL_ENSURE( getView(), "OApplicationController::Construct: have no view!" ); if ( getView() ) getView()->enableSeparator( ); @@ -508,7 +508,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) thr Reference<XConnection> xCon(_rSource.Source, UNO_QUERY); if ( xCon.is() ) { - DBG_ASSERT( m_xDataSourceConnection == xCon, + OSL_ENSURE( m_xDataSourceConnection == xCon, "OApplicationController::disposing: which connection does this come from?" ); if ( getContainer() && getContainer()->getElementType() == E_TABLE ) @@ -2719,7 +2719,7 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > return sal_False; } - DBG_ASSERT( !( m_xModel.is() && ( m_xModel != _rxModel ) ), + OSL_ENSURE( !( m_xModel.is() && ( m_xModel != _rxModel ) ), "OApplicationController::attachModel: missing implementation: setting a new model while we have another one!" ); // at least: remove as property change listener from the old model/data source |