diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
| commit | 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 (patch) | |
| tree | 23052830d85c8ba9ad4862adf77aa31086573f93 /sw/source | |
| parent | 52ae345470d8fa657817cf87b3e8e8c1b51bd7da (diff) | |
Change "blink times" to be of type sal_uInt64
...and thus consistent with Timer::Get/SetTimeout since
9c7016b5b530ca212b1275f44f9e2fc0527109ee "Scheduler: Changed uLong to
uInt32/uInt64." Otherwise, at least JunitTest_forms_unoapi on 32-bit Linux
would stay busy forever in vcl::Cursor::ImplTimerHdl, alternating among
ImplRestore() and ImplDraw().
Change-Id: Ic3fd349344c105078b52749ca85559fce485d0c4
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 1d19e11664b4..ca9266dc14bd 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1832,19 +1832,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd ) Imp()->InvalidateAccessibleCursorPosition( pFrm ); // switch from blinking cursor to read-only-text-selection cursor - static const long nNoBlinkTime = STYLE_CURSOR_NOBLINKTIME; - const long nBlinkTime = GetOut()->GetSettings().GetStyleSettings(). + const sal_uInt64 nBlinkTime = GetOut()->GetSettings().GetStyleSettings(). GetCursorBlinkTime(); if ( (IsCrsrReadonly() && GetViewOptions()->IsSelectionInReadonly()) == - ( nBlinkTime != nNoBlinkTime ) ) + ( nBlinkTime != STYLE_CURSOR_NOBLINKTIME ) ) { // non blinking cursor in read only - text selection mode AllSettings aSettings = GetOut()->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - const long nNewBlinkTime = nBlinkTime == nNoBlinkTime ? + const sal_uInt64 nNewBlinkTime = nBlinkTime == STYLE_CURSOR_NOBLINKTIME ? Application::GetSettings().GetStyleSettings().GetCursorBlinkTime() : - nNoBlinkTime; + STYLE_CURSOR_NOBLINKTIME; aStyleSettings.SetCursorBlinkTime( nNewBlinkTime ); aSettings.SetStyleSettings( aStyleSettings ); GetOut()->SetSettings( aSettings ); |