diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-01-23 19:37:51 +0100 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-08-09 15:01:41 +0200 |
commit | 72a40276aaec688948e9e169cf8268c6c66a0dba (patch) | |
tree | 9a4dcf1c857eff2043c28ae8883657f17017cf22 /formula | |
parent | d6b1aae9094320c09464efd46e7981f4b125562b (diff) |
Change all Idle* LINKs to be Timer*
Seem UBSAN doesn't like my forced reinterpret_cast to set the Idles
Link in the Timer class. Now there are two possible solution:
1. convert all (DECL|IMPL).*_LINK call sites to use a Timer* or
2. split the inheritance of Idle from Timer again to maintain
different Link<>s and move all common code into a TimerBase.
While the 1st is more correct, the 2nd has a better indicator for
Idles. This implements the first solution.
And while at it, this also converts all call sites of SetTimeoutHdl
and SetIdleHdl to SetInvokeHandler and gets rid of some local Link
objects, which are just passed to the SetInvokeHandler call.
It also introduces ClearInvokeHandler() and replaces the respective
call sites of SetInvokeHandler( Link<Timer *, void>() ).
Conflicts:
avmedia/inc/mediacontrol.hxx
avmedia/source/framework/mediacontrol.cxx
avmedia/source/framework/soundhandler.cxx
avmedia/source/framework/soundhandler.hxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/dlged/dlged.cxx
basctl/source/inc/dlged.hxx
chart2/source/view/charttypes/GL3DBarChart.cxx
chart2/source/view/inc/GL3DBarChart.hxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/linkdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/inc/backgrnd.hxx
cui/source/inc/chardlg.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/linkdlg.hxx
cui/source/inc/macroass.hxx
cui/source/inc/thesdlg.hxx
cui/source/options/optjava.cxx
cui/source/options/optjava.hxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/macroass.cxx
dbaccess/source/ui/inc/JoinTableView.hxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
desktop/source/app/app.cxx
desktop/source/deployment/gui/dp_gui_dialog2.cxx
desktop/source/deployment/gui/dp_gui_dialog2.hxx
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit3.cxx
extensions/source/bibliography/bibcont.cxx
extensions/source/bibliography/bibcont.hxx
extensions/source/bibliography/toolbar.cxx
extensions/source/bibliography/toolbar.hxx
extensions/source/update/ui/updatecheckui.cxx
forms/source/component/ListBox.cxx
forms/source/component/ListBox.hxx
formula/source/ui/dlg/formula.cxx
formula/source/ui/dlg/funcutl.cxx
fpicker/source/office/iodlg.cxx
framework/source/services/autorecovery.cxx
include/formula/formula.hxx
include/formula/funcutl.hxx
include/sfx2/basedlgs.hxx
include/sfx2/dinfdlg.hxx
include/sfx2/dispatch.hxx
include/sfx2/dockwin.hxx
include/svtools/asynclink.hxx
include/svtools/filechangedchecker.hxx
include/svtools/treelistbox.hxx
include/svtools/wizdlg.hxx
include/svx/fontwork.hxx
include/svx/graphctl.hxx
include/svx/imapdlg.hxx
include/svx/modctrl.hxx
include/svx/numvset.hxx
include/svx/sidebar/PanelLayout.hxx
include/svx/svdpntv.hxx
include/vcl/dockwin.hxx
include/vcl/syswin.hxx
include/vcl/texteng.hxx
include/vcl/toolbox.hxx
include/vcl/window.hxx
linguistic/source/lngsvcmgr.cxx
linguistic/source/lngsvcmgr.hxx
reportdesign/source/ui/inc/DesignView.hxx
reportdesign/source/ui/report/DesignView.cxx
sc/inc/chartlis.hxx
sc/inc/document.hxx
sc/inc/scmod.hxx
sc/source/core/data/documen2.cxx
sc/source/core/tool/chartlis.cxx
sc/source/ui/app/scmod.cxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/dbgui/sfiltdlg.cxx
sc/source/ui/docshell/autostyl.cxx
sc/source/ui/inc/acredlin.hxx
sc/source/ui/inc/anyrefdg.hxx
sc/source/ui/inc/autostyl.hxx
sc/source/ui/inc/conflictsdlg.hxx
sc/source/ui/inc/filtdlg.hxx
sc/source/ui/inc/navipi.hxx
sc/source/ui/inc/tphfedit.hxx
sc/source/ui/miscdlgs/acredlin.cxx
sc/source/ui/miscdlgs/anyrefdg.cxx
sc/source/ui/miscdlgs/conflictsdlg.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/pagedlg/tphfedit.cxx
sd/inc/drawdoc.hxx
sd/source/core/drawdoc4.cxx
sd/source/ui/dlg/brkdlg.cxx
sd/source/ui/dlg/filedlg.cxx
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
sd/source/ui/framework/module/ShellStackGuard.cxx
sd/source/ui/framework/module/ShellStackGuard.hxx
sd/source/ui/inc/BreakDlg.hxx
sd/source/ui/inc/View.hxx
sd/source/ui/slidesorter/controller/SlsAnimator.cxx
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
sd/source/ui/view/sdview4.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/newhelp.cxx
sfx2/source/appl/newhelp.hxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/itemdel.cxx
sfx2/source/dialog/basedlgs.cxx
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/filedlghelper.cxx
sfx2/source/dialog/filedlgimpl.hxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/doc/new.cxx
sfx2/source/inc/templdgi.hxx
sfx2/source/view/ipclient.cxx
starmath/inc/edit.hxx
starmath/source/edit.cxx
svtools/source/contnr/imivctl.hxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/treelistbox.cxx
svtools/source/control/asynclink.cxx
svtools/source/control/tabbar.cxx
svtools/source/dialogs/wizdlg.cxx
svtools/source/graphic/grfmgr.cxx
svtools/source/inc/svimpbox.hxx
svtools/source/misc/filechangedchecker.cxx
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
svx/inc/svdibrow.hxx
svx/source/dialog/_contdlg.cxx
svx/source/dialog/contimp.hxx
svx/source/dialog/fontwork.cxx
svx/source/dialog/graphctl.cxx
svx/source/dialog/imapdlg.cxx
svx/source/dialog/svxbmpnumvalueset.cxx
svx/source/form/datanavi.cxx
svx/source/form/formcontroller.cxx
svx/source/inc/datanavi.hxx
svx/source/inc/formcontroller.hxx
svx/source/sdr/overlay/overlaymanagerbuffered.cxx
svx/source/sidebar/PanelLayout.cxx
svx/source/sidebar/media/MediaPlaybackPanel.cxx
svx/source/sidebar/media/MediaPlaybackPanel.hxx
svx/source/stbctrls/modctrl.cxx
svx/source/svdraw/svdibrow.cxx
svx/source/svdraw/svdpntv.cxx
svx/source/tbxctrls/grafctrl.cxx
sw/inc/doc.hxx
sw/qa/extras/uiwriter/uiwriter.cxx
sw/source/core/doc/DocumentStatisticsManager.cxx
sw/source/core/doc/DocumentTimerManager.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/docnode/threadmanager.cxx
sw/source/core/inc/DocumentTimerManager.hxx
sw/source/core/inc/threadmanager.hxx
sw/source/ui/dbui/mmoutputtypepage.cxx
sw/source/ui/envelp/labfmt.cxx
sw/source/ui/envelp/labfmt.hxx
sw/source/ui/inc/mmresultdialogs.hxx
sw/source/uibase/docvw/edtwin.cxx
sw/source/uibase/docvw/srcedtw.cxx
sw/source/uibase/inc/edtwin.hxx
sw/source/uibase/inc/navipi.hxx
sw/source/uibase/inc/srcedtw.hxx
sw/source/uibase/inc/unotools.hxx
sw/source/uibase/utlui/navipi.cxx
sw/source/uibase/utlui/unotools.cxx
vcl/backendtest/VisualBackendTest.cxx
vcl/inc/svdata.hxx
vcl/inc/unx/gtk/gtksalmenu.hxx
vcl/source/app/svapp.cxx
vcl/source/edit/texteng.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/paint.cxx
vcl/source/window/syswin.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/window.cxx
vcl/unx/generic/print/genprnpsp.cxx
vcl/unx/gtk/gtksalmenu.cxx
Change-Id: I40c4167b1493997b7f136add4dad2f4ff5504b69
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 3db0fc673d2f..12b1679418ce 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -352,11 +352,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent FormulaDlg_Impl::~FormulaDlg_Impl() { - if(aIdle.IsActive()) + if (aIdle.IsActive()) { - aIdle.SetIdleHdl(Link<Idle *, void>()); + aIdle.ClearInvokeHandler(); aIdle.Stop(); - }// if(aIdle.IsActive()) + } bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus. m_pTabCtrl->RemovePage(TP_FUNCTION); @@ -1803,7 +1803,7 @@ void FormulaDlg::Update() { m_pImpl->Update(); m_pImpl->aIdle.SetPriority(TaskPriority::LOWER); - m_pImpl->aIdle.SetIdleHdl(LINK( this, FormulaDlg, UpdateFocusHdl)); + m_pImpl->aIdle.SetInvokeHandler(LINK( this, FormulaDlg, UpdateFocusHdl)); m_pImpl->aIdle.Start(); } @@ -1877,7 +1877,7 @@ void FormulaDlg::SetEdSelection() m_pImpl->SetEdSelection(); } -IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Timer *, void) { FormEditData* pData = m_pImpl->m_pHelper->getFormEditData(); if (!pData) diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 8cd90f468647..acd552f6f402 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -433,7 +433,7 @@ RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits , pAnyRefDlg( nullptr ) , pLabelWidget(pShrinkModeLabel) { - aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) ); + aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); aIdle.SetPriority( TaskPriority::LOW ); } @@ -444,8 +444,8 @@ RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, , pAnyRefDlg( pParent ) , pLabelWidget(pShrinkModeLabel) { - aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) ); - aIdle.SetPriority( SchedulerPriority::LOW ); + aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); + aIdle.SetPriority( TaskPriority::LOW ); } VCL_BUILDER_DECL_FACTORY(RefEdit) @@ -461,7 +461,7 @@ RefEdit::~RefEdit() void RefEdit::dispose() { - aIdle.SetIdleHdl( Link<Idle *, void>() ); + aIdle.ClearInvokeHandler(); aIdle.Stop(); pLabelWidget.clear(); Edit::dispose(); @@ -513,12 +513,12 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel if( pDlg ) { - aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) ); + aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); aIdle.SetPriority( TaskPriority::LOW ); } else { - aIdle.SetIdleHdl( Link<Idle *, void>() ); + aIdle.ClearInvokeHandler(); aIdle.Stop(); } } @@ -552,7 +552,7 @@ void RefEdit::LoseFocus() pAnyRefDlg->HideReference(); } -IMPL_LINK_NOARG_TYPED(RefEdit, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG_TYPED(RefEdit, UpdateHdl, Timer *, void) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference( GetText() ); |