diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 (patch) | |
| tree | 127c4b92c30f6dcf21b8a121b66a1fdf21a8f9a9 /xmloff | |
| parent | 4ec839be778e5541c09b0f1a6e3b707ca29bae6d (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/pch/precompiled_xmloff.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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 <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/extract.hxx> @@ -2429,8 +2429,8 @@ void SvXMLExport::SetError( const Reference<XLocator>& 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 ) |