diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-17 15:18:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-17 15:24:19 +0200 |
commit | 8e1ad966262932516b3368d9b5c44becb29524d4 (patch) | |
tree | 4dbee378e3376712011631734195886fb41404e2 /forms/source/richtext/richtextmodel.cxx | |
parent | 0f5b7dfea974c21b48843c3cbf7fdf344ad54a3a (diff) |
Some missing SolarMutexGuard around VclPtr acquire/release
At least OutputDevice::acquire/release use a plain unguarded int and ++, --, so
apparently rely on the SolarMutex being locked whenever they are called. Fixed
those places that caused "make check" to fail for me when temporarily adding
DBG_TESTSOLARMUTEX() to OutputDevice::acquire/release. (A recurring pattern is
that a class fails to ensure the SolarMutex is locked around the destruction of
non-null VclPtr members.)
Change-Id: I77cba6f3908f2de1b516ce28f1c3c43b3f57a9c5
Diffstat (limited to 'forms/source/richtext/richtextmodel.cxx')
-rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 417ac6d30da4..2bbe7f70d632 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -131,7 +131,10 @@ namespace frm m_pEngine->SetControlWord( nEngineControlWord ); VCLXDevice* pUnoRefDevice = new VCLXDevice; - pUnoRefDevice->SetOutputDevice( m_pEngine->GetRefDevice() ); + { + SolarMutexGuard g; + pUnoRefDevice->SetOutputDevice( m_pEngine->GetRefDevice() ); + } m_xReferenceDevice = pUnoRefDevice; } |