diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
| commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
| tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /sw/source/uibase/utlui | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'sw/source/uibase/utlui')
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f5a63c3dcab1..36ab74aa71a4 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2446,10 +2446,10 @@ void SwContentTree::HideTree() // No idle with focus or while dragging. -IMPL_LINK_NOARG(SwContentTree, TimerUpdate) +IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void) { if (IsDisposed()) - return 0; + return; // No update while drag and drop. // Query view because the Navigator is cleared too late. @@ -2490,7 +2490,6 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate) Clear(); bIsIdleClear = true; } - return 0; } DragDropMode SwContentTree::NotifyStartDrag( diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index a3fc721718d9..012a6fd02a6f 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1009,11 +1009,10 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry delete pContCopy; } -IMPL_LINK_NOARG(SwGlobalTree, Timeout) +IMPL_LINK_NOARG_TYPED(SwGlobalTree, Timeout, Timer *, void) { if(!IsDisposed() && !HasFocus() && Update( false )) Display(); - return 0; } void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) |