summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-09-04 06:31:16 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-09-04 06:31:16 +0000
commitdb983071ae13ae21b675a54e29e677156e91fc0a (patch)
treea173a3b803bfd3f3882bbfb6f00a9cdbbf211bc5
parente8de51a8381cf87fcb7e25c77c3b6a28ef936770 (diff)
INTEGRATION: CWS dba30j_DEV300 (1.11.16.1.10); FILE MERGED
2008/09/01 10:50:16 hdu 1.11.16.1.10.1: #93155# fix input of composite chars with ASCII keys (thanks ekato!)
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 880e895fe700..f74a7894aeca 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.12 $
+ * $Revision: 1.13 $
*
* This file is part of OpenOffice.org.
*
@@ -726,6 +726,7 @@ static const struct ExceptionalKey
aCharCode < 0x80 &&
aCharCode > 0x1f &&
( nKeyCode = ImplMapCharCode( aCharCode ) ) != 0
+ && ! [self hasMarkedText ]
)
{
[self sendKeyInputAndReleaseToFrame: nKeyCode character: aCharCode];