dbaccess/source/ui/browser/brwctrlr.cxx | 1 + sfx2/source/view/ipclient.cxx | 1 + svx/inc/sdr/contact/objectcontactofpageview.hxx | 3 ++- svx/source/sdr/contact/objectcontactofpageview.cxx | 8 +++++--- svx/source/svdraw/sdrpagewindow.cxx | 6 ++++-- vcl/win/window/salframe.cxx | 1 + 6 files changed, 14 insertions(+), 6 deletions(-)
New commits: commit 8d4d1e8d1cd4b400bc395dcbb98fb1e82eaf4e0f Author: Jan-Marek Glogowski <[email protected]> Date: Tue Jul 18 15:28:44 2017 +0200 Annotate some more Timers and Idles Change-Id: Ic8ca00db385ed59bb16744581f9d7cc0fcbb4f5b Reviewed-on: https://gerrit.libreoffice.org/40188 Tested-by: Jenkins <[email protected]> Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index b159237e3096..4256ff2f36c1 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -553,6 +553,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno:: } osl_atomic_decrement(&m_refCount); + m_aInvalidateClipboard.SetDebugName("dbaui::SbaXDataBrowserController m_aInvalidateClipboard"); m_aInvalidateClipboard.SetInvokeHandler(LINK(this, SbaXDataBrowserController, OnInvalidateClipboard)); m_aInvalidateClipboard.SetTimeout(300); } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 126adb9b9ff7..9c4f43a25477 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -566,6 +566,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw m_xImp->m_aScaleWidth = m_xImp->m_aScaleHeight = Fraction(1,1); m_xImp->m_xClient = static_cast< embed::XEmbeddedClient* >( m_xImp.get() ); 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 ) ); } diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 283b7990fcf1..043fed599065 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -48,7 +48,8 @@ namespace sdr SdrPage* GetSdrPage() const; // basic constructor, used from SdrPageView. - explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow); + explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow, + const sal_Char *pDebugName = nullptr); virtual ~ObjectContactOfPageView() override; // LazyInvalidate request. This is used from the VOCs to mark that they diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index a010bcba7bfa..b5ff022157f6 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -53,9 +53,11 @@ namespace sdr return GetPageWindow().GetPageView().GetPage(); } - ObjectContactOfPageView::ObjectContactOfPageView(SdrPageWindow& rPageWindow) - : ObjectContact(), - mrPageWindow(rPageWindow) + ObjectContactOfPageView::ObjectContactOfPageView( + SdrPageWindow& rPageWindow, const sal_Char *pDebugName) + : ObjectContact() + , Idle(pDebugName) + , mrPageWindow(rPageWindow) { // init PreviewRenderer flag setPreviewRenderer(static_cast<SdrPaintView&>(rPageWindow.GetPageView().GetView()).IsPreviewRenderer()); diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 38eef36b2483..aca7985d4ebb 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -455,7 +455,8 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange) const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const { if (!mpImpl->mpObjectContact) - mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView(const_cast<SdrPageWindow&>(*this)); + mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView( + const_cast<SdrPageWindow&>(*this), "svx::svdraw::SdrPageWindow mpObjectContact" ); return *mpImpl->mpObjectContact; } @@ -463,7 +464,8 @@ const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() { if (!mpImpl->mpObjectContact) - mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView(*this); + mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView( + *this, "svx::svdraw::SdrPageWindow mpObjectContact" ); return *mpImpl->mpObjectContact; } diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 1eae482cbdfa..268da1e2666f 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -3070,6 +3070,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, if ( !pSalData->mpMouseLeaveTimer ) { pSalData->mpMouseLeaveTimer = new AutoTimer; + pSalData->mpMouseLeaveTimer->SetDebugName( "ImplHandleMouseMsg SalData::mpMouseLeaveTimer" ); pSalData->mpMouseLeaveTimer->SetTimeout( SAL_MOUSELEAVE_TIMEOUT ); pSalData->mpMouseLeaveTimer->Start(); // We don't need to set a timeout handler, because we test _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
