[Libreoffice-commits] core.git: Branch 'feature/priorities' - editeng/source vcl/osx
Tobias Madl
tobias.madl.dev at gmail.com
Wed Dec 3 02:17:39 PST 2014
editeng/source/editeng/impedit5.cxx | 2 +-
vcl/osx/salinst.cxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 81c5c064bb2b8c54b1175585957ba4ad2f76ff36
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date: Wed Dec 3 10:16:28 2014 +0000
changed inherited timers to idle
Change-Id: I1d70d4d2fe8573d0f120f2a1ece83f504d5efde5
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 62ded41..072249f 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -798,7 +798,7 @@ void IdleFormattter::ForceTimeout()
if ( IsActive() )
{
Stop();
- ((Link&)GetTimeoutHdl()).Call( this );
+ ((Link&)GetIdleHdl()).Call( this );
}
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 26ff137..4264fcd 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -69,7 +69,7 @@ static NSMenu* pDockMenu = nil;
static bool bNoSVMain = true;
static bool bLeftMain = false;
-class AquaDelayedSettingsChanged : public Timer
+class AquaDelayedSettingsChanged : public Idle
{
bool mbInvalidate;
public:
@@ -101,9 +101,9 @@ class AquaDelayedSettingsChanged : public Timer
void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
{
osl::Guard< comphelper::SolarMutex > aGuard( *mpSalYieldMutex );
- AquaDelayedSettingsChanged* pTimer = new AquaDelayedSettingsChanged( bInvalidate );
- pTimer->SetTimeout( 50 );
- pTimer->Start();
+ AquaDelayedSettingsChanged* pIdle = new AquaDelayedSettingsChanged( bInvalidate );
+ pIdle->SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
+ pIdle->Start();
}
// the AppEventList must be available before any SalData/SalInst/etc. objects are ready
More information about the Libreoffice-commits
mailing list