From 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Oct 2010 03:18:35 -0500 Subject: merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually --- xmloff/inc/pch/precompiled_xmloff.hxx | 2 +- xmloff/source/core/xmlexp.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 58fc72d3e7..b8986204a0 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -470,7 +470,7 @@ #include "unotools/fontcvt.hxx" #include "tools/mapunit.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "rtl/ref.hxx" #include "salhelper/simplereferenceobject.hxx" diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index feee252fb5..ca7249bba7 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -79,7 +79,7 @@ #include "XMLFilterServiceNames.h" #include "XMLEmbeddedObjectExportFilter.hxx" #include "XMLBasicExportFilter.hxx" -#include +#include #include #include #include @@ -2429,8 +2429,8 @@ void SvXMLExport::SetError( const Reference& rLocator ) { // allow multi-threaded access to the cancel() method - static ::vos::OMutex aMutex; - ::vos::OGuard aGuard(aMutex); + static osl::Mutex aMutex; + osl::MutexGuard aGuard(aMutex); // maintain error flags if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 ) -- cgit v1.2.3