diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 12:13:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 12:13:20 +0000 |
| commit | d94b325dcc35a4bc68ff7b9edfadc585e73651c0 (patch) | |
| tree | 1ee2457d6b331f62dd781d1d11e415b721807685 /vcl | |
| parent | d424839d003fef1a25e50f02c58d48844ac2e3ba (diff) | |
INTEGRATION: CWS vcl91 (1.10.8); FILE MERGED
2008/07/21 12:56:25 pl 1.10.8.1: #i91865# prevent recursion
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/aqua/source/window/salframeview.mm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 3a2c509ab3a8..880e895fe700 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salframeview.mm,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -344,14 +344,15 @@ static const struct ExceptionalKey -(id)initWithSalFrame: (AquaSalFrame*)pFrame { - mDraggingDestinationHandler = nil; - mpFrame = pFrame; - if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [mpFrame->getWindow() frame] styleMask: mpFrame->mnStyleMask]]) != nil) + if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil) { + mDraggingDestinationHandler = nil; + mpFrame = pFrame; mMarkedRange = NSMakeRange(NSNotFound, 0); mSelectedRange = NSMakeRange(NSNotFound, 0); mpReferenceWrapper = nil; mpMouseEventListener = nil; + mpLastSuperEvent = nil; } return self; @@ -956,8 +957,14 @@ static const struct ExceptionalKey { if( ! [self sendSingleCharacter:mpLastEvent] ) { - if( [NSApp respondsToSelector: @selector(sendSuperEvent:)] ) + /* prevent recursion */ + if( mpLastEvent != mpLastSuperEvent && [NSApp respondsToSelector: @selector(sendSuperEvent:)] ) + { + id pLastSuperEvent = mpLastSuperEvent; + mpLastSuperEvent = mpLastEvent; [NSApp performSelector:@selector(sendSuperEvent:) withObject: mpLastEvent]; + mpLastSuperEvent = pLastSuperEvent; + } } } } |