accessibility/source/extended/AccessibleBrowseBox.cxx | 16
++--------
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 11 ------
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 7 ----
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 4 --
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 4 --
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 2 -
accessibility/source/extended/AccessibleGridControl.cxx | 6 +--
accessibility/source/extended/AccessibleGridControlHeader.cxx | 2 -
accessibility/source/extended/accessiblebrowseboxcell.cxx | 4 --
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 9 -----
accessibility/source/extended/accessibleiconchoicectrl.cxx | 5 ---
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 9 -----
accessibility/source/extended/accessiblelistbox.cxx | 5 ---
accessibility/source/extended/accessiblelistboxentry.cxx | 13 +-------
accessibility/source/extended/accessibletabbar.cxx | 5 ---
accessibility/source/extended/accessibletabbarbase.cxx | 6 +--
accessibility/source/extended/accessibletabbarpagelist.cxx | 5 ---
accessibility/source/extended/accessibletablistbox.cxx | 6 ---
accessibility/source/extended/accessibletablistboxtable.cxx | 10 +-----
accessibility/source/extended/listboxaccessible.cxx | 6 +--
accessibility/source/standard/accessiblemenubasecomponent.cxx | 5 +--
accessibility/source/standard/vclxaccessiblelistitem.cxx | 6 ---
accessibility/source/standard/vclxaccessiblemenubar.cxx | 4 +-
accessibility/source/standard/vclxaccessibletoolbox.cxx | 5 ---
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 9 -----
25 files changed, 27 insertions(+), 137 deletions(-)
New commits:
commit 3c1a1aacf5a1eac4b16c2a2eacbaf262e295d2a0
Author: Jacek Wolszczak <shutdownrun...@gmail.com>
Date: Sun Aug 21 09:34:15 2011 +0200
fdo#39425: Remove DBG_NAME, DBG_CTOR, DBG_DTOR and debug.hxx in
accessibility
Change-Id: I194f776c298f6e149f8e30e82c4b591fed594d55
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 88782c7..06201e8 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -64,14 +64,11 @@ public:
// Ctor/Dtor/disposing --------------------------------------------------------
-DBG_NAME( AccessibleBrowseBox )
-
AccessibleBrowseBox::AccessibleBrowseBox(
const Reference< XAccessible >& _rxParent, const Reference<
XAccessible >& _rxCreator,
IAccessibleTableProvider& _rBrowseBox )
: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,NULL, BBTYPE_BROWSEBOX )
{
- DBG_CTOR( AccessibleBrowseBox, NULL );
m_pImpl.reset( new AccessibleBrowseBoxImpl() );
m_pImpl->m_aCreator = _rxCreator;
@@ -90,7 +87,6 @@ void AccessibleBrowseBox::setCreator( const Reference<
XAccessible >& _rxCreator
//
-----------------------------------------------------------------------------
AccessibleBrowseBox::~AccessibleBrowseBox()
{
- DBG_DTOR( AccessibleBrowseBox, NULL );
}
//
-----------------------------------------------------------------------------
@@ -327,20 +323,16 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16
_nEventId,
// ============================================================================
// = AccessibleBrowseBoxAccess
// ============================================================================
-DBG_NAME( AccessibleBrowseBoxAccess )
-//
-----------------------------------------------------------------------------
AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference<
XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox )
:m_xParent( _rxParent )
,m_rBrowseBox( _rBrowseBox )
,m_pContext( NULL )
{
- DBG_CTOR( AccessibleBrowseBoxAccess, NULL );
}
//
-----------------------------------------------------------------------------
AccessibleBrowseBoxAccess::~AccessibleBrowseBoxAccess()
{
- DBG_DTOR( AccessibleBrowseBoxAccess, NULL );
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 4391ec5..de953a9 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -57,8 +57,6 @@ using namespace
com::sun::star::accessibility::AccessibleStateType;
// Ctor/Dtor/disposing --------------------------------------------------------
-DBG_NAME( AccessibleBrowseBoxBase )
-
AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
@@ -73,7 +71,6 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
meObjType( eObjType ),
m_aClientId(0)
{
- DBG_CTOR( AccessibleBrowseBoxBase, NULL );
if ( m_xFocusWindow.is() )
m_xFocusWindow->addFocusListener( this );
}
@@ -94,15 +91,12 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
meObjType( eObjType ),
m_aClientId(0)
{
- DBG_CTOR( AccessibleBrowseBoxBase, NULL );
if ( m_xFocusWindow.is() )
m_xFocusWindow->addFocusListener( this );
}
AccessibleBrowseBoxBase::~AccessibleBrowseBoxBase()
{
- DBG_DTOR( AccessibleBrowseBoxBase, NULL );
-
if( isAlive() )
{
// increment ref count to prevent double call of Dtor
@@ -602,8 +596,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(
) throw (::com::sun:
}
// ============================================================================
-DBG_NAME( BrowseBoxAccessibleElement )
-
// XInterface -----------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2( BrowseBoxAccessibleElement,
AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
@@ -623,7 +615,6 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement(
const Reference< XAccess
const Reference< awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType eObjType )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
{
- DBG_CTOR( BrowseBoxAccessibleElement, NULL );
}
// ----------------------------------------------------------------------------
@@ -632,13 +623,11 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement(
const Reference< XAccess
const ::rtl::OUString& rName, const ::rtl::OUString& rDescription )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType,
rName, rDescription )
{
- DBG_CTOR( BrowseBoxAccessibleElement, NULL );
}
// ----------------------------------------------------------------------------
BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( )
{
- DBG_DTOR( BrowseBoxAccessibleElement, NULL );
}
// ============================================================================
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 35a684d..5fb7284 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -50,23 +50,18 @@ namespace accessibility {
// Ctor/Dtor/disposing --------------------------------------------------------
-DBG_NAME( AccessibleBrowseBoxHeaderBar )
-
AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
AccessibleBrowseBoxObjType eObjType ) :
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
{
- DBG_CTOR( AccessibleBrowseBoxHeaderBar, NULL );
-
OSL_ENSURE( isRowBar() || isColumnBar(),
"accessibility/extended/AccessibleBrowseBoxHeaderBar - invalid object
type" );
}
AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
{
- DBG_DTOR( AccessibleBrowseBoxHeaderBar, NULL );
}
// XAccessibleContext ---------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index e56c0a3..319e737 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -49,19 +49,15 @@ namespace accessibility {
// Ctor/Dtor/disposing --------------------------------------------------------
-DBG_NAME( AccessibleBrowseBoxTable )
-
AccessibleBrowseBoxTable::AccessibleBrowseBoxTable(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox ) :
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, BBTYPE_TABLE )
{
- DBG_CTOR( AccessibleBrowseBoxTable, NULL );
}
AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable()
{
- DBG_DTOR( AccessibleBrowseBoxTable, NULL );
}
// XAccessibleContext ---------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 71b3d1a..95115a3 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -52,20 +52,16 @@ namespace accessibility {
// Ctor/Dtor/disposing --------------------------------------------------------
-DBG_NAME( AccessibleBrowseBoxTableBase )
-
AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
AccessibleBrowseBoxObjType eObjType ) :
BrowseBoxAccessibleElement( rxParent, rBrowseBox,NULL, eObjType )
{
- DBG_CTOR( AccessibleBrowseBoxTableBase, NULL );
}
AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase()
{
- DBG_DTOR( AccessibleBrowseBoxTableBase, NULL );
}
// XAccessibleContext ---------------------------------------------------------
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx
b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index f067eeb..3d9e192 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -33,8 +33,6 @@ namespace accessibility
//
=============================================================================
// = AccessibleBrowseBoxCell
//
=============================================================================
- DBG_NAME( svt_AccessibleBrowseBoxCell )
- //
-----------------------------------------------------------------------------
AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
const Reference< XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow,
@@ -43,7 +41,6 @@ namespace accessibility
,m_nRowPos( _nRowPos )
,m_nColPos( _nColPos )
{
- DBG_CTOR( svt_AccessibleBrowseBoxCell, NULL );
// set accessible name here, because for that we need the position of
the cell
// and so the base class isn't capable of doing this
sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos;
@@ -54,7 +51,6 @@ namespace accessibility
//
-----------------------------------------------------------------------------
AccessibleBrowseBoxCell::~AccessibleBrowseBoxCell()
{
- DBG_DTOR( svt_AccessibleBrowseBoxCell, NULL );
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 3af5117..d11901f 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -45,7 +45,6 @@ namespace accessibility
using namespace ::comphelper;
using namespace ::svt;
- DBG_NAME( acc_EditBrowseBoxTableCell )
//
-----------------------------------------------------------------------------
EditBrowseBoxTableCell::EditBrowseBoxTableCell(
const com::sun::star::uno::Reference< XAccessible >& _rxParent,
@@ -58,8 +57,6 @@ namespace accessibility
:AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow,
_nRowPos, _nColPos )
,OAccessibleContextWrapperHelper(
::comphelper::getProcessServiceFactory(), rBHelper, _xControlChild,
_rxOwningAccessible, _rxParent )
{
- DBG_CTOR( acc_EditBrowseBoxTableCell, NULL );
-
aggregateProxy( m_refCount, *this );
}
@@ -71,8 +68,6 @@ namespace accessibility
acquire(); // to prevent duplicate dtor calls
dispose();
}
-
- DBG_DTOR( acc_EditBrowseBoxTableCell, NULL );
}
//
-----------------------------------------------------------------------------
@@ -206,8 +201,6 @@ namespace accessibility
//
=============================================================================
// = EditBrowseBoxTableCell
//
=============================================================================
- DBG_NAME( EditBrowseBoxTableCellAccess )
- //
-----------------------------------------------------------------------------
EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess(
const Reference< XAccessible >& _rxParent, const Reference<
XAccessible > _rxControlAccessible,
const Reference< XWindow >& _rxFocusWindow,
@@ -220,12 +213,10 @@ namespace accessibility
,m_nRowPos( _nRowPos )
,m_nColPos( _nColPos )
{
- DBG_CTOR( EditBrowseBoxTableCellAccess, NULL );
}
//
-----------------------------------------------------------------------------
EditBrowseBoxTableCellAccess::~EditBrowseBoxTableCellAccess( )
{
- DBG_DTOR( EditBrowseBoxTableCellAccess, NULL );
}
//--------------------------------------------------------------------
Reference< XAccessibleContext > SAL_CALL
EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException)
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index c7894ad..535fad7 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -49,8 +48,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleIconChoiceCtrl)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -59,12 +56,10 @@ namespace accessibility
VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
m_xParent ( _xParent )
{
- DBG_CTOR( AccessibleIconChoiceCtrl, NULL );
}
//
-----------------------------------------------------------------------------
AccessibleIconChoiceCtrl::~AccessibleIconChoiceCtrl()
{
- DBG_DTOR( AccessibleIconChoiceCtrl, NULL );
}
//
-----------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl,
VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 7b8e46f..9807d60 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
#include <toolkit/awt/vclxwindow.hxx>
@@ -71,8 +70,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleIconChoiceCtrlEntry)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -95,8 +92,6 @@ namespace accessibility
xComp->addEventListener( this );
}
osl_decrementInterlockedCount( &m_refCount );
-
- DBG_CTOR( AccessibleIconChoiceCtrlEntry, NULL );
}
//
-----------------------------------------------------------------------------
void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource
)
@@ -111,8 +106,6 @@ throw(RuntimeException)
//
-----------------------------------------------------------------------------
AccessibleIconChoiceCtrlEntry::~AccessibleIconChoiceCtrlEntry()
{
- DBG_DTOR( AccessibleIconChoiceCtrlEntry, NULL );
-
if ( IsAlive_Impl() )
{
// increment ref count to prevent double call of Dtor
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index 21783ed..d3fa4c6 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
@@ -44,8 +43,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleListBox)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -54,12 +51,10 @@ namespace accessibility
VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
m_xParent( _xParent )
{
- DBG_CTOR( AccessibleListBox, NULL );
}
//
-----------------------------------------------------------------------------
AccessibleListBox::~AccessibleListBox()
{
- DBG_DTOR( AccessibleListBox, NULL );
if ( isAlive() )
{
// increment ref count to prevent double call of Dtor
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 06c14f4..af9c3cc 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
#include <toolkit/awt/vclxwindow.hxx>
@@ -70,8 +69,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleListBoxEntry)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -86,15 +83,11 @@ namespace accessibility
m_aParent ( _xParent )
{
- DBG_CTOR( AccessibleListBoxEntry, NULL );
-
_rListBox.FillEntryPath( _pEntry, m_aEntryPath );
}
//
-----------------------------------------------------------------------------
AccessibleListBoxEntry::~AccessibleListBoxEntry()
{
- DBG_DTOR( AccessibleListBoxEntry, NULL );
-
if ( IsAlive_Impl() )
{
// increment ref count to prevent double call of Dtor
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 6bfb0be..e9ccbdf 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -52,8 +52,6 @@ namespace accessibility
using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
- DBG_NAME( AccessibleTabBar )
-
// ----------------------------------------------------
// class AccessibleTabBar
// ----------------------------------------------------
@@ -61,8 +59,6 @@ namespace accessibility
AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
:AccessibleTabBarBase( pTabBar )
{
- DBG_CTOR( AccessibleTabBar, NULL );
-
if ( m_pTabBar )
m_aAccessibleChildren.assign(
m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
}
@@ -71,7 +67,6 @@ namespace accessibility
AccessibleTabBar::~AccessibleTabBar()
{
- DBG_DTOR( AccessibleTabBar, NULL );
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index fe3aaf1..a856fc2 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/convert.hxx>
@@ -50,8 +49,6 @@ namespace accessibility
using namespace ::com::sun::star;
using namespace ::comphelper;
- DBG_NAME( AccessibleTabBarPageList )
-
//
-----------------------------------------------------------------------------
// class AccessibleTabBarPageList
//
-----------------------------------------------------------------------------
@@ -60,7 +57,6 @@ namespace accessibility
:AccessibleTabBarBase( pTabBar )
,m_nIndexInParent( nIndexInParent )
{
- DBG_CTOR( AccessibleTabBarPageList, NULL );
if ( m_pTabBar )
m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(),
Reference< XAccessible >() );
}
@@ -69,7 +65,6 @@ namespace accessibility
AccessibleTabBarPageList::~AccessibleTabBarPageList()
{
- DBG_DTOR( AccessibleTabBarPageList, NULL );
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibletablistbox.cxx
b/accessibility/source/extended/accessibletablistbox.cxx
index 5093a53..ab353d3 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -44,8 +44,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleTabListBox)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -54,8 +52,6 @@ namespace accessibility
,m_pTabListBox( &rBox )
{
- DBG_CTOR( AccessibleTabListBox, NULL );
-
osl_incrementInterlockedCount( &m_refCount );
{
setCreator( this );
@@ -66,8 +62,6 @@ namespace accessibility
//
-----------------------------------------------------------------------------
AccessibleTabListBox::~AccessibleTabListBox()
{
- DBG_DTOR( AccessibleTabListBox, NULL );
-
if ( isAlive() )
{
// increment ref count to prevent double call of Dtor
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index 2954226..803bd41 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -45,8 +45,6 @@ namespace accessibility
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- DBG_NAME(AccessibleTabListBoxTable)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -57,15 +55,11 @@ namespace accessibility
m_pTabListBox ( &rBox )
{
- DBG_CTOR( AccessibleTabListBoxTable, NULL );
-
m_pTabListBox->AddEventListener( LINK( this,
AccessibleTabListBoxTable, WindowEventListener ) );
}
//
-----------------------------------------------------------------------------
AccessibleTabListBoxTable::~AccessibleTabListBoxTable()
{
- DBG_DTOR( AccessibleTabListBoxTable, NULL );
-
if ( isAlive() )
{
m_pTabListBox = NULL;
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 7213fc7..e0b33b6 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -32,7 +32,6 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
-#include <tools/debug.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 9901373..35954b3 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/unohelp2.hxx>
@@ -66,8 +65,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
-DBG_NAME(VCLXAccessibleListItem)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -83,8 +80,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(
::accessibility::IComboListBoxHe
m_xParent ( _xParent )
{
- DBG_CTOR( VCLXAccessibleListItem, NULL );
-
if ( m_xParent.is() )
m_xParentContext = m_xParent->getAccessibleContext();
@@ -94,7 +89,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(
::accessibility::IComboListBoxHe
//
-----------------------------------------------------------------------------
VCLXAccessibleListItem::~VCLXAccessibleListItem()
{
- DBG_DTOR( VCLXAccessibleListItem, NULL );
}
//
-----------------------------------------------------------------------------
void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected )
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 487803a..4a42dc9 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <tools/debug.hxx>
#include <vcl/toolbox.hxx>
#include <comphelper/accessiblewrapper.hxx>
#include <comphelper/processfactory.hxx>
@@ -182,8 +181,6 @@ namespace
}
}
-DBG_NAME(VCLXAccessibleToolBox)
-
//
-----------------------------------------------------------------------------
// VCLXAccessibleToolBox
//
-----------------------------------------------------------------------------
@@ -192,12 +189,10 @@ VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow*
pVCLXWindow ) :
VCLXAccessibleComponent( pVCLXWindow )
{
- DBG_CTOR(VCLXAccessibleToolBox,NULL);
}
//
-----------------------------------------------------------------------------
VCLXAccessibleToolBox::~VCLXAccessibleToolBox()
{
- DBG_DTOR(VCLXAccessibleToolBox,NULL);
}
//
-----------------------------------------------------------------------------
VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32
_nPos, bool _bMustHaveFocus )
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index f389119..0517d10 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/unohelp2.hxx>
@@ -62,8 +61,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
using namespace ::comphelper;
-DBG_NAME(VCLXAccessibleToolBoxItem)
-
//
-----------------------------------------------------------------------------
// Ctor() and Dtor()
//
-----------------------------------------------------------------------------
@@ -80,8 +77,6 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
m_bIndeterminate( false )
{
- DBG_CTOR( VCLXAccessibleToolBoxItem, NULL );
-
m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock( )
);
OSL_ENSURE( m_pToolBox, "invalid toolbox" );
@@ -123,8 +118,6 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
//
-----------------------------------------------------------------------------
VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
{
- DBG_DTOR( VCLXAccessibleToolBoxItem, NULL );
-
delete m_pExternalLock;
m_pExternalLock = NULL;
}
commit caf0e31e2478884839456bd499fc943324121d77
Author: Jacek Wolszczak <shutdownrun...@gmail.com>
Date: Sun Aug 21 09:13:24 2011 +0200
fdo#39425: Replace DBG_ASSERT macros with OSL_ equivalents in accessibility
Change-Id: I4f8fb4ffa8bcd5a503374040ada191ccf1f89013
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index ad52e7a..88782c7 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -82,7 +82,7 @@ void AccessibleBrowseBox::setCreator( const Reference<
XAccessible >& _rxCreator
{
#if OSL_DEBUG_LEVEL > 0
Reference< XAccessible > xCreator = (Reference< XAccessible
>)m_pImpl->m_aCreator;
- DBG_ASSERT( !xCreator.is(),
"accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!"
);
+ OSL_ENSURE( !xCreator.is(),
"accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!"
);
#endif
m_pImpl->m_aCreator = _rxCreator;
}
@@ -224,7 +224,7 @@ OUString SAL_CALL
AccessibleBrowseBox::getImplementationName()
Rectangle AccessibleBrowseBox::implGetBoundingBox()
{
Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
- DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+ OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
return mpBrowseBox->GetWindowExtentsRelative( pParent );
}
//
-----------------------------------------------------------------------------
@@ -302,7 +302,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32
nChildIndex )
AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
{
Reference< XAccessible > xCreator = (Reference< XAccessible
>)m_pImpl->m_aCreator;
- DBG_ASSERT( xCreator.is(),
"accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator
died - how this?" );
+ OSL_ENSURE( xCreator.is(),
"accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator
died - how this?" );
return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
}
//
-----------------------------------------------------------------------------
@@ -357,7 +357,7 @@ Reference< XAccessibleContext > SAL_CALL
AccessibleBrowseBoxAccess::getAccessibl
{
::osl::MutexGuard aGuard( m_aMutex );
- DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext &&
!m_xContext.is() ),
+ OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext &&
!m_xContext.is() ),
"accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext:
inconsistency!" );
// if the context died meanwhile (there is no listener, so it won't tell
us explicitily when this happens),
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index afce55e..35a684d 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -60,7 +60,7 @@ AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
{
DBG_CTOR( AccessibleBrowseBoxHeaderBar, NULL );
- DBG_ASSERT( isRowBar() || isColumnBar(),
+ OSL_ENSURE( isRowBar() || isColumnBar(),
"accessibility/extended/AccessibleBrowseBoxHeaderBar - invalid object
type" );
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index e961b85..72bc72f 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -153,7 +153,7 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const
::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException)
{
//! TODO CTL bidi
- // DBG_ASSERT(0,"Need to be done by base class!");
+ // OSL_FAIL("Need to be done by base class!");
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 1472a58..a1a5c2c 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -236,7 +236,7 @@ OUString SAL_CALL
AccessibleGridControl::getImplementationName()
Rectangle AccessibleGridControl::implGetBoundingBox()
{
Window* pParent = m_aTable.GetAccessibleParentWindow();
- DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+ OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
return m_aTable.GetWindowExtentsRelative( pParent );
}
//
-----------------------------------------------------------------------------
@@ -310,7 +310,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32
nChildIndex )
AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
{
Reference< XAccessible > xCreator = (Reference< XAccessible
>)m_pImpl->m_aCreator;
- DBG_ASSERT( xCreator.is(),
"accessibility/extended/AccessibleGirdControl::createAccessibleTable: my
creator died - how this?" );
+ OSL_ENSURE( xCreator.is(),
"accessibility/extended/AccessibleGirdControl::createAccessibleTable: my
creator died - how this?" );
return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
}
// ============================================================================
@@ -344,7 +344,7 @@ Reference< XAccessibleContext > SAL_CALL
AccessibleGridControlAccess::getAccessi
{
::osl::MutexGuard aGuard( m_aMutex );
- DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext &&
!m_xContext.is() ),
+ OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext &&
!m_xContext.is() ),
"accessibility/extended/AccessibleGridControlAccess::getAccessibleContext:
inconsistency!" );
// if the context died meanwhile (we're no listener, so it won't tell us
explicitily when this happens),
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 4ddef9a..205f751 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -60,7 +60,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader(
::svt::table::AccessibleTableControlObjType eObjType):
AccessibleGridControlTableBase( rxParent, rTable, eObjType )
{
- DBG_ASSERT( isRowBar() || isColumnBar(),
+ OSL_ENSURE( isRowBar() || isColumnBar(),
"accessibility/extended/AccessibleGridControlHeaderBar - invalid
object type" );
}
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 610c2b9..7b8e46f 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -105,7 +105,7 @@ throw(RuntimeException)
if ( _rSource.Source == m_xParent )
{
dispose();
- DBG_ASSERT( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" );
+ OSL_ENSURE( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" );
}
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 74b99ac..06c14f4 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -344,7 +344,7 @@ namespace accessibility
Reference< XAccessible > xParent = (Reference< XAccessible >)m_aParent;
if ( !xParent.is() )
{
- DBG_ASSERT( m_aEntryPath.size(),
"AccessibleListBoxEntry::getAccessibleParent: invalid path!" );
+ OSL_ENSURE( m_aEntryPath.size(),
"AccessibleListBoxEntry::getAccessibleParent: invalid path!" );
if ( 1 == m_aEntryPath.size() )
{ // we're a top level entry
// -> our parent is the tree listbox itself
@@ -360,7 +360,7 @@ namespace accessibility
// get the entry for this shortened access path
SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath(
m_aEntryPath );
- DBG_ASSERT( pParentEntry,
"AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent
entry!" );
+ OSL_ENSURE( pParentEntry,
"AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent
entry!" );
if ( pParentEntry )
xParent = new AccessibleListBoxEntry( *getListBox(),
pParentEntry, NULL );
@@ -387,7 +387,7 @@ namespace accessibility
{
::osl::MutexGuard aGuard( m_aMutex );
- DBG_ASSERT( !m_aEntryPath.empty(), "empty path" );
+ OSL_ENSURE( !m_aEntryPath.empty(), "empty path" );
return m_aEntryPath.empty() ? -1 : m_aEntryPath.back();
}
//
-----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx
b/accessibility/source/extended/accessibletabbarbase.cxx
index 6936967..2ac4df1 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -46,11 +46,11 @@ AccessibleTabBarBase::~AccessibleTabBarBase()
IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
{
VclWindowEvent* pWinEvent = dynamic_cast< VclWindowEvent* >( pEvent );
- DBG_ASSERT( pWinEvent, "AccessibleTabBarBase::WindowEventListener -
unknown window event" );
+ OSL_ENSURE( pWinEvent, "AccessibleTabBarBase::WindowEventListener -
unknown window event" );
if( pWinEvent )
{
Window* pEventWindow = pWinEvent->GetWindow();
- DBG_ASSERT( pEventWindow, "AccessibleTabBarBase::WindowEventListener:
no window!" );
+ OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener:
no window!" );
if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() ==
TabBar::PAGE_NOT_FOUND ) &&
@@ -83,7 +83,7 @@ void AccessibleTabBarBase::disposing()
void AccessibleTabBarBase::SetTabBarPointer( TabBar* pTabBar )
{
- DBG_ASSERT( !m_pTabBar, "AccessibleTabBarBase::SetTabBarPointer - multiple
call" );
+ OSL_ENSURE( !m_pTabBar, "AccessibleTabBarBase::SetTabBarPointer - multiple
call" );
m_pTabBar = pTabBar;
if( m_pTabBar )
m_pTabBar->AddEventListener( LINK( this, AccessibleTabBarBase,
WindowEventListener ) );
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index e9fb464..2954226 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -211,10 +211,10 @@ namespace accessibility
//
-----------------------------------------------------------------------------
IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener,
VclSimpleEvent*, pEvent )
{
- DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown
WindowEvent!" );
+ OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown
WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
- DBG_ASSERT( ( (VclWindowEvent*)pEvent )->GetWindow() &&
m_pTabListBox, "no event window" );
+ OSL_ENSURE( ( (VclWindowEvent*)pEvent )->GetWindow() &&
m_pTabListBox, "no event window" );
ProcessWindowEvent( *(VclWindowEvent*)pEvent );
}
return 0;
diff --git a/accessibility/source/extended/listboxaccessible.cxx
b/accessibility/source/extended/listboxaccessible.cxx
index 3499074..077ae5f 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -50,11 +50,11 @@ namespace accessibility
//--------------------------------------------------------------------
IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclSimpleEvent*,
pEvent )
{
- DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ),
"ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" );
+ OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ),
"ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
- DBG_ASSERT( static_cast< VclWindowEvent* >( pEvent )->GetWindow()
, "ListBoxAccessibleBase::WindowEventListener: no event window!" );
- DBG_ASSERT( static_cast< VclWindowEvent* >( pEvent )->GetWindow()
== m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come
from?" );
+ OSL_ENSURE( static_cast< VclWindowEvent* >( pEvent )->GetWindow()
, "ListBoxAccessibleBase::WindowEventListener: no event window!" );
+ OSL_ENSURE( static_cast< VclWindowEvent* >( pEvent )->GetWindow()
== m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come
from?" );
ProcessWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
}
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 04c3137..7213fc7 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -564,10 +564,10 @@ sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen()
IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*,
pEvent )
{
- DBG_ASSERT( pEvent && pEvent->ISA( VclMenuEvent ),
"OAccessibleMenuBaseComponent - Unknown MenuEvent!" );
+ OSL_ENSURE( pEvent && pEvent->ISA( VclMenuEvent ),
"OAccessibleMenuBaseComponent - Unknown MenuEvent!" );
if ( pEvent && pEvent->ISA( VclMenuEvent ) )
{
- DBG_ASSERT( ((VclMenuEvent*)pEvent)->GetMenu(),
"OAccessibleMenuBaseComponent - Menu?" );
+ OSL_ENSURE( ((VclMenuEvent*)pEvent)->GetMenu(),
"OAccessibleMenuBaseComponent - Menu?" );
ProcessMenuEvent( *(VclMenuEvent*)pEvent );
}
return 0;
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx
b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 9d2c51d..832f1bc 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -80,10 +80,10 @@ sal_Bool VCLXAccessibleMenuBar::IsFocused()
IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent
)
{
- DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ),
"VCLXAccessibleMenuBar::WindowEventListener: unknown window event!" );
+ OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ),
"VCLXAccessibleMenuBar::WindowEventListener: unknown window event!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
- DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(),
"VCLXAccessibleMenuBar::WindowEventListener: no window!" );
+ OSL_ENSURE( ((VclWindowEvent*)pEvent)->GetWindow(),
"VCLXAccessibleMenuBar::WindowEventListener: no window!" );
if (
!((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || (
pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
{
ProcessWindowEvent( *(VclWindowEvent*)pEvent );
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 575d672..f389119 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -84,7 +84,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock( )
);
- DBG_ASSERT( m_pToolBox, "invalid toolbox" );
+ OSL_ENSURE( m_pToolBox, "invalid toolbox" );
m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
m_sOldName = GetText( true );
m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
