diff options
Diffstat (limited to 'vcl/source')
33 files changed, 68 insertions, 72 deletions
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx index 06de392f584b..ae7fc1a214fb 100644 --- a/vcl/source/animate/Animation.cxx +++ b/vcl/source/animate/Animation.cxx @@ -34,7 +34,8 @@ sal_uLong Animation::mnAnimCount = 0; Animation::Animation() - : mnLoopCount(0) + : maTimer("vcl::Animation") + , mnLoopCount(0) , mnLoops(0) , mnPos(0) , mbIsInAnimation(false) @@ -45,6 +46,7 @@ Animation::Animation() Animation::Animation(const Animation& rAnimation) : maBitmapEx(rAnimation.maBitmapEx) + , maTimer("vcl::Animation") , maGlobalSize(rAnimation.maGlobalSize) , mnLoopCount(rAnimation.mnLoopCount) , mnPos(rAnimation.mnPos) diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 06851eae1589..5fc3ed4b2a91 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -255,7 +255,9 @@ void Help::HidePopover(vcl::Window const * pParent, void* nId) HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle ) : FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window - maHelpText( rText ) + maHelpText( rText ), + maShowTimer( "vcl::HelpTextWindow maShowTimer" ), + maHideTimer( "vcl::HelpTextWindow maHideTimer" ) { SetType( WindowType::HELPTEXTWINDOW ); ImplSetMouseTransparent( true ); @@ -276,12 +278,10 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal maShowTimer.SetInvokeHandler( LINK( this, HelpTextWindow, TimerHdl ) ); - maShowTimer.SetDebugName( "vcl::HelpTextWindow maShowTimer" ); const HelpSettings& rHelpSettings = pParent->GetSettings().GetHelpSettings(); maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() ); maHideTimer.SetInvokeHandler( LINK( this, HelpTextWindow, TimerHdl ) ); - maHideTimer.SetDebugName( "vcl::HelpTextWindow maHideTimer" ); } void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext) diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 5a907cd45e8e..fd17e157d8ce 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1818,6 +1818,7 @@ public: bool bTakeOwnership) : SalInstanceDialog(pDialog, pBuilder, bTakeOwnership) , m_xWizard(pDialog) + , m_aUpdateRoadmapIdle("SalInstanceAssistant m_aUpdateRoadmapIdle") { m_xWizard->SetItemSelectHdl(LINK(this, SalInstanceAssistant, OnRoadmapItemSelected)); diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index c6f3f6b737d4..2d0cf4b9686b 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -628,6 +628,7 @@ Task::Task( const char *pDebugName ) , mbActive( false ) , mbStatic( false ) { + assert(mpDebugName); } Task::Task( const Task& rTask ) @@ -637,6 +638,7 @@ Task::Task( const Task& rTask ) , mbActive( false ) , mbStatic( false ) { + assert(mpDebugName); if ( rTask.IsActive() ) Start(); } diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index db8989ac2fe3..12a8c6547199 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -554,6 +554,7 @@ void WidgetStatusListener::dispose() ButtonPressRepeater::ButtonPressRepeater(weld::Button& rButton, const Link<Button&, void>& rLink, const Link<const CommandEvent&, void>& rContextLink) : m_rButton(rButton) + , m_aRepeat("vcl ButtonPressRepeater m_aRepeat") , m_aLink(rLink) , m_aContextLink(rContextLink) , m_bModKey(false) diff --git a/vcl/source/control/InterimItemWindow.cxx b/vcl/source/control/InterimItemWindow.cxx index 462370e65cd4..ac7c2ab44596 100644 --- a/vcl/source/control/InterimItemWindow.cxx +++ b/vcl/source/control/InterimItemWindow.cxx @@ -15,10 +15,10 @@ InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXM sal_uInt64 nLOKWindowId) : Control(pParent, WB_TABSTOP) , m_pWidget(nullptr) // inheritors are expected to call InitControlBase + , m_aLayoutIdle("InterimItemWindow m_aLayoutIdle") { m_aLayoutIdle.SetPriority(TaskPriority::RESIZE); m_aLayoutIdle.SetInvokeHandler(LINK(this, InterimItemWindow, DoLayout)); - m_aLayoutIdle.SetDebugName("InterimItemWindow m_aLayoutIdle"); m_xVclContentArea = VclPtr<VclVBox>::Create(this); m_xVclContentArea->Show(); diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index ce983e088fa2..953f90f2ad39 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -56,10 +56,10 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( aVerSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_VSCROLL) ), aHorSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_HSCROLL) ), aScrBarBox( VclPtr<ScrollBarBox>::Create(pCurView) ), - aAutoArrangeIdle ( "svtools contnr SvxIconChoiceCtrl_Impl AutoArrange" ), - aDocRectChangedIdle ( "svtools contnr SvxIconChoiceCtrl_Impl DocRectChanged" ), - aVisRectChangedIdle ( "svtools contnr SvxIconChoiceCtrl_Impl VisRectChanged" ), - aCallSelectHdlIdle ( "svtools contnr SvxIconChoiceCtrl_Impl CallSelectHdl" ), + aAutoArrangeIdle( "svtools::SvxIconChoiceCtrl_Impl aAutoArrangeIdle" ), + aDocRectChangedIdle( "svtools::SvxIconChoiceCtrl_Impl aDocRectChangedIdle" ), + aVisRectChangedIdle( "svtools::SvxIconChoiceCtrl_Impl aVisRectChangedIdle" ), + aCallSelectHdlIdle( "svtools::SvxIconChoiceCtrl_Impl aCallSelectHdlIdle" ), aImageSize( 32 * pCurView->GetDPIScaleFactor(), 32 * pCurView->GetDPIScaleFactor()), pView(pCurView), nMaxVirtWidth(DEFAULT_MAX_VIRT_WIDTH), nMaxVirtHeight(DEFAULT_MAX_VIRT_HEIGHT), nFlags(IconChoiceFlags::NONE), nUserEventAdjustScrBars(nullptr), @@ -81,19 +81,15 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( aAutoArrangeIdle.SetPriority( TaskPriority::HIGH_IDLE ); aAutoArrangeIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,AutoArrangeHdl)); - aAutoArrangeIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aAutoArrangeIdle" ); aCallSelectHdlIdle.SetPriority( TaskPriority::LOWEST ); aCallSelectHdlIdle.SetInvokeHandler( LINK(this,SvxIconChoiceCtrl_Impl,CallSelectHdlHdl)); - aCallSelectHdlIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aCallSelectHdlIdle" ); aDocRectChangedIdle.SetPriority( TaskPriority::HIGH_IDLE ); aDocRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,DocRectChangedHdl)); - aDocRectChangedIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aDocRectChangedIdle" ); aVisRectChangedIdle.SetPriority( TaskPriority::HIGH_IDLE ); aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl)); - aVisRectChangedIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aVisRectChangedIdle" ); Clear( true ); Size gridSize(100,70); diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 290eab55976f..777e00e0bc73 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -39,10 +39,10 @@ namespace vcl explicit QuickSelectionEngine_Data( ISearchableStringList& _entryList ) :rEntryList( _entryList ) + ,aSearchTimeout( "vcl::QuickSelectionEngine_Data aSearchTimeout" ) { aSearchTimeout.SetTimeout( 2500 ); aSearchTimeout.SetInvokeHandler( LINK( this, QuickSelectionEngine_Data, SearchStringTimeout ) ); - aSearchTimeout.SetDebugName( "vcl::QuickSelectionEngine_Data aSearchTimeout" ); } ~QuickSelectionEngine_Data() diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 9530d8df3848..b1738d5bef83 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -123,6 +123,7 @@ namespace vcl //= RoadmapWizard RoadmapWizard::RoadmapWizard(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) : Dialog(pParent, nStyle, eFlag) + , maWizardLayoutIdle("vcl RoadmapWizard maWizardLayoutIdle") , m_pFinish(nullptr) , m_pCancel(nullptr) , m_pNextPage(nullptr) diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 9a31a58fc4b3..87385872c0de 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -64,7 +64,7 @@ struct ImplScrollBarData { - AutoTimer maTimer; // Timer + AutoTimer maTimer { "vcl::ScrollBar mpData->maTimer" }; bool mbHide; }; @@ -1138,7 +1138,6 @@ void ScrollBar::GetFocus() { mpData.reset(new ImplScrollBarData); mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); - mpData->maTimer.SetDebugName( "vcl::ScrollBar mpData->maTimer" ); mpData->mbHide = false; } ImplInvert(); // react immediately diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 084fc570a739..c800fdc7d0c9 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -51,6 +51,7 @@ void SpinButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) : Control(WindowType::SPINBUTTON) + , maRepeatTimer("SpinButton maRepeatTimer") , mbUpperIsFocused(false) { ImplInit(pParent, nStyle); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 0abaae7a8981..8db25dfbc699 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -336,7 +336,7 @@ void SpinField::ImplInit(vcl::Window* pParent, WinBits nWinStyle) } SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle, WindowType nType) : - Edit(nType) + Edit(nType), maRepeatTimer("SpinField maRepeatTimer") { ImplInitSpinFieldData(); ImplInit(pParent, nWinStyle); diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 0f38fe11baca..d1c769a3bcd3 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -44,6 +44,7 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style ) ,mbRepeat( true ) ,mnStepTime( 100 ) ,mnCurStep( 0 ) + ,maWaitTimer("Throbber maWaitTimer") { maWaitTimer.SetTimeout( mnStepTime ); maWaitTimer.SetInvokeHandler( LINK( this, Throbber, TimeOutHdl ) ); diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index b0a919b1698e..3cf859704281 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -268,7 +268,8 @@ TEParaPortions::~TEParaPortions() } IdleFormatter::IdleFormatter() - : mpView(nullptr) + : Idle("vcl::TextEngine mpIdleFormatter") + , mpView(nullptr) , mnRestarts(0) { SetPriority(TaskPriority::HIGH_IDLE); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 5435865e4f04..594439666238 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -89,7 +89,6 @@ TextEngine::TextEngine() mpIdleFormatter.reset( new IdleFormatter ); mpIdleFormatter->SetInvokeHandler( LINK( this, TextEngine, IdleFormatHdl ) ); - mpIdleFormatter->SetDebugName( "vcl::TextEngine mpIdleFormatter" ); mpRefDev = VclPtr<VirtualDevice>::Create(); diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx index e637e16e1442..b07c52b9541c 100644 --- a/vcl/source/graphic/Manager.cxx +++ b/vcl/source/graphic/Manager.cxx @@ -71,7 +71,6 @@ Manager::Manager() { maSwapOutTimer.SetInvokeHandler(LINK(this, Manager, SwapOutTimerHandler)); maSwapOutTimer.SetTimeout(10000); - maSwapOutTimer.SetDebugName("graphic::Manager maSwapOutTimer"); maSwapOutTimer.Start(); } } diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index f5d48c4073cc..cdbc4b98578e 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -53,6 +53,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS , m_aScrBarBox(VclPtr<ScrollBarBox>::Create(pLBView)) , m_aFctSet(this, pLBView) , mbForceMakeVisible (false) + , m_aEditIdle("SvImpLBox m_aEditIdle") , m_aVerSBar(VclPtr<ScrollBar>::Create(pLBView, WB_DRAG | WB_VSCROLL)) , m_aOutputSize(0, 0) , mbNoAutoCurEntry(false) diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 069b1d9c95ce..35eb3271f403 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -63,7 +63,7 @@ class SvInplaceEdit2 Link<SvInplaceEdit2&,void> aCallBackHdl; Accelerator aAccReturn; Accelerator aAccEscape; - Idle aIdle; + Idle aIdle { "svtools::SvInplaceEdit2 aIdle" }; VclPtr<Edit> pEdit; bool bCanceled; bool bAlreadyInCallBack; @@ -237,7 +237,6 @@ void SvInplaceEdit2::LoseFocus() bCanceled = false; aIdle.SetPriority(TaskPriority::REPAINT); aIdle.SetInvokeHandler(LINK(this,SvInplaceEdit2,Timeout_Impl)); - aIdle.SetDebugName( "svtools::SvInplaceEdit2 aIdle" ); aIdle.Start(); } } diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 9041dc7f14e0..2490a48c479b 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -95,10 +95,9 @@ public: IMPL_LINK_NOARG(ExecuteWrapper, ExecuteActionHdl, Timer*, void) { { - Idle aIdle; + Idle aIdle("UI Test Idle Handler2"); { mFunc(); - aIdle.SetDebugName("UI Test Idle Handler2"); aIdle.SetPriority(TaskPriority::LOWEST); aIdle.SetInvokeHandler(mHandler); aIdle.Start(); @@ -118,8 +117,7 @@ void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css:: if (!mpObj) throw css::uno::RuntimeException(); - auto aIdle = std::make_unique<Idle>(); - aIdle->SetDebugName("UI Test Idle Handler"); + auto aIdle = std::make_unique<Idle>("UI Test Idle Handler"); aIdle->SetPriority(TaskPriority::HIGHEST); std::function<void()> func = [&rAction, &rPropValues, this](){ diff --git a/vcl/source/window/bubblewindow.cxx b/vcl/source/window/bubblewindow.cxx index f4e491242c52..a0c20cedd99e 100644 --- a/vcl/source/window/bubblewindow.cxx +++ b/vcl/source/window/bubblewindow.cxx @@ -215,7 +215,9 @@ void BubbleWindow::RecalcTextRects() } MenuBarUpdateIconManager::MenuBarUpdateIconManager() - : mnIconID (0) + : maTimeoutTimer("MenuBarUpdateIconManager") + , maWaitIdle("vcl MenuBarUpdateIconManager maWaitIdle") + , mnIconID (0) , mbShowMenuIcon(false) , mbShowBubble(false) , mbBubbleChanged( false ) diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index bab975a0b602..09406b927e00 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -32,7 +32,7 @@ struct ImplCursorData { - AutoTimer maTimer; // Timer + AutoTimer maTimer { "vcl ImplCursorData maTimer" }; // Timer Point maPixPos; // Pixel-Position Point maPixRotOff; // Pixel-Offset-Position Size maPixSize; // Pixel-Size @@ -212,7 +212,6 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore ) mpData.reset( new ImplCursorData ); mpData->mbCurVisible = false; mpData->maTimer.SetInvokeHandler( LINK( this, Cursor, ImplTimerHdl ) ); - mpData->maTimer.SetDebugName( "vcl ImplCursorData maTimer" ); } mpData->mpWindow = pWindow; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a3ae03980540..8292e62b2b6e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -541,7 +541,7 @@ void Dialog::ImplLOKNotifier(vcl::Window* pParent) } Dialog::Dialog( WindowType nType ) - : SystemWindow( nType ) + : SystemWindow( nType, "vcl::Dialog maLayoutIdle" ) , mnInitFlag(InitFlag::Default) { ImplInitDialogData(); @@ -571,7 +571,7 @@ void Dialog::doDeferredInit(WinBits nBits) } Dialog::Dialog(vcl::Window* pParent, std::u16string_view rID, const OUString& rUIXMLDescription) - : SystemWindow(WindowType::DIALOG) + : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle") , mnInitFlag(InitFlag::Default) { ImplLOKNotifier(pParent); @@ -580,7 +580,7 @@ Dialog::Dialog(vcl::Window* pParent, std::u16string_view rID, const OUString& rU } Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) - : SystemWindow(WindowType::DIALOG) + : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle") , mnInitFlag(eFlag) { ImplLOKNotifier(pParent); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 645aa8dc19e5..e71c7f420580 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -74,6 +74,8 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), mnLastTicks( tools::Time::GetSystemTicks() ), + m_aDockTimer("vcl::ImplDockFloatWin2 m_aDockTimer"), + m_aEndDockTimer( "vcl::ImplDockFloatWin2 m_aEndDockTimer" ), mbInMove( false ), mnLastUserEvent( nullptr ) { @@ -93,12 +95,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, m_aDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); m_aDockTimer.SetPriority( TaskPriority::HIGH_IDLE ); m_aDockTimer.SetTimeout( 50 ); - m_aDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aDockTimer" ); m_aEndDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); m_aEndDockTimer.SetPriority( TaskPriority::HIGH_IDLE ); m_aEndDockTimer.SetTimeout( 50 ); - m_aEndDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aEndDockTimer" ); } ImplDockFloatWin2::~ImplDockFloatWin2() diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 892a1cf95727..99c4f1bba398 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -86,6 +86,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), mnLastTicks( tools::Time::GetSystemTicks() ), + maDockIdle( "vcl::ImplDockFloatWin maDockIdle" ), mbInMove( false ), mnLastUserEvent( nullptr ) { @@ -104,7 +105,6 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, maDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); maDockIdle.SetPriority( TaskPriority::HIGH_IDLE ); - maDockIdle.SetDebugName( "vcl::ImplDockFloatWin maDockIdle" ); } ImplDockFloatWin::~ImplDockFloatWin() @@ -307,7 +307,6 @@ void DockingWindow::ImplInitDockingWindowData() //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); maLayoutIdle.SetInvokeHandler( LINK( this, DockingWindow, ImplHandleLayoutTimerHdl ) ); - maLayoutIdle.SetDebugName( "vcl::DockingWindow maLayoutIdle" ); } void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) @@ -344,14 +343,16 @@ void DockingWindow::ImplInitSettings() SetBackground( aColor ); } -DockingWindow::DockingWindow( WindowType nType ) : - Window(nType) +DockingWindow::DockingWindow( WindowType nType, const char* pIdleDebugName ) : + Window(nType), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); } -DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle ) : - Window( WindowType::DOCKINGWINDOW ) +DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle, const char* pIdleDebugName ) : + Window( WindowType::DOCKINGWINDOW ), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); ImplInit( pParent, nStyle ); @@ -375,8 +376,10 @@ void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStr } DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, - const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : Window(WindowType::DOCKINGWINDOW) + const OUString& rUIXMLDescription, const char* pIdleDebugName, + const css::uno::Reference<css::frame::XFrame> &rFrame) + : Window(WindowType::DOCKINGWINDOW), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); @@ -1074,11 +1077,6 @@ void DockingWindow::SetFloatingPos( const Point& rNewPos ) maFloatPos = rNewPos; } -void DockingWindow::SetIdleDebugName( const char *pDebugName ) -{ - maLayoutIdle.SetDebugName( pDebugName ); -} - SystemWindow* DockingWindow::GetFloatingWindow() const { return mpFloatWin; @@ -1088,6 +1086,7 @@ DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::un : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), + "vcl::DropdownDockingWindow maLayoutIdle", rFrame) , m_xBox(m_pUIBuilder->get("box")) { @@ -1105,13 +1104,13 @@ void DropdownDockingWindow::dispose() } ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) - : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", rFrame) + : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", "vcl::ResizableDockingWindow maLayoutIdle", rFrame) , m_xBox(m_pUIBuilder->get("box")) { } ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, WinBits nStyle) - : DockingWindow(pParent, nStyle) + : DockingWindow(pParent, nStyle, "vcl::ResizableDockingWindow maLayoutIdle") { } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index d218e243f862..f8beb309b3d8 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -149,13 +149,13 @@ void FloatingWindow::ImplInitSettings() } FloatingWindow::FloatingWindow(vcl::Window* pParent, WinBits nStyle) : - SystemWindow(WindowType::FLOATINGWINDOW) + SystemWindow(WindowType::FLOATINGWINDOW, "vcl::FloatingWindow maLayoutIdle") { ImplInitFloating(pParent, nStyle); } FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : SystemWindow(WindowType::FLOATINGWINDOW) + : SystemWindow(WindowType::FLOATINGWINDOW, "vcl::FloatingWindow maLayoutIdle") , mpNextFloat(nullptr) , mpFirstPopupModeWin(nullptr) , mnPostId(nullptr) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index f78036a6459c..85478ac64764 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -31,6 +31,9 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBits nStyle ) : FloatingWindow( pParent, nStyle ), pMenu(pMen), + aHighlightChangedTimer("vcl::MenuFloatingWindow aHighlightChangedTimer"), + aSubmenuCloseTimer( "vcl::MenuFloatingWindow aSubmenuCloseTimer" ), + aScrollTimer( "vcl::MenuFloatingWindow aScrollTimer" ), nHighlightedItem(ITEMPOS_INVALID), nMBDownPos(ITEMPOS_INVALID), nScrollerHeight(0), @@ -51,14 +54,11 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit aHighlightChangedTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, HighlightChanged ) ); aHighlightChangedTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); - aHighlightChangedTimer.SetDebugName( "vcl::MenuFloatingWindow aHighlightChangedTimer" ); aSubmenuCloseTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); aSubmenuCloseTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, SubmenuClose ) ); - aSubmenuCloseTimer.SetDebugName( "vcl::MenuFloatingWindow aSubmenuCloseTimer" ); aScrollTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, AutoScroll ) ); - aScrollTimer.SetDebugName( "vcl::MenuFloatingWindow aScrollTimer" ); AddEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); } diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 88e1c1a5f6dd..f81ffe6cd6d3 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -36,6 +36,7 @@ inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet ) : pWin( pWindow ), + aWTimer( "vcl::SelectionEngine aWTimer" ), nUpdateInterval( SELENG_AUTOREPEAT_INTERVAL ) { eSelMode = SelectionMode::Single; @@ -45,7 +46,6 @@ SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet ) aWTimer.SetInvokeHandler( LINK( this, SelectionEngine, ImpWatchDog ) ); aWTimer.SetTimeout( nUpdateInterval ); - aWTimer.SetDebugName( "vcl::SelectionEngine aWTimer" ); } SelectionEngine::~SelectionEngine() diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index fa3cada9ecfa..1cb8389fac99 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -1137,10 +1137,9 @@ void SplitWindow::ImplInitSettings() } SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) : - DockingWindow( WindowType::SPLITWINDOW ) + DockingWindow( WindowType::SPLITWINDOW, "vcl::SplitWindow maLayoutIdle" ) { ImplInit( pParent, nStyle ); - DockingWindow::SetIdleDebugName( "vcl::SplitWindow maLayoutIdle" ); } SplitWindow::~SplitWindow() diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d6991ab11636..c624c373aa77 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -64,7 +64,7 @@ SystemWindow::ImplData::ImplData() maMaxOutSize = Size( SHRT_MAX, SHRT_MAX ); } -SystemWindow::SystemWindow(WindowType nType) +SystemWindow::SystemWindow(WindowType nType, const char* pIdleDebugName) : Window(nType) , mbDockBtn(false) , mbHideBtn(false) @@ -74,6 +74,7 @@ SystemWindow::SystemWindow(WindowType nType) , mnMenuBarMode(MenuBarMode::Normal) , mnIcon(0) , mpImplData(new ImplData) + , maLayoutIdle( pIdleDebugName ) , mbIsDeferredInit(false) { mpWindowImpl->mbSysWin = true; @@ -82,7 +83,6 @@ SystemWindow::SystemWindow(WindowType nType) //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); maLayoutIdle.SetInvokeHandler( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); - maLayoutIdle.SetDebugName( "vcl::SystemWindow maLayoutIdle" ); } void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 6cfe69aff8a8..82d301840e9a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1167,7 +1167,6 @@ void ToolBox::ImplInitToolBoxData() // set timeout and handler for dropdown items mpData->maDropdownTimer.SetTimeout( 250 ); mpData->maDropdownTimer.SetInvokeHandler( LINK( this, ToolBox, ImplDropdownLongClickHdl ) ); - mpData->maDropdownTimer.SetDebugName( "vcl::ToolBox mpData->maDropdownTimer" ); } void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) @@ -1274,7 +1273,7 @@ void ToolBox::queue_resize(StateChangedType eReason) } ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : - DockingWindow( WindowType::TOOLBOX ) + DockingWindow( WindowType::TOOLBOX, "vcl::ToolBox maLayoutIdle" ) { ImplInitToolBoxData(); ImplInit( pParent, nStyle ); @@ -1282,7 +1281,7 @@ ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : ToolBox::ToolBox(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : DockingWindow(WindowType::TOOLBOX) + : DockingWindow(WindowType::TOOLBOX, "vcl::ToolBox maLayoutIdle") { ImplInitToolBoxData(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index c02dc534337b..f5cf9b855103 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -760,6 +760,8 @@ ImplWinData::~ImplWinData() } ImplFrameData::ImplFrameData( vcl::Window *pWindow ) + : maPaintIdle( "vcl::Window maPaintIdle" ), + maResizeIdle( "vcl::Window maResizeIdle" ) { ImplSVData* pSVData = ImplGetSVData(); assert (pSVData->maFrameData.mpFirstFrame.get() != pWindow); @@ -799,10 +801,8 @@ ImplFrameData::ImplFrameData( vcl::Window *pWindow ) mbSysObjFocus = false; maPaintIdle.SetPriority( TaskPriority::REPAINT ); maPaintIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandlePaintHdl ) ); - maPaintIdle.SetDebugName( "vcl::Window maPaintIdle" ); maResizeIdle.SetPriority( TaskPriority::RESIZE ); maResizeIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandleResizeTimerHdl ) ); - maResizeIdle.SetDebugName( "vcl::Window maResizeIdle" ); mbInternalDragGestureRecognizer = false; mbInBufferedPaint = false; mnDPIX = 96; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index dd3a5fe05b28..cd596b240012 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -253,14 +253,13 @@ void Window::StartTracking( StartTrackingFlags nFlags ) if ( nFlags & (StartTrackingFlags::ScrollRepeat | StartTrackingFlags::ButtonRepeat) ) { - pSVData->mpWinData->mpTrackTimer = new AutoTimer; + pSVData->mpWinData->mpTrackTimer = new AutoTimer("vcl::Window pSVData->mpWinData->mpTrackTimer"); if ( nFlags & StartTrackingFlags::ScrollRepeat ) pSVData->mpWinData->mpTrackTimer->SetTimeout( MouseSettings::GetScrollRepeat() ); else pSVData->mpWinData->mpTrackTimer->SetTimeout( MouseSettings::GetButtonStartRepeat() ); pSVData->mpWinData->mpTrackTimer->SetInvokeHandler( LINK( this, Window, ImplTrackTimerHdl ) ); - pSVData->mpWinData->mpTrackTimer->SetDebugName( "vcl::Window pSVData->mpWinData->mpTrackTimer" ); pSVData->mpWinData->mpTrackTimer->Start(); } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index d7066f7a9b90..6dfdd4c0d367 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -40,8 +40,6 @@ void WorkWindow::ImplInitWorkWindowData() mbPresentationVisible = false; mbPresentationFull = false; mbFullScreenMode = false; - - maLayoutIdle.SetDebugName( "vcl::WorkWindow maLayoutIdle" ); } void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) @@ -85,20 +83,20 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno: } WorkWindow::WorkWindow( WindowType nType ) : - SystemWindow( nType ) + SystemWindow( nType, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); } WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); ImplInit( pParent, nStyle ); } WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); mbSysChild = true; @@ -106,7 +104,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWi } WorkWindow::WorkWindow( SystemParentData* pParent ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); mbSysChild = true; |