diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 15:38:03 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 15:38:03 +0000 |
commit | c7d8e1f1d7f00a264e3818233dd09190deb370c3 (patch) | |
tree | 8a6511767c84e2e6234ac1e14b6618ea47f8397f /vcl/win | |
parent | a775242ec7687be2131318bdbbfac9f2b26b03db (diff) |
INTEGRATION: CWS vcl58 (1.29.26); FILE MERGED
2006/04/26 10:57:25 pl 1.29.26.1: #i64768# problem with timerproc recursion introduced with fix for #i60519#
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/source/app/salinst.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 68a91a5ea9f4..e04c9a263f1b 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salinst.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: kz $ $Date: 2006-04-26 14:17:41 $ + * last change: $Author: rt $ $Date: 2006-05-03 16:38:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -746,7 +746,7 @@ void ImplSalYield( BOOL bWait ) { pSalData->mnLastEventTime = aMsg.time; if( pSalData->mnNextTimerTime && pSalData->mnNextTimerTime < aMsg.time ) - SalTimerProc( 0, 0, 0, aMsg.time ); + SalTimerProc( 0, 0, SALTIMERPROC_RECURSIVE, aMsg.time ); } } |