|
 |
a67f28e |
From f9a4af41ca574760dbd22c8207661fabb6823e3b Mon Sep 17 00:00:00 2001
|
|
|
a67f28e |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
a67f28e |
Date: Tue, 6 Mar 2012 09:45:08 +0000
|
|
|
a67f28e |
Subject: [PATCH] silence SolarMutex not locked spew
|
|
|
a67f28e |
|
|
|
a67f28e |
---
|
|
|
a67f28e |
sw/source/core/txtnode/fntcache.cxx | 2 ++
|
|
|
a67f28e |
sw/source/core/view/viewsh.cxx | 2 ++
|
|
|
a67f28e |
vcl/unx/gtk/window/gtkframe.cxx | 3 +++
|
|
|
a67f28e |
3 files changed, 7 insertions(+), 0 deletions(-)
|
|
|
a67f28e |
|
|
|
a67f28e |
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
|
|
|
a67f28e |
index 2ec7fb9..4ddeb3d 100644
|
|
|
a67f28e |
--- a/sw/source/core/txtnode/fntcache.cxx
|
|
|
a67f28e |
+++ b/sw/source/core/txtnode/fntcache.cxx
|
|
|
a67f28e |
@@ -382,6 +382,8 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& r
|
|
|
a67f28e |
{
|
|
|
a67f28e |
if ( USHRT_MAX == nGuessedLeading || USHRT_MAX == nExtLeading )
|
|
|
a67f28e |
{
|
|
|
a67f28e |
+ SolarMutexGuard aGuard;
|
|
|
a67f28e |
+
|
|
|
a67f28e |
const Font aOldFnt( rOut.GetFont() );
|
|
|
a67f28e |
((OutputDevice&)rOut).SetFont( *pPrtFont );
|
|
|
a67f28e |
const FontMetric aMet( rOut.GetFontMetric() );
|
|
|
a67f28e |
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
|
|
|
a67f28e |
index 0413382..774000c 100644
|
|
|
a67f28e |
--- a/sw/source/core/view/viewsh.cxx
|
|
|
a67f28e |
+++ b/sw/source/core/view/viewsh.cxx
|
|
|
a67f28e |
@@ -253,6 +253,8 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
|
|
|
a67f28e |
{
|
|
|
a67f28e |
if ( !nLockPaint )
|
|
|
a67f28e |
{
|
|
|
a67f28e |
+ SolarMutexGuard aGuard;
|
|
|
a67f28e |
+
|
|
|
a67f28e |
sal_Bool bPaintsFromSystem = aInvalidRect.HasArea();
|
|
|
a67f28e |
GetWin()->Update();
|
|
|
a67f28e |
if ( aInvalidRect.HasArea() )
|
|
|
a67f28e |
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
|
|
|
a67f28e |
index 24336ce..a2e6df8 100644
|
|
|
a67f28e |
--- a/vcl/unx/gtk/window/gtkframe.cxx
|
|
|
a67f28e |
+++ b/vcl/unx/gtk/window/gtkframe.cxx
|
|
|
a67f28e |
@@ -3835,6 +3835,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
|
|
|
a67f28e |
{
|
|
|
a67f28e |
GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler;
|
|
|
a67f28e |
|
|
|
a67f28e |
+ SolarMutexGuard aGuard;
|
|
|
a67f28e |
vcl::DeletionListener aDel( pThis->m_pFrame );
|
|
|
a67f28e |
// open a block that will end the GTK_YIELD_GRAB before calling preedit changed again
|
|
|
a67f28e |
{
|
|
|
a67f28e |
@@ -4003,6 +4004,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
|
|
|
a67f28e |
|
|
|
a67f28e |
GTK_YIELD_GRAB();
|
|
|
a67f28e |
|
|
|
a67f28e |
+ SolarMutexGuard aGuard;
|
|
|
a67f28e |
vcl::DeletionListener aDel( pThis->m_pFrame );
|
|
|
a67f28e |
|
|
|
a67f28e |
pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent);
|
|
|
a67f28e |
@@ -4023,6 +4025,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditEnd( GtkIMContext*, gpointer im_hand
|
|
|
a67f28e |
|
|
|
a67f28e |
pThis->m_bPreeditJustChanged = true;
|
|
|
a67f28e |
|
|
|
a67f28e |
+ SolarMutexGuard aGuard;
|
|
|
a67f28e |
vcl::DeletionListener aDel( pThis->m_pFrame );
|
|
|
a67f28e |
pThis->doCallEndExtTextInput();
|
|
|
a67f28e |
if( ! aDel.isDeleted() )
|
|
|
a67f28e |
--
|
|
|
a67f28e |
1.7.7.6
|
|
|
a67f28e |
|