diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-06 09:45:08 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-06-04 18:46:03 +0200 |
| commit | 5ae8cb8fc0d7ae3c85ccf23ffb8e2a890728cb72 (patch) | |
| tree | 4b193830d7de66086365f33852c86fa3ebf0ec3c | |
| parent | 10a390d4676cb678c58b2d6f1db9db8a76041996 (diff) | |
fdo#50676: silence SolarMutex not locked spew
(cherry picked from commit f9a4af41ca574760dbd22c8207661fabb6823e3b)
Change-Id: I1c2a24e9f8fbbea7227c3c8e3a567ae22e070578
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -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 f0dd635c0559..04717dd02cef 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 ded316fb32d9..29fc04b35ff8 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -3886,6 +3886,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 { @@ -4052,6 +4053,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); @@ -4072,6 +4074,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() ) |