diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-14 10:43:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-15 08:09:01 +0000 |
| commit | 494bd08c48c40d6ddd807e0ec40a315786e93975 (patch) | |
| tree | 4d1df7630ef9cda83dac70a0460f444213ff21a8 /svl | |
| parent | 3daee9953da215fb7c0740259dcb37713dd17cd1 (diff) | |
remove tools/solarmutex.hxx
Deprecated in favour of comphelper::SolarMutex
Change-Id: I159077562660de5df25601fa471447f4b64a2cf1
Reviewed-on: https://gerrit.libreoffice.org/24079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/svdde/ddecli.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index ada0d241be30..fd09c85af57f 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -26,7 +26,7 @@ #include <osl/thread.h> #include <tools/debug.hxx> -#include <tools/solarmutex.hxx> +#include <comphelper/solarmutex.hxx> #include <osl/mutex.hxx> namespace { @@ -333,10 +333,14 @@ const OUString DdeTransaction::GetName() const void DdeTransaction::Data( const DdeData* p ) { - if ( ::tools::SolarMutex::Acquire() ) + comphelper::SolarMutex *pSolarMutex = comphelper::SolarMutex::get(); + if ( pSolarMutex ) { + pSolarMutex->acquire(); aData.Call( p ); - ::tools::SolarMutex::Release(); + pSolarMutex = comphelper::SolarMutex::get(); + if ( pSolarMutex ) + pSolarMutex->release(); } } |