diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-10-09 11:27:26 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-10-09 14:51:44 +0000 |
| commit | f76b3dd039818cc2b297fa2a11b60d9e055e6d8c (patch) | |
| tree | e46d4174cd7f66edeb962031e59259b820eaa344 /unotools | |
| parent | 3e23ee076ae6b46af617c0692998b22459a43dde (diff) | |
Move SolarMutex down from tools to comphelper/ to make life easier.
Change-Id: I7dd21f30daa27e5de2848eb16aee9a610dd629d5
Reviewed-on: https://gerrit.libreoffice.org/19271
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configitem.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index fd1c423c78d7..7d03ab82d849 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -40,7 +40,8 @@ #include <com/sun/star/util/XStringEscape.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <osl/diagnose.h> -#include <tools/solarmutex.hxx> +#include <comphelper/solarmutex.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> using namespace utl; @@ -155,11 +156,12 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th } if( nNotify ) { - if ( ::tools::SolarMutex::Acquire() ) + ::comphelper::SolarMutex *pMutex = ::comphelper::SolarMutex::get(); + if ( pMutex ) { + rtl::Reference< comphelper::SolarMutex > aGuard( pMutex ); aChangedNames.realloc(nNotify); pParent->CallNotify(aChangedNames); - ::tools::SolarMutex::Release(); } } } |