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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/source/classes/sb.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a470547d192a..18cc9906fbbb 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -21,7 +21,7 @@ #include <tools/rcid.h> #include <tools/stream.hxx> #include <tools/errinf.hxx> -#include <tools/solarmutex.hxx> +#include <comphelper/solarmutex.hxx> #include <basic/sbx.hxx> #include <tools/rc.hxx> #include <vcl/svapp.hxx> @@ -107,7 +107,9 @@ DocBasicItem::~DocBasicItem() // tdf#90969 HACK: don't use SolarMutexGuard - there is a horrible global // map GaDocBasicItems holding instances, and these get deleted from exit // handlers, when the SolarMutex is already dead - tools::SolarMutex::Acquire(); + comphelper::SolarMutex *pSolarMutex = comphelper::SolarMutex::get(); + if ( pSolarMutex ) + pSolarMutex->acquire(); try { @@ -119,7 +121,9 @@ DocBasicItem::~DocBasicItem() assert(false); } - tools::SolarMutex::Release(); + pSolarMutex = comphelper::SolarMutex::get(); + if ( pSolarMutex ) + pSolarMutex->release(); } void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic ) |