Kaydet (Commit) 4f9b0720 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove remaining DBG_CTOR etc. remnants from toolkit

Change-Id: Ia6219ebd5fb2d2644135ec20a986158b68b771fc
üst d205ff49
...@@ -42,15 +42,10 @@ ...@@ -42,15 +42,10 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::comphelper; using namespace ::comphelper;
DBG_NAME(VCLXAccessibleComponent)
VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow ) VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
: AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
, OAccessibleImplementationAccess( ) , OAccessibleImplementationAccess( )
{ {
DBG_CTOR( VCLXAccessibleComponent, 0 );
mpVCLXindow = pVCLXindow; mpVCLXindow = pVCLXindow;
mxWindow = pVCLXindow; mxWindow = pVCLXindow;
...@@ -69,8 +64,6 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow ) ...@@ -69,8 +64,6 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
VCLXAccessibleComponent::~VCLXAccessibleComponent() VCLXAccessibleComponent::~VCLXAccessibleComponent()
{ {
DBG_DTOR( VCLXAccessibleComponent, 0 );
ensureDisposed(); ensureDisposed();
if ( mpVCLXindow && mpVCLXindow->GetWindow() ) if ( mpVCLXindow && mpVCLXindow->GetWindow() )
...@@ -111,8 +104,6 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() th ...@@ -111,8 +104,6 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() th
IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent ) IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent )
{ {
DBG_CHKTHIS(VCLXAccessibleComponent,0);
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
/* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper
...@@ -132,8 +123,6 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent ...@@ -132,8 +123,6 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent
IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclSimpleEvent*, pEvent ) IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclSimpleEvent*, pEvent )
{ {
DBG_CHKTHIS(VCLXAccessibleComponent,0);
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #i68079# */ ) if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #i68079# */ )
{ {
......
...@@ -36,25 +36,20 @@ ...@@ -36,25 +36,20 @@
#include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/KeyModifier.hpp>
DBG_NAME(VCLXMenu)
VCLXMenu::VCLXMenu() VCLXMenu::VCLXMenu()
: maMenuListeners( *this ) : maMenuListeners( *this )
{ {
DBG_CTOR( VCLXMenu, 0 );
mpMenu = NULL; mpMenu = NULL;
} }
VCLXMenu::VCLXMenu( Menu* pMenu ) VCLXMenu::VCLXMenu( Menu* pMenu )
: maMenuListeners( *this ) : maMenuListeners( *this )
{ {
DBG_CTOR( VCLXMenu, 0 );
mpMenu = pMenu; mpMenu = pMenu;
} }
VCLXMenu::~VCLXMenu() VCLXMenu::~VCLXMenu()
{ {
DBG_DTOR( VCLXMenu, 0 );
for ( size_t n = maPopupMenuRefs.size(); n; ) { for ( size_t n = maPopupMenuRefs.size(); n; ) {
delete maPopupMenuRefs[ --n ]; delete maPopupMenuRefs[ --n ];
} }
...@@ -892,17 +887,13 @@ throw (css::uno::RuntimeException, std::exception) ...@@ -892,17 +887,13 @@ throw (css::uno::RuntimeException, std::exception)
return rxGraphic; return rxGraphic;
} }
DBG_NAME(VCLXMenuBar);
VCLXMenuBar::VCLXMenuBar() VCLXMenuBar::VCLXMenuBar()
{ {
DBG_CTOR( VCLXMenuBar, 0 );
ImplCreateMenu( false ); ImplCreateMenu( false );
} }
VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar ) VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar )
{ {
DBG_CTOR( VCLXMenuBar, 0 );
} }
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
...@@ -913,17 +904,13 @@ stardiv_Toolkit_VCLXMenuBar_get_implementation( ...@@ -913,17 +904,13 @@ stardiv_Toolkit_VCLXMenuBar_get_implementation(
return cppu::acquire(new VCLXMenuBar()); return cppu::acquire(new VCLXMenuBar());
} }
DBG_NAME(VCLXPopupMenu);
VCLXPopupMenu::VCLXPopupMenu() VCLXPopupMenu::VCLXPopupMenu()
{ {
DBG_CTOR( VCLXPopupMenu, 0 );
ImplCreateMenu( true ); ImplCreateMenu( true );
} }
VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu ) VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
{ {
DBG_CTOR( VCLXPopupMenu, 0 );
} }
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
......
...@@ -56,21 +56,14 @@ namespace toolkit ...@@ -56,21 +56,14 @@ namespace toolkit
} }
} }
//= VCLXSpinButton
DBG_NAME( VCLXSpinButton )
VCLXSpinButton::VCLXSpinButton() VCLXSpinButton::VCLXSpinButton()
:maAdjustmentListeners( *this ) :maAdjustmentListeners( *this )
{ {
DBG_CTOR( VCLXSpinButton, NULL );
} }
VCLXSpinButton::~VCLXSpinButton() VCLXSpinButton::~VCLXSpinButton()
{ {
DBG_DTOR( VCLXSpinButton, NULL );
} }
......
...@@ -334,24 +334,14 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW ...@@ -334,24 +334,14 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW
pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset ); pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset );
} }
// class VCLXWindow
DBG_NAME(VCLXWindow);
VCLXWindow::VCLXWindow( bool _bWithDefaultProps ) VCLXWindow::VCLXWindow( bool _bWithDefaultProps )
:mpImpl( NULL ) :mpImpl( NULL )
{ {
DBG_CTOR( VCLXWindow, 0 );
mpImpl = new VCLXWindowImpl( *this, _bWithDefaultProps ); mpImpl = new VCLXWindowImpl( *this, _bWithDefaultProps );
} }
VCLXWindow::~VCLXWindow() VCLXWindow::~VCLXWindow()
{ {
DBG_DTOR( VCLXWindow, 0 );
delete mpImpl; delete mpImpl;
if ( GetWindow() ) if ( GetWindow() )
......
...@@ -130,10 +130,6 @@ struct UnoControl_Data ...@@ -130,10 +130,6 @@ struct UnoControl_Data
} }
}; };
// class UnoControl
DBG_NAME( UnoControl )
UnoControl::UnoControl() : UnoControl::UnoControl() :
maDisposeListeners( *this ) maDisposeListeners( *this )
, maWindowListeners( *this ) , maWindowListeners( *this )
...@@ -145,7 +141,6 @@ UnoControl::UnoControl() : ...@@ -145,7 +141,6 @@ UnoControl::UnoControl() :
, maModeChangeListeners( GetMutex() ) , maModeChangeListeners( GetMutex() )
, mpData( new UnoControl_Data ) , mpData( new UnoControl_Data )
{ {
DBG_CTOR( UnoControl, NULL );
mbDisposePeer = true; mbDisposePeer = true;
mbRefeshingPeer = false; mbRefeshingPeer = false;
mbCreatingPeer = false; mbCreatingPeer = false;
...@@ -156,7 +151,6 @@ UnoControl::UnoControl() : ...@@ -156,7 +151,6 @@ UnoControl::UnoControl() :
UnoControl::~UnoControl() UnoControl::~UnoControl()
{ {
DELETEZ( mpData ); DELETEZ( mpData );
DBG_DTOR( UnoControl, NULL );
} }
OUString UnoControl::GetComponentServiceName() OUString UnoControl::GetComponentServiceName()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment