diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:54:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:54:58 +0000 |
| commit | b691adc4a4fa1b96f098ee70a68e47734624c247 (patch) | |
| tree | 0551e472edb6ee91709411a8a8a543bde0022901 /vcl | |
| parent | 11324283ae81bb39b2cb6a982b5160be927a37c5 (diff) | |
INTEGRATION: CWS gslpatches2 (1.30.12); FILE MERGED
2005/07/18 11:13:30 pl 1.30.12.5: resolve merge problem
2005/07/18 10:01:26 pl 1.30.12.4: RESYNC: (1.30-1.32); FILE MERGED
2005/06/02 09:34:43 pl 1.30.12.3: #i49311# one more updateIMSpotLocation (thanks to ekato)
2005/06/01 09:30:15 pl 1.30.12.2: #i49311# spot location patch (by ekato)
2005/06/01 08:53:25 pl 1.30.12.1: #i49311# preedit patch (by ekato)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 05ce0d70dd3b..7789d1e066aa 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkframe.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2005-07-14 11:26:15 $ + * last change: $Author: hr $ $Date: 2005-08-05 12:54:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2479,7 +2479,6 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext* pContext, gpo } bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr != NULL; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.maText = String( pText, RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = nCursorPos; @@ -2545,7 +2544,6 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext* pContext, gpo vcl::DeletionListener aDel( pThis->m_pFrame ); pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent); - if( bEndPreedit && ! aDel.isDeleted() ) pThis->doCallEndExtTextInput(); if( ! aDel.isDeleted() ) |