summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-07-20 10:54:30 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-08-09 15:01:39 +0200
commitb20f6c845b610e6b42f807fa08dafc0865a3fa57 (patch)
tree1c64adf852981f6dfbaaf1fffdfb1ec6e44206cc /sd
parent2355a92ae4bd50a9c487b9248d4a9da889468491 (diff)
tdf#97087 GDB pretty print the Scheduler task list
In addition to the GDB pretty printer, this annotates a lot more Timers and Idles. Conflicts: cui/source/tabpages/macroass.cxx framework/source/uielement/menubarmanager.cxx sfx2/source/control/itemdel.cxx sfx2/source/dialog/dockwin.cxx svtools/source/graphic/grfmgr.cxx svx/source/sidebar/PanelLayout.cxx Change-Id: I5b93fab02161b23bb753e65ef92643a04fb0789c
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx9
-rw-r--r--sd/source/ui/dlg/filedlg.cxx1
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
3 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index bf8709923872..09631a287789 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -45,9 +45,12 @@ BreakDlg::BreakDlg(
sal_uLong nSumActionCount,
sal_uLong nObjCount )
: SfxModalDialog(pWindow, "BreakDialog", "modules/sdraw/ui/breakdialog.ui")
- , aIdle("sd BreakDlg Idle")
, mpProgress( nullptr )
{
+ m_aUpdateIdle.SetPriority( SchedulerPriority::REPAINT );
+ m_aUpdateIdle.SetIdleHdl( LINK( this, BreakDlg, InitialUpdate ) );
+ m_aUpdateIdle.SetDebugName( "sd::BreakDlg m_aUpdateIdle" );
+
get(m_pFiObjInfo, "metafiles");
get(m_pFiActInfo, "metaobjects");
get(m_pFiInsInfo, "drawingobjects");
@@ -155,9 +158,7 @@ IMPL_LINK_TYPED( BreakDlg, UpDate, void*, nInit, bool )
*/
short BreakDlg::Execute()
{
- aIdle.SetPriority( SchedulerPriority::REPAINT );
- aIdle.SetIdleHdl( LINK( this, BreakDlg, InitialUpdate ) );
- aIdle.Start();
+ m_aUpdateIdle.Start();
return SfxModalDialog::Execute();
}
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index df68e879c825..84f6933e5e4f 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -220,6 +220,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
mbLabelPlaying(false)
{
maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
+ maUpdateIdle.SetDebugName( "SdFileDialog_Imp maUpdateIdle" );
css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker();
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 635abc7c25be..137f52365fc8 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -67,7 +67,7 @@ private:
bool bCancel;
- Idle aIdle;
+ Idle m_aUpdateIdle;
SvdProgressInfo *pProgrInfo;
SfxProgress *mpProgress;