rpms/openoffice.org/devel workspace.gslpatches2.patch,1.2,1.3

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22444

Modified Files:
	workspace.gslpatches2.patch 
Log Message:
tweak patch

workspace.gslpatches2.patch:
 gcach_layout.cxx |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

Index: workspace.gslpatches2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.gslpatches2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.gslpatches2.patch	13 Jun 2005 15:21:12 -0000	1.2
+++ workspace.gslpatches2.patch	4 Jul 2005 10:41:30 -0000	1.3
@@ -28,92 +28,3 @@
  }
  
  // -----------------------------------------------------------------------
-Index: unx/gtk/window/gtkframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
-retrieving revision 1.30
-retrieving revision 1.30.12.3
-diff -u -p -r1.30 -r1.30.12.3
---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	18 May 2005 08:04:16 -0000	1.30
-+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	2 Jun 2005 09:34:43 -0000	1.30.12.3
-@@ -355,6 +355,7 @@ void GtkSalFrame::hardIMReset()
- #endif
- 	    m_bWasPreedit = false;
-         CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
-+        updateIMSpotLocation();
- 	}
- }
- 
-@@ -2270,12 +2271,10 @@ gboolean GtkSalFrame::signalKey( GtkWidg
- 		{
- 			pThis->m_bSendModChangeOnRelease = false;
- 			pThis->m_bSingleAltPress = false;
-+            pThis->updateIMSpotLocation();
- 		}
-     }
- 
--	if( !aDel.isDeleted() )
--		pThis->updateIMSpotLocation();
--
-     return TRUE;
- }
- 
-@@ -2410,6 +2409,7 @@ void GtkSalFrame::signalIMCommit( GtkIMC
-             #endif
-             pThis->m_bWasPreedit = false;
-             pThis->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
-+            pThis->updateIMSpotLocation();
-             return;
-         }
-     }
-@@ -2421,7 +2421,11 @@ void GtkSalFrame::signalIMCommit( GtkIMC
-     pThis->m_bWasPreedit = false;
-     pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
- 	if( ! aDel.isDeleted() )
-+    {
- 		pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+        if( ! aDel.isDeleted() )
-+            pThis->updateIMSpotLocation();
-+    }
- }
- 
- void GtkSalFrame::signalIMPreeditChanged( GtkIMContext* pContext, gpointer frame )
-@@ -2441,7 +2445,7 @@ void GtkSalFrame::signalIMPreeditChanged
- #if OSL_DEBUG_LEVEL > 1
- 	fprintf( stderr, ":signalImPreeditChanged '%s'\n", pText );
- #endif
--	bool bEndPreedit = (!pText || !*pText) && pThis->m_bWasPreedit;
-+	bool bEndPreedit = (!pText || !*pText);
- 
-     SalExtTextInputEvent aTextEvent;
- 
-@@ -2511,13 +2515,17 @@ void GtkSalFrame::signalIMPreeditChanged
-     
-     vcl::DeletionListener aDel( pThis );
-     
--    pThis->m_bWasPreedit = true;
-+    if (!bEndPreedit)
-+        pThis->m_bWasPreedit = true;
-+
-     pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
- 
-     delete [] pSalAttribs;
- 
- 	if( bEndPreedit && ! aDel.isDeleted() )
-         pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+    if( ! aDel.isDeleted() )
-+        pThis->updateIMSpotLocation();
- }
- 
- void GtkSalFrame::signalIMPreeditStart( GtkIMContext* pContext, gpointer frame )
-@@ -2540,7 +2548,10 @@ void GtkSalFrame::signalIMPreeditEnd( Gt
-         fprintf( stderr, ":signalImPreeditEnd\n" );
-         #endif
-         GTK_YIELD_GRAB();
-+        vcl::DeletionListener aDel( pThis );
-         pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+        if( ! aDel.isDeleted() )
-+            pThis->updateIMSpotLocation();
-     }
- }
-