diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-28 10:59:43 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-28 19:35:13 +0200 |
commit | d72511eda923c827a6175bec9b8f24c237f82730 (patch) | |
tree | 2f0173ce3a9ff08b9cfccad0313db9a142f1a6ba /sfx2 | |
parent | 0bcc4b55d723f73b2fb7a86fcfebeca49905079e (diff) |
gives names to all the Idles and Tasks
enforce it by making the constructor parameter non-default.
Change-Id: I321543e4dcf15ea0a43ad8cce91d2f8dc22df6ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122766
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/appl/linksrc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/openuriexternally.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/itemdel.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/infobar.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/view/ipclient.cxx | 3 |
17 files changed, 20 insertions, 22 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 233a2bd46334..c37e01281977 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -89,10 +89,9 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) { if( rHint.GetObjShell() ) StartListening( *rHint.GetObjShell() ); - pIdle.reset( new Idle("SfxEventASyncer") ); + pIdle.reset( new Idle("sfx::SfxEventAsyncer_Impl pIdle") ); pIdle->SetInvokeHandler( LINK(this, SfxEventAsyncer_Impl, IdleHdl) ); pIdle->SetPriority( TaskPriority::HIGH_IDLE ); - pIdle->SetDebugName( "sfx::SfxEventAsyncer_Impl pIdle" ); pIdle->Start(); } diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 83b5c83cf055..fb9ec11431c4 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -46,7 +46,7 @@ public: } SvLinkSourceTimer::SvLinkSourceTimer( SvLinkSource * pOwn ) - : pOwner( pOwn ) + : Timer("sfx2 SvLinkSourceTimer"), pOwner( pOwn ) { } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index bc3848821d2a..3749b3cf8a12 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -393,6 +393,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_I , m_xOpenBtn(m_xBuilder->weld_button("display")) , aFactoryIdle("sfx2 appl IndexTabPage_Impl Factory") , aAutoCompleteIdle("sfx2 appl IndexTabPage_Impl AutoComplete") + , aKeywordTimer("sfx2::IndexTabPage_Impl aKeywordTimer") , bIsActivated(false) , nRowHeight(m_xIndexList->get_height_rows(1)) , nAllHeight(0) diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index 8ef0ed2ea5ba..f3f6edf11eee 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -33,7 +33,7 @@ namespace { class URITools { private: - Timer aOpenURITimer; + Timer aOpenURITimer { "sfx2::openUriExternallyTimer" }; OUString msURI; bool mbHandleSystemShellExecuteException; DECL_LINK(onOpenURI, Timer*, void); @@ -72,7 +72,6 @@ void URITools::openURI(const OUString& sURI, bool bHandleSystemShellExecuteExcep #else aOpenURITimer.SetTimeout(0); #endif - aOpenURITimer.SetDebugName("sfx2::openUriExternallyTimer"); aOpenURITimer.Start(); } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1fd72c1dbdfb..5f929846107c 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -114,7 +114,7 @@ public: bool bAllMsgDirty; // Has a MessageServer been invalidated? bool bAllDirty; // After InvalidateAll bool bCtrlReleased; // while EnterRegistrations - AutoTimer aAutoTimer; // for volatile Slots + AutoTimer aAutoTimer { "sfx::SfxBindings aAutoTimer" }; // for volatile Slots bool bInUpdate; // for Assertions bool bInNextJob; // for Assertions bool bFirstRound; // First round in Update @@ -146,7 +146,6 @@ SfxBindings::SfxBindings() // all caches are valid (no pending invalidate-job) // create the list of caches pImpl->aAutoTimer.SetInvokeHandler( LINK(this, SfxBindings, NextJob) ); - pImpl->aAutoTimer.SetDebugName( "sfx::SfxBindings aAutoTimer" ); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 111f39ec5593..e4965467ed0e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -111,7 +111,7 @@ struct SfxDispatcher_Impl std::vector<std::unique_ptr<SfxRequest>> aReqArr; SfxShellStack_Impl aStack; // active functionality - Idle aIdle; // for Flush + Idle aIdle { "sfx::SfxDispatcher_Impl aIdle" }; // for Flush std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop SfxViewFrame* pFrame; // NULL or associated Frame tools::SvRef<SfxHintPoster> @@ -306,7 +306,6 @@ void SfxDispatcher::Construct_Impl() xImp->aIdle.SetPriority(TaskPriority::HIGH_IDLE ); xImp->aIdle.SetInvokeHandler( LINK(this, SfxDispatcher, EventHdl_Impl ) ); - xImp->aIdle.SetDebugName( "sfx::SfxDispatcher_Impl aIdle" ); } SfxDispatcher::SfxDispatcher() diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index b0f25212c863..2b8e7db73fc6 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -43,11 +43,10 @@ public: SfxItemDisruptor_Impl::SfxItemDisruptor_Impl(std::unique_ptr<SfxPoolItem> pItemToDisrupt) : pItem(std::move(pItemToDisrupt)) - , m_Idle("sfx SfxItemDisruptor_Impl::Delete") + , m_Idle("sfx::SfxItemDisruptor_Impl m_Idle") { m_Idle.SetInvokeHandler(LINK(this, SfxItemDisruptor_Impl, Delete)); m_Idle.SetPriority(TaskPriority::DEFAULT_IDLE); - m_Idle.SetDebugName("sfx::SfxItemDisruptor_Impl m_Idle"); DBG_ASSERT(0 == pItem->GetRefCount(), "disrupting pooled item"); pItem->SetKind(SfxItemKind::DeleteOnIdle); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index daa43f456738..f28d31d7882d 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -43,7 +43,7 @@ public: bool bClosing; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - Idle aMoveIdle; + Idle aMoveIdle { "SfxModelessDialog_Impl aMoveIdle" }; }; void SfxModelessDialog_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 7427d441ff8c..1a3cdec7e08f 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1298,13 +1298,14 @@ CustomPropertiesWindow::CustomPropertiesWindow(weld::Container& rParent, weld::L , m_pCurrentLine(nullptr) , m_aNumberFormatter(::comphelper::getProcessComponentContext(), Application::GetSettings().GetLanguageTag().getLanguageType()) + , m_aEditLoseFocusIdle("sfx2 CustomPropertiesWindow loseFocusIdle") + , m_aBoxLoseFocusIdle("sfx2 CustomPropertiesWindow m_aBoxLoseFocusIdle") , m_rBody(rParent) , m_rHeaderAccName(rHeaderAccName) , m_rHeaderAccType(rHeaderAccType) , m_rHeaderAccValue(rHeaderAccValue) { m_aEditLoseFocusIdle.SetPriority( TaskPriority::LOWEST ); - m_aEditLoseFocusIdle.SetDebugName("sfx2 CustomPropertiesWindow loseFocusIdle"); m_aEditLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) ); m_aBoxLoseFocusIdle.SetPriority( TaskPriority::LOWEST ); m_aBoxLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, BoxTimeoutHdl ) ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 5e1c5d3e1c35..cd70cbd7feb6 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -406,6 +406,7 @@ SfxDockingWindow_Impl::SfxDockingWindow_Impl(SfxDockingWindow* pBase) ,eDockAlignment(SfxChildAlignment::NOALIGNMENT) ,bConstructed(false) ,pSplitWin(nullptr) + ,aMoveIdle( "sfx::SfxDockingWindow_Impl aMoveIdle" ) ,nHorizontalSize(0) ,nVerticalSize(0) ,nLine(0) @@ -417,7 +418,6 @@ SfxDockingWindow_Impl::SfxDockingWindow_Impl(SfxDockingWindow* pBase) { aMoveIdle.SetPriority(TaskPriority::RESIZE); aMoveIdle.SetInvokeHandler(LINK(pBase,SfxDockingWindow,TimerHdl)); - aMoveIdle.SetDebugName( "sfx::SfxDockingWindow_Impl aMoveIdle" ); } /* [Description] diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 8551227b3c33..6bf8fc9b6036 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -855,7 +855,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( const OUString& sStandardDir, const css::uno::Sequence< OUString >& rDenyList ) - :m_nDialogType ( nDialogType ) + :maPreviewIdle("sfx2 FileDialogHelper_Impl maPreviewIdle") + ,m_nDialogType ( nDialogType ) ,meContext ( FileDialogHelper::UnknownContext ) { const char* pServiceName=nullptr; diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index d6e2a34e0043..9ca00fb95e47 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -347,11 +347,11 @@ IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, const OString&, void) SfxInfoBarContainerWindow::SfxInfoBarContainerWindow(SfxInfoBarContainerChild* pChildWin) : Window(pChildWin->GetParent(), WB_DIALOGCONTROL) , m_pChildWin(pChildWin) + , m_aLayoutIdle("SfxInfoBarContainerWindow m_aLayoutIdle") , m_bResizing(false) { m_aLayoutIdle.SetPriority(TaskPriority::HIGHEST); m_aLayoutIdle.SetInvokeHandler(LINK(this, SfxInfoBarContainerWindow, DoUpdateLayout)); - m_aLayoutIdle.SetDebugName("SfxInfoBarContainerWindow m_aLayoutIdle"); } IMPL_LINK_NOARG(SfxInfoBarContainerWindow, DoUpdateLayout, Timer*, void) { m_pChildWin->Update(); } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 1389dd8e1dbe..6625b85d5aaf 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -101,6 +101,7 @@ public: , bAutoHide( false ) , bSplit( false ) , bEndAutoHide( false ) + , aTimer("sfx2 SfxEmptySplitWin_Impl aTimer") , nState( 1 ) { aTimer.SetInvokeHandler( diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 832079218bbb..2de3a680bd4d 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -229,6 +229,7 @@ sal_uInt16 SfxNewFileDialog::GetSelectedTemplatePos() const SfxNewFileDialog::SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode nFlags) : SfxDialogController(pParent, "sfx/ui/loadtemplatedialog.ui", "LoadTemplateDialog") + , m_aPrevIdle("SfxNewFileDialog m_aPrevIdle") , m_nFlags(nFlags) , m_xPreviewController(new SfxPreviewWin_Impl) , m_xRegionLb(m_xBuilder->weld_tree_view("categories")) diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 48c3491f91a3..91e338413410 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1266,7 +1266,7 @@ void SfxObjectShell::CancelTransfers() AutoReloadTimer_Impl::AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ) - : aUrl( rURL ), pObjSh( pSh ) + : Timer("sfx2 AutoReloadTimer_Impl"), aUrl( rURL ), pObjSh( pSh ) { SetTimeout( nTime ); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2c2d2a87a157..6efb8d87f2e6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -157,7 +157,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) : GenericDialogController(pParent, "sfx/ui/templatedlg.ui", "TemplateDialog") , maSelTemplates(cmpSelectionItems) , mxDesktop(Desktop::create(comphelper::getProcessComponentContext())) - , m_aUpdateDataTimer("UpdateDataTimer") + , m_aUpdateDataTimer( "SfxTemplateManagerDlg UpdateDataTimer" ) , mxSearchFilter(m_xBuilder->weld_entry("search_filter")) , mxCBApp(m_xBuilder->weld_combo_box("filter_application")) , mxCBFolder(m_xBuilder->weld_combo_box("filter_folder")) @@ -240,7 +240,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) mxLocalView->Show(); m_aUpdateDataTimer.SetInvokeHandler(LINK(this, SfxTemplateManagerDlg, ImplUpdateDataHdl)); - m_aUpdateDataTimer.SetDebugName( "SfxTemplateManagerDlg UpdateDataTimer" ); m_aUpdateDataTimer.SetTimeout(EDIT_UPDATEDATA_TIMEOUT); mxLocalView->connect_focus_rect(LINK(this, SfxTemplateManagerDlg, FocusRectLocalHdl)); @@ -1341,6 +1340,7 @@ void SfxTemplateCategoryDialog::SetCategoryLBEntries(std::vector<OUString> aFold SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent) : SfxTemplateManagerDlg(pParent) + , maIdle("sfx2 SfxTemplateManagerDlg maIdle") { mxCBApp->set_active(MNI_IMPRESS); mxCBFolder->set_active(0); @@ -1377,7 +1377,6 @@ short SfxTemplateSelectionDlg::run() // tdf#125079 toggle off the size tracking at some future idle point maIdle.SetPriority(TaskPriority::LOWEST); - maIdle.SetDebugName("sfx2 SfxTemplateManagerDlg maIdle"); maIdle.SetInvokeHandler(LINK(this,SfxTemplateSelectionDlg,TimeOut)); maIdle.Start(); setTemplateViewMode(TemplateViewMode::eThumbnailView); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 7484033b2808..3b87e2be21bd 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -102,7 +102,7 @@ class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper< embed::XEmbeddedCli embed::XWindowSupplier > { public: - Timer m_aTimer; // activation timeout, starts after object connection + Timer m_aTimer { "sfx::SfxInPlaceClient m_xImpl::m_aTimer" }; // activation timeout, starts after object connection tools::Rectangle m_aObjArea; // area of object in coordinate system of the container (without scaling) Fraction m_aScaleWidth; // scaling that was applied to the object when it was not active Fraction m_aScaleHeight; @@ -631,7 +631,6 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw m_xImp->m_nAspect = nAspect; m_xImp->m_aScaleWidth = m_xImp->m_aScaleHeight = Fraction(1,1); pViewShell->NewIPClient_Impl(this); - m_xImp->m_aTimer.SetDebugName( "sfx::SfxInPlaceClient m_xImpl::m_aTimer" ); m_xImp->m_aTimer.SetTimeout( SFX_CLIENTACTIVATE_TIMEOUT ); m_xImp->m_aTimer.SetInvokeHandler( LINK( m_xImp.get(), SfxInPlaceClient_Impl, TimerHdl ) ); } |