diff options
| -rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 2ec7fb9ed9f4..4ddeb3dddbe6 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -382,6 +382,8 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& r { if ( USHRT_MAX == nGuessedLeading || USHRT_MAX == nExtLeading ) { + SolarMutexGuard aGuard; + const Font aOldFnt( rOut.GetFont() ); ((OutputDevice&)rOut).SetFont( *pPrtFont ); const FontMetric aMet( rOut.GetFontMetric() ); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 0413382d5fe5..774000c00f20 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -253,6 +253,8 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) { if ( !nLockPaint ) { + SolarMutexGuard aGuard; + sal_Bool bPaintsFromSystem = aInvalidRect.HasArea(); GetWin()->Update(); if ( aInvalidRect.HasArea() ) diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 24336cec98a0..a2e6df851f62 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -3835,6 +3835,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p { GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler; + SolarMutexGuard aGuard; vcl::DeletionListener aDel( pThis->m_pFrame ); // open a block that will end the GTK_YIELD_GRAB before calling preedit changed again { @@ -4003,6 +4004,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ GTK_YIELD_GRAB(); + SolarMutexGuard aGuard; vcl::DeletionListener aDel( pThis->m_pFrame ); pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent); @@ -4023,6 +4025,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditEnd( GtkIMContext*, gpointer im_hand pThis->m_bPreeditJustChanged = true; + SolarMutexGuard aGuard; vcl::DeletionListener aDel( pThis->m_pFrame ); pThis->doCallEndExtTextInput(); if( ! aDel.isDeleted() ) |