summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-13 07:41:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-13 07:41:41 +0000
commit989294bc914481f56da43742033b1bf5f2ccc5da (patch)
treeb0eb52c7f69fdbb7364cc08ea63d1bcd74268c5e
parent270e1250ba8fedaace4f2a4363e5d1911c426a31 (diff)
INTEGRATION: CWS aquabmpfix02 (1.49.2); FILE MERGED
2008/06/06 15:31:08 pl 1.49.2.1: #i89860# fix a crash on tiger
-rw-r--r--vcl/aqua/source/app/salinst.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index d325a858a034..60e69b374299 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: salinst.cxx,v $
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
*
* This file is part of OpenOffice.org.
*
@@ -660,7 +660,11 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
// fixes the problem even seems to set the correct next firing date
// Why oh why ?
if( ! pEvent && AquaSalTimer::pRunningTimer )
- [AquaSalTimer::pRunningTimer fire];
+ {
+ // this cause crashes on MacOSX 10.4
+ // [AquaSalTimer::pRunningTimer fire];
+ ImplGetSVData()->mpSalTimer->CallCallback();
+ }
}
mbWaitingYield = bOldWaitingYield;