[Libreoffice-commits] core.git: 2 commits - vcl/osx

[Tor Lillqvist]

 vcl/osx/salframeview.mm |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit c40a8f6c0466f609e49ad1bd4b9da339552d18dc
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Sep 25 19:21:38 2014 +0300

    Follow-up to fdo#84138: Add YIELD_GUARD here, too, fixes another crash
    
    Change-Id: If4de88233493d7590736e4a3b76c2447ed429ae5

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 92b579b..8e74086 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1629,6 +1629,8 @@ private:
     (void) replacementRange; // FIXME - use it!
 #endif
 
+    YIELD_GUARD;
+
     if( ![aString isKindOfClass:[NSAttributedString class]] )
         aString = [[[NSAttributedString alloc] initWithString:aString] 
autorelease];
     NSRange rangeToReplace = [self hasMarkedText] ? [self markedRange] : [self 
selectedRange];
commit 7377768b290e728d3df1fc5b7b04ce81ae285ada
Author: Matthew J. Francis <mjay.fran...@gmail.com>
Date:   Sun Sep 21 23:43:00 2014 +0800

    fdo#84138 Add missing YIELD_GUARD to fix an input method crash
    
    Change-Id: Iecf69c29a4574105a33ec003970067d4db823423

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index bd937db..92b579b 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1760,6 +1760,8 @@ private:
     (void) actualRange;
 #endif
 
+    YIELD_GUARD;
+
     SalExtTextInputPosEvent aPosEvent;
     mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent );
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits