mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change all Idle* LINKs to be Timer*

Browse Source 
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>() ).

Change-Id: I40c4167b1493997b7f136add4dad2f4ff5504b69
This commit is contained in:
Jan-Marek Glogowski 2017-01-23 19:37:51 +01:00
parent 75d8b305bb
commit bf110d40ef
290 changed files with 491 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/inc/mediacontrol.hxx
View File

@ -69,7 +69,7 @@ private:
DECL_LINK( implVolumeHdl, Slider*, void );
DECL_LINK( implSelectHdl, ToolBox*, void );
DECL_LINK( implZoomSelectHdl, ListBox&, void );
DECL_LINK(implTimeoutHdl, Idle *, void);
DECL_LINK(implTimeoutHdl, Timer *, void);
Idle maIdle;
MediaItem maItem;

4
avmedia/source/framework/mediacontrol.cxx
View File

@ -115,7 +115,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
}
maIdle.SetPriority( TaskPriority::LOW );
maIdle.SetIdleHdl( LINK( this, MediaControl, implTimeoutHdl ) );
maIdle.SetInvokeHandler( LINK( this, MediaControl, implTimeoutHdl ) );
maIdle.Start();
}
@ -343,7 +343,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Idle *, void)
IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Timer *, void)
{
update();
}

4
avmedia/source/framework/soundhandler.cxx
View File

@ -146,7 +146,7 @@ SoundHandler::SoundHandler()
, m_bError ( false )
, m_aUpdateIdle ( "avmedia SoundHandler Update" )
{
m_aUpdateIdle.SetIdleHdl(LINK(this, SoundHandler, implts_PlayerNotify));
m_aUpdateIdle.SetInvokeHandler(LINK(this, SoundHandler, implts_PlayerNotify));
}
/*-************************************************************************************************************
@ -298,7 +298,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
@return 0 every time... it doesn't matter for us.
@threadsafe yes
*//*-*************************************************************************************************************/
IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Idle *, void)
IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void)
{
// SAFE {
::osl::ClearableMutexGuard aLock( m_aLock );

2
avmedia/source/framework/soundhandler.hxx
View File

@ -110,7 +110,7 @@ class SoundHandler : // interfaces
// private methods
private:
DECL_LINK( implts_PlayerNotify, Idle*, void );
DECL_LINK( implts_PlayerNotify, Timer*, void );
// variables
// (should be private everyway!)

2
avmedia/source/opengl/oglplayer.cxx
View File

@ -124,7 +124,7 @@ bool OGLPlayer::create( const OUString& rURL )
// Set timer
m_aTimer.SetTimeout(8); // is 125fps enough for anyone ?
m_aTimer.SetPriority(TaskPriority::LOW);
m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler));
m_aTimer.SetInvokeHandler(LINK(this,OGLPlayer,TimerHandler));
return true;
}

2
basctl/source/basicide/baside2.hxx
View File

@ -88,7 +88,7 @@ private:
SyntaxHighlighter aHighlighter;
Idle aSyntaxIdle;
std::set<sal_uInt16> aSyntaxLineTable;
DECL_LINK(SyntaxTimerHdl, Idle *, void);
DECL_LINK(SyntaxTimerHdl, Timer *, void);
// progress bar
class ProgressInfo;

4
basctl/source/basicide/baside2b.cxx
View File

@ -961,7 +961,7 @@ void EditorWindow::CreateEditEngine()
ImplSetFont();
aSyntaxIdle.SetPriority( TaskPriority::LOWER );
aSyntaxIdle.SetIdleHdl( LINK( this, EditorWindow, SyntaxTimerHdl ) );
aSyntaxIdle.SetInvokeHandler( LINK( this, EditorWindow, SyntaxTimerHdl ) );
bool bWasDoSyntaxHighlight = bDoSyntaxHighlight;
bDoSyntaxHighlight = false; // too slow for large texts...
@ -1253,7 +1253,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
}
}
IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Idle *, void)
IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Timer *, void)
{
DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );

4
basctl/source/dlged/dlged.cxx
View File

@ -218,7 +218,7 @@ DlgEditor::DlgEditor (
m_ClipboardDataFlavorsResource[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
aMarkIdle.SetPriority(TaskPriority::LOW);
aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) );
aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) );
rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );
pDlgEdPage->SetSize( rWindow.PixelToLogic( Size(DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN) ) );
@ -574,7 +574,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
}
IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Idle *, void)
IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Timer *, void)
{
rLayout.UpdatePropertyBrowser();
}

2
basctl/source/dlged/dlgedfunc.cxx
View File

@ -80,7 +80,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
rParent(rParent_)
{
aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
aScrollTimer.SetInvokeHandler( LINK( this, DlgEdFunc, ScrollTimeout ) );
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
}

2
basctl/source/inc/dlged.hxx
View File

@ -102,7 +102,7 @@ public:
};
private:
DECL_LINK(MarkTimeout, Idle *, void);
DECL_LINK(MarkTimeout, Timer *, void);
static void Print( Printer* pPrinter, const OUString& rTitle );

2
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
View File

@ -32,7 +32,7 @@ TimerTriggeredControllerLock::TimerTriggeredControllerLock( const uno::Reference
, m_aTimer()
{
m_aTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
m_aTimer.SetTimeoutHdl( LINK( this, TimerTriggeredControllerLock, TimerTimeout ) );
m_aTimer.SetInvokeHandler( LINK( this, TimerTriggeredControllerLock, TimerTimeout ) );
}
TimerTriggeredControllerLock::~TimerTriggeredControllerLock()
{

2
chart2/source/controller/main/ChartController.cxx
View File

@ -122,7 +122,7 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
[this]() { return this->GetContextName(); },
this, vcl::EnumContext::Context::Cell))
{
m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) );
m_aDoubleClickTimer.SetInvokeHandler( LINK( this, ChartController, DoubleClickWaitingHdl ) );
}
ChartController::~ChartController()

4
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@ -559,7 +559,7 @@ GL3DBarChart::GL3DBarChart(
mbAutoFly = atoi(aAutoFly);
}
maIdle.SetPriority(TaskPriority::REPAINT);
maIdle.SetIdleHdl(LINK(this, GL3DBarChart, UpdateTimerHdl));
maIdle.SetInvokeHandler(LINK(this, GL3DBarChart, UpdateTimerHdl));
maIdle.SetDebugName( "charttypes::GL3DBarChart maIdle" );
maIdle.Start();
osl_getSystemTime(&maFPSRenderStartTime);
@ -1471,7 +1471,7 @@ void GL3DBarChart::processAutoFly(sal_uInt32 nId, sal_uInt32 nColor)
}
}
IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl, Idle *, void)
IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl, Timer *, void)
{
updateScreenText();
maIdle.Start();

2
chart2/source/view/inc/GL3DBarChart.hxx
View File

@ -100,7 +100,7 @@ private:
void updateScreenText();
void updateRenderFPS();
void updateDataUpdateFPS();
DECL_LINK(UpdateTimerHdl, Idle*, void);
DECL_LINK(UpdateTimerHdl, Timer*, void);
static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime);
float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag,
const glm::vec4& rColor,

2
chart2/source/view/main/ChartView.cxx
View File

@ -3289,7 +3289,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize )
if(maTimeBased.bTimeBased && maTimeBased.eMode != MANUAL && !maTimeBased.maTimer.IsActive())
{
maTimeBased.maTimer.SetTimeout(15);
maTimeBased.maTimer.SetTimeoutHdl(LINK(this, ChartView, UpdateTimeBased));
maTimeBased.maTimer.SetInvokeHandler(LINK(this, ChartView, UpdateTimeBased));
maTimeBased.maTimer.Start();
}
}

2
cui/source/customize/selector.cxx
View File

@ -84,7 +84,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits
// Timer for the BallonHelp
aTimer.SetTimeout( 200 );
aTimer.SetTimeoutHdl(
aTimer.SetInvokeHandler(
LINK( this, SvxConfigFunctionListBox, TimerHdl ) );
}

2
cui/source/dialogs/cuifmsearch.cxx
View File

@ -269,7 +269,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText);
// initial
m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint));
m_aDelayedPaint.SetInvokeHandler(LINK(this, FmSearchDialog, OnDelayedPaint));
m_aDelayedPaint.SetTimeout(500);
EnableSearchUI(true);

6
cui/source/dialogs/cuigaldlg.cxx
View File

@ -449,7 +449,7 @@ short ActualizeProgress::Execute()
short nRet;
pIdle = new Idle("ActualizeProgressTimeout");
pIdle->SetIdleHdl( LINK( this, ActualizeProgress, TimeoutHdl ) );
pIdle->SetInvokeHandler( LINK( this, ActualizeProgress, TimeoutHdl ) );
pIdle->SetPriority( TaskPriority::LOWEST );
pIdle->Start();
@ -466,7 +466,7 @@ IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn, Button*, void)
}
IMPL_LINK( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer, void)
{
if ( _pTimer )
{
@ -738,7 +738,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
{
pData = _pData;
aPreviewTimer.SetTimeoutHdl( LINK( this, TPGalleryThemeProperties, PreviewTimerHdl ) );
aPreviewTimer.SetInvokeHandler( LINK( this, TPGalleryThemeProperties, PreviewTimerHdl ) );
aPreviewTimer.SetTimeout( 500 );
m_pBtnSearch->SetClickHdl(LINK(this, TPGalleryThemeProperties, ClickSearchHdl));
m_pBtnTake->SetClickHdl(LINK(this, TPGalleryThemeProperties, ClickTakeHdl));

2
cui/source/dialogs/cuigrfflt.cxx
View File

@ -138,7 +138,7 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
{
bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
maTimer.SetTimeoutHdl( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) );
maTimer.SetInvokeHandler( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) );
maTimer.SetTimeout( 5 );
get(mpPreview, "preview");

2
cui/source/dialogs/hldoctp.cxx
View File

@ -72,7 +72,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
m_pCbbPath->SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) );
maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
maTimer.SetInvokeHandler ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
}
SvxHyperlinkDocTp::~SvxHyperlinkDocTp()

2
cui/source/dialogs/hlinettp.cxx
View File

@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
m_pEdLogin->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
m_pCbbTarget->SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
m_pCbbTarget->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
maTimer.SetInvokeHandler ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
}
SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp()

4
cui/source/dialogs/linkdlg.cxx
View File

@ -123,7 +123,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
m_pTbLinks->Resize(); // OS: hack for correct selection
// UpdateTimer for DDE-/Grf-links, which are waited for
aUpdateIdle.SetIdleHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateIdle.SetInvokeHandler( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateIdle.SetPriority( TaskPriority::LOWEST );
m_pPbOpenSource->Hide();
@ -501,7 +501,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
}
}
IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void )
IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, void )
{
m_pTbLinks->SetUpdateMode(false);
for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; )

4
cui/source/dialogs/thesdlg.cxx
View File

@ -63,7 +63,7 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
{
EnableAutoSize(true);
m_aModifyIdle.SetIdleHdl( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) );
m_aModifyIdle.SetInvokeHandler( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) );
m_aModifyIdle.SetPriority( TaskPriority::LOWEST );
EnableAutocomplete( false );
@ -92,7 +92,7 @@ void LookUpComboBox::Modify()
m_aModifyIdle.Start();
}
IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Idle *, void )
IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Timer *, void )
{
m_pDialog->LookUp( GetText() );
m_aModifyIdle.Stop();

2
cui/source/inc/backgrnd.hxx
View File

@ -131,7 +131,7 @@ private:
bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
void ResetFromWallpaperItem( const SfxItemSet& rSet );
DECL_LINK( LoadIdleHdl_Impl, Idle*, void );
DECL_LINK( LoadIdleHdl_Impl, Timer*, void );
DECL_LINK(SelectHdl_Impl, ListBox&, void );
DECL_LINK(BrowseHdl_Impl, Button*, void);
DECL_LINK( RadioClickHdl_Impl, Button*, void );

2
cui/source/inc/chardlg.hxx
View File

@ -133,7 +133,7 @@ private:
void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
DECL_LINK( UpdateHdl_Impl, Idle *, void );
DECL_LINK( UpdateHdl_Impl, Timer *, void );
DECL_LINK( FontModifyEditHdl_Impl, Edit&, void );
DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void );
DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void );

2
cui/source/inc/cuigaldlg.hxx
View File

@ -157,7 +157,7 @@ private:
GalleryProgress aStatusProgress;
DECL_LINK( ClickCancelBtn, Button*, void );
DECL_LINK( TimeoutHdl, Idle*, void );
DECL_LINK( TimeoutHdl, Timer*, void );
DECL_LINK( ActualizeHdl, const INetURLObject&, void );
public:

2
cui/source/inc/linkdlg.hxx
View File

@ -71,7 +71,7 @@ class SvBaseLinksDlg : public ModalDialog
DECL_LINK( UpdateNowClickHdl, Button *, void);
DECL_LINK( ChangeSourceClickHdl, Button *, void );
DECL_LINK( BreakLinkClickHdl, Button *, void );
DECL_LINK( UpdateWaitingHdl, Idle *, void );
DECL_LINK( UpdateWaitingHdl, Timer *, void );
DECL_LINK( EndEditHdl, sfx2::SvBaseLink&, void );
sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos );
OUString ImplGetStateStr( const sfx2::SvBaseLink& );

2
cui/source/inc/macroass.hxx
View File

@ -43,7 +43,7 @@ class SfxMacroTabPage : public SfxTabPage
DECL_LINK( AssignDeleteHdl_Impl, SvTreeListBox*, bool );
DECL_LINK( AssignDeleteClickHdl_Impl, Button *, void );
bool AssignDeleteHdl(Control *);
DECL_LINK( TimeOut_Impl, Idle*, void );
DECL_LINK( TimeOut_Impl, Timer*, void );
protected:
std::unique_ptr<SfxMacroTabPage_Impl> mpImpl;

2
cui/source/inc/thesdlg.hxx
View File

@ -45,7 +45,7 @@ public:
virtual ~LookUpComboBox() override;
virtual void dispose() override;
DECL_LINK( ModifyTimer_Hdl, Idle *, void );
DECL_LINK( ModifyTimer_Hdl, Timer *, void );
void init(SvxThesaurusDialog *pDialog);

4
cui/source/options/optjava.cxx
View File

@ -185,7 +185,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
m_pAddBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) );
m_pParameterBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ParameterHdl_Impl ) );
m_pClassPathBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ClassPathHdl_Impl ) );
m_aResetIdle.SetIdleHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
m_aResetIdle.SetInvokeHandler( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
m_aResetIdle.SetPriority(TaskPriority::LOWER);
m_pExpertConfigBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ExpertConfigHdl_Impl) );
@ -390,7 +390,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void)
}
IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void)
IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Timer *, void)
{
LoadJREs();
}

2
cui/source/options/optjava.hxx
View File

@ -90,7 +90,7 @@ private:
DECL_LINK( AddHdl_Impl, Button*, void);
DECL_LINK( ParameterHdl_Impl, Button*, void);
DECL_LINK( ClassPathHdl_Impl, Button*, void);
DECL_LINK( ResetHdl_Impl, Idle *, void);
DECL_LINK( ResetHdl_Impl, Timer *, void);
DECL_LINK( StartFolderPickerHdl, void *, void );
DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );

6
cui/source/tabpages/backgrnd.cxx
View File

@ -625,8 +625,6 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
In this case the condition of the preview button is saved.
*/
void SvxBackgroundTabPage::FillUserData()
{
SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') );
}
@ -954,7 +952,7 @@ void SvxBackgroundTabPage::ShowSelector()
// delayed loading via timer (because of UI-Update)
pPageImpl->pLoadIdle = new Idle("DelayedLoad");
pPageImpl->pLoadIdle->SetPriority( TaskPriority::LOWEST );
pPageImpl->pLoadIdle->SetIdleHdl(
pPageImpl->pLoadIdle->SetInvokeHandler(
LINK( this, SvxBackgroundTabPage, LoadIdleHdl_Impl ) );
bAllowShowSelector = false;
@ -1255,7 +1253,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void)
Graphic is only loaded, if it's
different to the current graphic.
*/
IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void )
IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Timer*, pIdle, void )
{
if ( pIdle == pPageImpl->pLoadIdle )
{

4
cui/source/tabpages/chardlg.cxx
View File

@ -428,7 +428,7 @@ void SvxCharNamePage::Initialize()
m_pCTLFontSizeLB->SetModifyHdl( aLink );
m_pCTLFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyListBoxHdl_Impl ) );
m_pImpl->m_aUpdateIdle.SetIdleHdl( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
m_pImpl->m_aUpdateIdle.SetInvokeHandler( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
}
@ -1164,7 +1164,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
}
IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Idle *, void)
IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Timer *, void)
{
UpdatePreview_Impl();
}

2
cui/source/tabpages/grfpage.cxx
View File

@ -119,7 +119,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
m_pOrigSizePB->SetClickHdl( LINK(this, SvxGrfCropPage, OrigSizeHdl) );
aTimer.SetTimeoutHdl(LINK(this, SvxGrfCropPage, Timeout));
aTimer.SetInvokeHandler(LINK(this, SvxGrfCropPage, Timeout));
aTimer.SetTimeout( 1500 );
}

4
cui/source/tabpages/macroass.cxx
View File

@ -137,7 +137,7 @@ SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >
{
mpImpl.reset(new SfxMacroTabPage_Impl);
mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, SfxMacroTabPage, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetInvokeHandler( LINK( this, SfxMacroTabPage, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetPriority( TaskPriority::HIGHEST );
mpImpl->maFillGroupIdle.SetDebugName( "SfxMacroTabPage maFillGroupIdle" );
@ -363,7 +363,7 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
return false;
}
IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Timer*,, void )
{
// FillMacroList() can take a long time -> show wait cursor and disable input
SfxTabDialog* pTabDlg = GetTabDialog();

2
cui/source/tabpages/numfmt.cxx
View File

@ -363,7 +363,7 @@ void SvxNumberFormatTabPage::Init_Impl()
UpdateDecimalsDenominatorEditBox();
m_pEdComment->SetLoseFocusHdl( LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl) );
aResetWinTimer.SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
aResetWinTimer.SetInvokeHandler(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
aResetWinTimer.SetTimeout( 10);
// initialize language ListBox

2
cui/source/tabpages/numpages.cxx
View File

@ -1162,7 +1162,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
m_pSameLevelCB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, SameLevelHdl_Impl));
m_pBulRelSizeMF->SetModifyHdl(LINK(this,SvxNumOptionsTabPage, BulRelSizeHdl_Impl));
m_pBulColLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, BulColorHdl_Impl));
aInvalidateTimer.SetTimeoutHdl(LINK(this, SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl));
aInvalidateTimer.SetInvokeHandler(LINK(this, SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl));
aInvalidateTimer.SetTimeout(50);
Menu *pBitmapMenu = m_pBitmapMB->GetPopupMenu();

2
dbaccess/source/ui/browser/brwctrlr.cxx
View File

@ -552,7 +552,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::
}
osl_atomic_decrement(&m_refCount);
m_aInvalidateClipboard.SetTimeoutHdl(LINK(this, SbaXDataBrowserController, OnInvalidateClipboard));
m_aInvalidateClipboard.SetInvokeHandler(LINK(this, SbaXDataBrowserController, OnInvalidateClipboard));
m_aInvalidateClipboard.SetTimeout(300);
}

2
dbaccess/source/ui/control/dbtreelistbox.cxx
View File

@ -72,7 +72,7 @@ void DBTreeListBox::init()
SetSpaceBetweenEntries(nSize);
m_aTimer.SetTimeout(900);
m_aTimer.SetTimeoutHdl(LINK(this, DBTreeListBox, OnTimeOut));
m_aTimer.SetInvokeHandler(LINK(this, DBTreeListBox, OnTimeOut));
m_aScrollHelper.setUpScrollMethod( LINK(this, DBTreeListBox, ScrollUpHdl) );
m_aScrollHelper.setDownScrollMethod( LINK(this, DBTreeListBox, ScrollDownHdl) );

4
dbaccess/source/ui/control/sqledit.cxx
View File

@ -75,10 +75,10 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent ) :
SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) );
m_timerUndoActionCreation.SetTimeout(1000);
m_timerUndoActionCreation.SetTimeoutHdl(LINK(this, OSqlEdit, OnUndoActionTimer));
m_timerUndoActionCreation.SetInvokeHandler(LINK(this, OSqlEdit, OnUndoActionTimer));
m_timerInvalidate.SetTimeout(200);
m_timerInvalidate.SetTimeoutHdl(LINK(this, OSqlEdit, OnInvalidateTimer));
m_timerInvalidate.SetInvokeHandler(LINK(this, OSqlEdit, OnInvalidateTimer));
m_timerInvalidate.Start();
ImplSetFont();

2
dbaccess/source/ui/dlg/paramdialog.cxx
View File

@ -104,7 +104,7 @@ namespace dbaui
Construct();
m_aResetVisitFlag.SetTimeoutHdl(LINK(this, OParameterDialog, OnVisitedTimeout));
m_aResetVisitFlag.SetInvokeHandler(LINK(this, OParameterDialog, OnVisitedTimeout));
}
OParameterDialog::~OParameterDialog()

2
dbaccess/source/ui/inc/JoinTableView.hxx
View File

@ -103,7 +103,7 @@ namespace dbaui
bool m_bTrackingInitiallyMoved;
DECL_LINK(OnDragScrollTimer, Idle*, void);
DECL_LINK(OnDragScrollTimer, Timer*, void);
protected:
VclPtr<OTableWindow> m_pLastFocusTabWin;

4
dbaccess/source/ui/querydesign/JoinTableView.cxx
View File

@ -174,7 +174,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
InitColors();
m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
m_aDragScrollIdle.SetInvokeHandler(LINK(this, OJoinTableView, OnDragScrollTimer));
}
OJoinTableView::~OJoinTableView()
@ -1073,7 +1073,7 @@ void OJoinTableView::ScrollWhileDragging()
ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow );
}
IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Idle *, void)
IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Timer *, void)
{
ScrollWhileDragging();
}

2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
View File

@ -146,7 +146,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
m_bVisibleRow[BROW_FUNCTION_ROW] = false; // first hide
m_timerInvalidate.SetTimeout(200);
m_timerInvalidate.SetTimeoutHdl(LINK(this, OSelectionBrowseBox, OnInvalidateTimer));
m_timerInvalidate.SetInvokeHandler(LINK(this, OSelectionBrowseBox, OnInvalidateTimer));
m_timerInvalidate.Start();
}

4
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
View File

@ -242,7 +242,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
if( !m_aScrollTimer.IsActive() )
{
m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) );
m_aScrollTimer.SetInvokeHandler( LINK(this, OTableWindowListBox, ScrollUpHdl) );
ScrollUpHdl( nullptr );
}
}
@ -252,7 +252,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
if( !m_aScrollTimer.IsActive() )
{
m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) );
m_aScrollTimer.SetInvokeHandler( LINK(this, OTableWindowListBox, ScrollDownHdl) );
ScrollDownHdl( nullptr );
}
}

2
dbaccess/source/ui/tabledesign/TEditControl.cxx
View File

@ -78,7 +78,7 @@ OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(OTableEditorCtrl* _
{
m_aInvalidateTimer.SetTimeout(500);
m_aInvalidateTimer.SetTimeoutHdl(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
m_aInvalidateTimer.SetInvokeHandler(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
m_aInvalidateTimer.Start();
}

4
desktop/source/app/app.cxx
View File

@ -528,7 +528,7 @@ Desktop::Desktop()
, m_aBootstrapStatus(BS_OK)
{
m_firstRunTimer.SetTimeout(3000); // 3 sec.
m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.SetInvokeHandler(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.SetDebugName( "desktop::Desktop m_firstRunTimer" );
}
@ -2583,7 +2583,7 @@ void Desktop::CloseSplashScreen()
}
IMPL_STATIC_LINK(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
IMPL_STATIC_LINK_NOARG(Desktop, AsyncInitFirstRun, Timer *, void)
{
// does initializations which are necessary for the first run of the office
try

8
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View File

@ -522,7 +522,7 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager,
#endif
m_aIdle.SetPriority(TaskPriority::LOWEST);
m_aIdle.SetIdleHdl( LINK( this, ExtMgrDialog, TimeOutHdl ) );
m_aIdle.SetInvokeHandler( LINK( this, ExtMgrDialog, TimeOutHdl ) );
}
@ -948,7 +948,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, Button*, void)
#endif
}
IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Idle *, void)
IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Timer *, void)
{
if ( m_bStopProgress )
{
@ -1066,7 +1066,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan
m_pCloseBtn->GrabFocus();
m_aIdle.SetPriority( TaskPriority::LOWEST );
m_aIdle.SetIdleHdl( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
m_aIdle.SetInvokeHandler( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
}
UpdateRequiredDialog::~UpdateRequiredDialog()
@ -1258,7 +1258,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn, Button*, void)
}
IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Idle *, void)
IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Timer *, void)
{
if ( m_bStopProgress )
{

4
desktop/source/deployment/gui/dp_gui_dialog2.hxx
View File

@ -143,7 +143,7 @@ class ExtMgrDialog : public ModelessDialog,
DECL_LINK( HandleCancelBtn, Button*, void );
DECL_LINK( HandleCloseBtn, Button*, void );
DECL_LINK( HandleExtTypeCbx, Button*, void );
DECL_LINK(TimeOutHdl, Idle *, void);
DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK( startProgress, void *, void );
DECL_STATIC_LINK( ExtMgrDialog, Restart, void *, void );
@ -216,7 +216,7 @@ class UpdateRequiredDialog : public ModalDialog,
DECL_LINK( HandleUpdateBtn, Button*, void );
DECL_LINK( HandleCloseBtn, Button*, void );
DECL_LINK( HandleCancelBtn, Button*, void );
DECL_LINK(TimeOutHdl, Idle *, void);
DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK( startProgress, void *, void );
static bool isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage );

2
editeng/source/editeng/impedit.hxx
View File

@ -676,7 +676,7 @@ private:
inline void EraseVirtualDevice() { pVirtDev.disposeAndClear(); }
DECL_LINK( StatusTimerHdl, Timer *, void);
DECL_LINK( IdleFormatHdl, Idle *, void);
DECL_LINK( IdleFormatHdl, Timer *, void);
DECL_LINK( OnlineSpellHdl, Timer *, void);
DECL_LINK( DocModified, LinkParamNone*, void );

6
editeng/source/editeng/impedit2.cxx
View File

@ -145,15 +145,15 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
aSelEngine.SetFunctionSet( &aSelFuncSet );
aStatusTimer.SetTimeout( 200 );
aStatusTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, StatusTimerHdl ) );
aStatusTimer.SetInvokeHandler( LINK( this, ImpEditEngine, StatusTimerHdl ) );
aStatusTimer.SetDebugName( "editeng::ImpEditEngine aStatusTimer" );
aIdleFormatter.SetPriority( TaskPriority::REPAINT );
aIdleFormatter.SetIdleHdl( LINK( this, ImpEditEngine, IdleFormatHdl ) );
aIdleFormatter.SetInvokeHandler( LINK( this, ImpEditEngine, IdleFormatHdl ) );
aIdleFormatter.SetDebugName( "editeng::ImpEditEngine aIdleFormatter" );
aOnlineSpellTimer.SetTimeout( 100 );
aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
aOnlineSpellTimer.SetInvokeHandler( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
aOnlineSpellTimer.SetDebugName( "editeng::ImpEditEngine aOnlineSpellTimer" );
// Access data already from here on!

2
editeng/source/editeng/impedit3.cxx
View File

@ -311,7 +311,7 @@ IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl, Timer *, void)
aOnlineSpellTimer.Start();
}
IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Idle *, void)
IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Timer *, void)
{
aIdleFormatter.ResetRestarts();

4
extensions/source/bibliography/bibcont.cxx
View File

@ -120,7 +120,7 @@ BibBookContainer::BibBookContainer(vcl::Window* pParent):
aIdle("extensions BibBookContainer Split Idle")
{
pBibMod = OpenBibModul();
aIdle.SetIdleHdl(LINK( this, BibBookContainer, SplitHdl));
aIdle.SetInvokeHandler(LINK( this, BibBookContainer, SplitHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
}
@ -160,7 +160,7 @@ void BibBookContainer::Split()
{
aIdle.Start();
}
IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Idle*, void)
IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void)
{
long nSize= GetItemSize( TOP_WINDOW);
BibConfig* pConfig = BibModul::GetConfig();

2
extensions/source/bibliography/bibcont.hxx
View File

@ -72,7 +72,7 @@ class BibBookContainer: public BibSplitWindow
HdlBibModul pBibMod;
Idle aIdle;
DECL_LINK( SplitHdl, Idle*, void );
DECL_LINK( SplitHdl, Timer*, void );
protected:

4
extensions/source/bibliography/toolbar.cxx
View File

@ -201,7 +201,7 @@ BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink)
SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
aIdle.SetIdleHdl(LINK( this, BibToolBar, SendSelHdl));
aIdle.SetInvokeHandler(LINK( this, BibToolBar, SendSelHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
SetDropdownClickHdl( LINK( this, BibToolBar, MenuHdl));
@ -471,7 +471,7 @@ IMPL_LINK_NOARG( BibToolBar, SelHdl, ListBox&, void )
aIdle.Start();
}
IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Idle*, void )
IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Timer*, void )
{
Sequence<PropertyValue> aPropVal(1);
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());

2
extensions/source/bibliography/toolbar.hxx
View File

@ -134,7 +134,7 @@ class BibToolBar: public ToolBox
BibDataManager* pDatMan;
DECL_LINK( SelHdl, ListBox&, void );
DECL_LINK( SendSelHdl, Idle*, void );
DECL_LINK( SendSelHdl, Timer*, void );
DECL_LINK( MenuHdl, ToolBox*, void );
DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void );
DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void );

8
extensions/source/update/ui/updatecheckui.cxx
View File

@ -140,7 +140,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper
private:
DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
DECL_LINK(WaitTimeOutHdl, Idle *, void);
DECL_LINK(WaitTimeOutHdl, Timer *, void);
DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK(UserEventHdl, void *, void);
DECL_LINK(WindowEventHdl, VclWindowEvent&, void);
@ -207,10 +207,10 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
maBubbleImage = GetBubbleImage( maBubbleImageURL );
maWaitIdle.SetPriority( TaskPriority::LOWEST );
maWaitIdle.SetIdleHdl( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
maWaitIdle.SetInvokeHandler( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
maTimeoutTimer.SetTimeout( 10000 );
maTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateCheckUI, TimeOutHdl ) );
maTimeoutTimer.SetInvokeHandler( LINK( this, UpdateCheckUI, TimeOutHdl ) );
uno::Reference< document::XDocumentEventBroadcaster > xBroadcaster( frame::theGlobalEventBroadcaster::get(m_xContext) );
xBroadcaster->addDocumentEventListener( this );
@ -601,7 +601,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rDat
}
IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void)
IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Timer *, void)
{
SolarMutexGuard aGuard;

2
forms/source/component/DatabaseForm.cxx
View File

@ -2534,7 +2534,7 @@ void ODatabaseForm::impl_createLoadTimer()
OSL_PRECOND( m_pLoadTimer == nullptr, "ODatabaseForm::impl_createLoadTimer: timer already exists!" );
m_pLoadTimer = new Timer("DatabaseFormLoadTimer");
m_pLoadTimer->SetTimeout(100);
m_pLoadTimer->SetTimeoutHdl(LINK(this,ODatabaseForm,OnTimeout));
m_pLoadTimer->SetInvokeHandler(LINK(this,ODatabaseForm,OnTimeout));
}

4
forms/source/component/ListBox.cxx
View File

@ -1799,7 +1799,7 @@ namespace frm
doSetDelegator();
m_aChangeIdle.SetPriority(TaskPriority::LOWEST);
m_aChangeIdle.SetIdleHdl(LINK(this,OListBoxControl,OnTimeout));
m_aChangeIdle.SetInvokeHandler(LINK(this,OListBoxControl,OnTimeout));
}
@ -1984,7 +1984,7 @@ namespace frm
}
IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Idle*, void)
IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Timer*, void)
{
m_aChangeListeners.notifyEach( &XChangeListener::changed, EventObject( *this ) );
}

2
forms/source/component/ListBox.hxx
View File

@ -327,7 +327,7 @@ protected:
virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override;
private:
DECL_LINK( OnTimeout, Idle*, void );
DECL_LINK( OnTimeout, Timer*, void );
};

10
formula/source/ui/dlg/formula.cxx
View File

@ -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);
@ -1802,7 +1802,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();
}
@ -1876,7 +1876,7 @@ void FormulaDlg::SetEdSelection()
m_pImpl->SetEdSelection();
}
IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Idle *, void)
IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Timer *, void)
{
FormEditData* pData = m_pImpl->m_pHelper->getFormEditData();
if (!pData)

10
formula/source/ui/dlg/funcutl.cxx
View File

@ -408,7 +408,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 );
}
@ -425,7 +425,7 @@ RefEdit::~RefEdit()
void RefEdit::dispose()
{
aIdle.SetIdleHdl( Link<Idle *, void>() );
aIdle.ClearInvokeHandler();
aIdle.Stop();
pLabelWidget.clear();
Edit::dispose();
@ -477,12 +477,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();
}
}
@ -516,7 +516,7 @@ void RefEdit::LoseFocus()
pAnyRefDlg->HideReference();
}
IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void)
IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void)
{
if( pAnyRefDlg )
pAnyRefDlg->ShowReference( GetText() );

2
fpicker/source/office/iodlg.cxx
View File

@ -690,7 +690,7 @@ void SvtFileDialog::Init_Impl
// set timer for the filterbox travel
pImpl->_aFilterTimer.SetTimeout( TRAVELFILTER_TIMEOUT );
pImpl->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) );
pImpl->_aFilterTimer.SetInvokeHandler( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) );
if ( PickerFlags::SaveAs & nStyle )
{

2
framework/source/layoutmanager/layoutmanager.cxx
View File

@ -139,7 +139,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
}
m_aAsyncLayoutTimer.SetTimeout( 50 );
m_aAsyncLayoutTimer.SetTimeoutHdl( LINK( this, LayoutManager, AsyncLayoutHdl ) );
m_aAsyncLayoutTimer.SetInvokeHandler( LINK( this, LayoutManager, AsyncLayoutHdl ) );
m_aAsyncLayoutTimer.SetDebugName( "framework::LayoutManager m_aAsyncLayoutTimer" );
registerProperty( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS, LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS, css::beans::PropertyAttribute::TRANSIENT, &m_bAutomaticToolbars, cppu::UnoType<decltype(m_bAutomaticToolbars)>::get() );

2
framework/source/services/autorecovery.cxx
View File

@ -1255,7 +1255,7 @@ void AutoRecovery::initListeners()
// establish callback for our internal used timer.
// Note: Its only active, if the timer will be started ...
SolarMutexGuard g;
m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired));
m_aTimer.SetInvokeHandler(LINK(this, AutoRecovery, implts_timerExpired));
}
AutoRecovery::~AutoRecovery()

2
framework/source/uielement/menubarmanager.cxx
View File

@ -945,7 +945,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu, bool )
// Start timer to handle settings asynchronous
// Changing the menu inside this handler leads to
// a crash under X!
m_aAsyncSettingsTimer.SetTimeoutHdl(LINK(this, MenuBarManager, AsyncSettingsHdl));
m_aAsyncSettingsTimer.SetInvokeHandler(LINK(this, MenuBarManager, AsyncSettingsHdl));
m_aAsyncSettingsTimer.SetTimeout(10);
m_aAsyncSettingsTimer.Start();
}

2
framework/source/uielement/toolbarmanager.cxx
View File

@ -192,7 +192,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_pToolBar->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
m_aAsyncUpdateControllersTimer.SetInvokeHandler( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
m_aAsyncUpdateControllersTimer.SetDebugName( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" );
SvtMiscOptions().AddListenerLink( LINK( this, ToolBarManager, MiscOptionsChanged ) );

2
include/formula/formula.hxx
View File

@ -107,7 +107,7 @@ public:
private:
::std::unique_ptr<FormulaDlg_Impl> m_pImpl;
DECL_LINK( UpdateFocusHdl, Idle*, void );
DECL_LINK( UpdateFocusHdl, Timer*, void );
protected:
void disableOk();

2
include/formula/funcutl.hxx
View File

@ -47,7 +47,7 @@ private:
IControlReferenceHandler* pAnyRefDlg; // parent dialog
VclPtr<vcl::Window> pLabelWidget;
DECL_LINK( UpdateHdl, Idle*, void );
DECL_LINK( UpdateHdl, Timer*, void );
protected:
virtual void KeyInput( const KeyEvent& rKEvt ) override;

4
include/sfx2/basedlgs.hxx
View File

@ -105,7 +105,7 @@ public:
SfxBindings& GetBindings()
{ return *pBindings; }
DECL_LINK(TimerHdl, Idle *, void);
DECL_LINK(TimerHdl, Timer *, void);
};
@ -145,7 +145,7 @@ public:
virtual void FillInfo(SfxChildWinInfo&) const;
void Initialize (SfxChildWinInfo* pInfo);
DECL_LINK(TimerHdl, Idle *, void);
DECL_LINK(TimerHdl, Timer *, void);
};

4
include/sfx2/dinfdlg.hxx
View File

@ -420,8 +420,8 @@ private:
DECL_LINK( BoxLoseFocusHdl, Control&, void );
//add lose focus handlers of Date/TimeField?
DECL_LINK(EditTimeoutHdl, Idle *, void);
DECL_LINK(BoxTimeoutHdl, Idle *, void);
DECL_LINK(EditTimeoutHdl, Timer *, void);
DECL_LINK(BoxTimeoutHdl, Timer *, void);
bool IsLineValid( CustomPropertyLine* pLine ) const;
void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox );

2
include/sfx2/dispatch.hxx
View File

@ -91,7 +91,7 @@ friend class SfxStateCache;
friend class SfxPopupMenuManager;
friend class SfxHelp;
DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void );
DECL_DLLPRIVATE_LINK( EventHdl_Impl, Timer *, void );
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void );
SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );

2
include/sfx2/dockwin.hxx
View File

@ -99,7 +99,7 @@ public:
void SetMinOutputSizePixel( const Size& rSize );
const Size& GetMinOutputSizePixel() const;
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
DECL_LINK(TimerHdl, Idle *, void);
DECL_LINK(TimerHdl, Timer *, void);
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );

3
include/svtools/asynclink.hxx
View File

@ -26,6 +26,7 @@
#include <osl/mutex.hxx>
class Idle;
class Timer;
struct ImplSVEvent;
namespace svtools {
@ -40,7 +41,7 @@ class SVT_DLLPUBLIC AsynchronLink
void* _pArg;
::osl::Mutex* _pMutex;
DECL_DLLPRIVATE_LINK( HandleCall_Idle, Idle*, void );
DECL_DLLPRIVATE_LINK( HandleCall_Idle, Timer*, void );
DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void*, void );
SVT_DLLPRIVATE void Call_Impl( void* pArg );

2
include/svtools/filechangedchecker.hxx
View File

@ -32,7 +32,7 @@ private:
::std::function<void ()> mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
DECL_LINK(TimerHandler, Idle *, void);
DECL_LINK(TimerHandler, Timer *, void);
public:
void resetTimer();

2
include/svtools/treelistbox.hxx
View File

@ -790,7 +790,7 @@ class SvInplaceEdit2
bool bAlreadyInCallBack;
void CallCallBackHdl_Impl();
DECL_LINK( Timeout_Impl, Idle *, void );
DECL_LINK( Timeout_Impl, Timer *, void );
DECL_LINK( ReturnHdl_Impl, Accelerator&, void );
DECL_LINK( EscapeHdl_Impl, Accelerator&, void );

2
include/svtools/wizdlg.hxx
View File

@ -203,7 +203,7 @@ private:
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Timer*, void );
protected:
long LogicalCoordinateToPixel(int iCoordinate);

2
include/svx/fontwork.hxx
View File

@ -147,7 +147,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
DECL_LINK( SelectShadowHdl_Impl, ToolBox *, void );
DECL_LINK( ModifyInputHdl_Impl, Edit&, void );
DECL_LINK( InputTimoutHdl_Impl, Idle *, void );
DECL_LINK( InputTimoutHdl_Impl, Timer *, void );
DECL_LINK( ColorSelectHdl_Impl, SvxColorListBox&, void );

2
include/svx/graphctl.hxx
View File

@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
bool bAnim;
bool mbInIdleUpdate;
DECL_LINK( UpdateHdl, Idle*, void );
DECL_LINK( UpdateHdl, Timer*, void );
rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;

2
include/svx/imapdlg.hxx
View File

@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
DECL_LINK( URLModifyHdl, Edit&, void );
DECL_LINK( URLModifyComboBoxHdl, ComboBox&, void );
DECL_LINK( URLLoseFocusHdl, Control&, void );
DECL_LINK( UpdateHdl, Idle *, void );
DECL_LINK( UpdateHdl, Timer *, void );
DECL_LINK( StateHdl, GraphCtrl*, void );
DECL_LINK( MiscHdl, LinkParamNone*, void );

2
include/svx/modctrl.hxx
View File

@ -43,7 +43,7 @@ public:
SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
private: // Links
DECL_LINK( OnTimer, Idle *, void );
DECL_LINK( OnTimer, Timer *, void );
private: // Functions
void _repaint();

2
include/svx/numvset.hxx
View File

@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
void init();
protected:
DECL_LINK(FormatHdl_Impl, Idle *, void);
DECL_LINK(FormatHdl_Impl, Timer *, void);
public:
SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits);

2
include/svx/sidebar/PanelLayout.hxx
View File

@ -28,7 +28,7 @@ private:
Idle m_aPanelLayoutIdle;
bool m_bInClose;
DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void);
DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Timer*, void);
public:
PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,

2
include/svx/svdpntv.hxx
View File

@ -221,7 +221,7 @@ public:
private:
SVX_DLLPRIVATE void ImpClearVars();
DECL_LINK(ImpComeBackHdl, Idle*, void);
DECL_LINK(ImpComeBackHdl, Timer*, void);
protected:
sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;

2
include/vcl/dockwin.hxx
View File

@ -242,7 +242,7 @@ private:
SAL_DLLPRIVATE void ImplInitDockingWindowData();
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void );
DockingWindow (const DockingWindow &) = delete;
DockingWindow & operator= (const DockingWindow &) = delete;

13
include/vcl/idle.hxx
View File

@ -45,21 +45,8 @@ public:
Idle( const sal_Char *pDebugName = nullptr );
virtual void Start() override;
/**
* Convenience function for more readable code
*
* TODO: actually rename it and it's instances to SetInvokeHandler
*/
inline void SetIdleHdl( const Link<Idle *, void>& rLink );
};
inline void Idle::SetIdleHdl( const Link<Idle*, void> &rLink )
{
SetInvokeHandler( Link<Timer*, void>( rLink.GetInstance(),
reinterpret_cast< Link<Timer*, void>::Stub* >( rLink.GetFunction()) ) );
}
#endif // INCLUDED_VCL_IDLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
include/vcl/syswin.hxx
View File

@ -177,7 +177,7 @@ public:
private:
SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin );
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void );
protected:
// Single argument ctors shall be explicit.

2
include/vcl/texteng.hxx
View File

@ -167,7 +167,7 @@ protected:
void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
DECL_LINK( IdleFormatHdl, Idle *, void );
DECL_LINK( IdleFormatHdl, Timer *, void );
void CheckIdleFormatter();
void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 );

13
include/vcl/timer.hxx
View File

@ -57,24 +57,13 @@ public:
void Invoke( Timer *arg );
void SetInvokeHandler( const Link<Timer *, void>& rLink ) { maInvokeHandler = rLink; }
bool HasInvokeHandler() const { return maInvokeHandler.IsSet(); };
/**
* Convenience function for more readable code
*
* TODO: actually use SetInvokeHandler and drop it
*/
inline void SetTimeoutHdl( const Link<Timer *, void>& rLink );
void ClearInvokeHandler() { SetInvokeHandler( Link<Timer *, void>() ); }
void SetTimeout( sal_uInt64 nTimeoutMs );
sal_uInt64 GetTimeout() const { return mnTimeout; }
virtual void Start() override;
};
inline void Timer::SetTimeoutHdl( const Link<Timer *, void>& rLink )
{
SetInvokeHandler( rLink );
}
/// An auto-timer is a multi-shot timer re-emitting itself at
/// interval until destroyed.
class VCL_DLLPUBLIC AutoTimer : public Timer

2
include/vcl/toolbox.hxx
View File

@ -210,7 +210,7 @@ private:
SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem );
DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void*, void );
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent&, void );
DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, Timer*, void );

4
include/vcl/window.hxx
View File

@ -531,11 +531,11 @@ private:
public:
DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void*, void );
DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void*, void );
DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Timer*, void );
SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow );

4
linguistic/source/lngsvcmgr.cxx
View File

@ -448,7 +448,7 @@ LngSvcMgr::LngSvcMgr()
UpdateAll();
aUpdateIdle.SetPriority(TaskPriority::LOWEST);
aUpdateIdle.SetIdleHdl(LINK(this, LngSvcMgr, updateAndBroadcast));
aUpdateIdle.SetInvokeHandler(LINK(this, LngSvcMgr, updateAndBroadcast));
// request to be notified if an extension has been added/removed
uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
@ -496,7 +496,7 @@ void LngSvcMgr::modified(const lang::EventObject&)
//needs to be run in the main thread because
//utl::ConfigChangeListener_Impl::changesOccurred grabs the SolarMutex and we
//get notified that an extension was added from an extension manager thread
IMPL_LINK_NOARG(LngSvcMgr, updateAndBroadcast, Idle *, void)
IMPL_LINK_NOARG(LngSvcMgr, updateAndBroadcast, Timer *, void)
{
osl::MutexGuard aGuard( GetLinguMutex() );

2
linguistic/source/lngsvcmgr.hxx
View File

@ -127,7 +127,7 @@ class LngSvcMgr :
void UpdateAll();
void stopListening();
DECL_LINK( updateAndBroadcast, Idle*, void );
DECL_LINK( updateAndBroadcast, Timer*, void );
public:
LngSvcMgr();

2
reportdesign/source/ui/dlg/Navigator.cxx
View File

@ -242,7 +242,7 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll
SetSelectionMode(SelectionMode::Multiple);
Clear();
m_aDropActionTimer.SetTimeoutHdl(LINK(this, NavigatorTree, OnDropActionTimer));
m_aDropActionTimer.SetInvokeHandler(LINK(this, NavigatorTree, OnDropActionTimer));
SetSelectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
}

2
reportdesign/source/ui/inc/DesignView.hxx
View File

@ -76,7 +76,7 @@ namespace rptui
bool m_bDeleted;
DECL_LINK(MarkTimeout, Idle *, void);
DECL_LINK(MarkTimeout, Timer *, void);
DECL_LINK( SplitHdl, SplitWindow*, void );
void ImplInitSettings();

4
reportdesign/source/ui/report/DesignView.cxx
View File

@ -117,7 +117,7 @@ ODesignView::ODesignView( vcl::Window* pParent,
m_aSplitWin->Show();
m_aMarkIdle.SetPriority( TaskPriority::LOW );
m_aMarkIdle.SetIdleHdl( LINK( this, ODesignView, MarkTimeout ) );
m_aMarkIdle.SetInvokeHandler( LINK( this, ODesignView, MarkTimeout ) );
}
@ -265,7 +265,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
}
IMPL_LINK_NOARG(ODesignView, MarkTimeout, Idle *, void)
IMPL_LINK_NOARG(ODesignView, MarkTimeout, Timer *, void)
{
if ( m_pPropWin && m_pPropWin->IsVisible() )
{

2
reportdesign/source/ui/report/dlgedfunc.cxx
View File

@ -121,7 +121,7 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
, m_bUiActive(false)
, m_bShowPropertyBrowser(false)
{
aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
aScrollTimer.SetInvokeHandler( LINK( this, DlgEdFunc, ScrollTimeout ) );
m_rView.SetActualWin( m_pParent);
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
}

2
sc/inc/chartlis.hxx
View File

@ -145,7 +145,7 @@ private:
Idle aIdle;
ScDocument* pDoc;
DECL_LINK(TimerHdl, Idle *, void);
DECL_LINK(TimerHdl, Timer *, void);
ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete;

2
sc/inc/document.hxx
View File

@ -2028,7 +2028,7 @@ private:
SCCOLROW nEndCol, SCCOLROW* pTranslate,
ScProgress* pProgress, sal_uLong nProAdd );
DECL_LINK(TrackTimeHdl, Idle *, void);
DECL_LINK(TrackTimeHdl, Timer *, void);
static ScRecursionHelper* CreateRecursionHelperInstance();

2
sc/inc/scmod.hxx
View File

@ -124,7 +124,7 @@ public:
// moved by the application
DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle
DECL_LINK( SpellTimerHdl, Idle*, void );
DECL_LINK( SpellTimerHdl, Timer*, void );
DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
void Execute( SfxRequest& rReq );

Some files were not shown because too many files have changed in this diff Show More