[Libreoffice-commits] core.git: sd/source sfx2/source

[Tobias Madl]

 sd/source/ui/framework/module/ShellStackGuard.cxx |    6 +++---
 sd/source/ui/framework/module/ShellStackGuard.hxx |    2 +-
 sfx2/source/appl/newhelp.cxx                      |   15 ++++++++++-----
 sfx2/source/appl/newhelp.hxx                      |    3 ++-
 4 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit d1577ee1ed215d9d4adfcdc0a71e2cfec0f3ebda
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date:   Wed Dec 10 11:01:48 2014 +0000

    priorities: prevent future compatibility problems
    
    Change-Id: I735bac570a0bed35d9ddc07e5f107fb696b49082

diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index cf72edc..d567c20 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,12 +118,12 @@ void SAL_CALL ShellStackGuard::disposing (
         }
 }
 
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
 {
 #ifdef DEBUG
-    OSL_ASSERT(pTimer==&maPrinterPollingIdle);
+    OSL_ASSERT(pIdle==&maPrinterPollingIdle);
 #else
-    (void)pTimer;
+    (void)pIdle;
 #endif
     if (mpUpdateLock.get() != NULL)
     {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 22aaaa7..c41158c 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -86,7 +86,7 @@ private:
     ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
     Idle maPrinterPollingIdle;
 
-    DECL_LINK(TimeoutHandler, Timer*);
+    DECL_LINK(TimeoutHandler, Idle*);
 
     /** Return <TRUE/> when the printer is printing.  Return <FALSE/> when
         the printer is not printing, or there is no printer, or something
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 77265a2..cdad563 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -538,7 +538,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
 
     m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
     Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
-    aFactoryIdle.SetIdleHdl( aTimeoutLink );
+    aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
     aFactoryIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER);
     aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
 }
@@ -708,12 +708,17 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
     return 0;
 }
 
-IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
+IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle )
 {
-    if ( &aFactoryIdle == pTimer )
+    if ( &aFactoryIdle == pIdle )
         InitializeIndex();
-    else if ( &aKeywordTimer == pTimer && !sKeyword.isEmpty() )
-        aKeywordLink.Call( this );
+    return 0;
+}
+
+IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer)
+{
+    if(&aKeywordTimer == pTimer && !sKeyword.isEmpty())
+        aKeywordLink.Call(this);
     return 0;
 }
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e3f5202..95b8794 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -134,7 +134,8 @@ private:
     void                ClearIndex();
 
     DECL_LINK(OpenHdl, void *);
-    DECL_LINK(          TimeoutHdl, Timer* );
+    DECL_LINK(IdleHdl, Idle* );
+    DECL_LINK(TimeoutHdl, Timer*);
 
 public:
     IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );