diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:16:59 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:58:12 -0500 |
| commit | ce0417240da6834c4856b3322dedaaaf97a643df (patch) | |
| tree | 25d9b4547e943cfbc2ca3943dc1165b101348ca9 /filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | |
| parent | 8e81c6572fe34bf29b943dd0cece39b46f1c9380 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'filter/source/xsltdialog/xmlfilterdialogcomponent.cxx')
| -rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index c41666071e6e..bdd241d89a19 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_filter.hxx" #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <osl/thread.h> @@ -296,7 +296,7 @@ sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const ::rtl::OUStrin */ void SAL_CALL XMLFilterDialogComponent::disposing() { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( mpDialog ) { @@ -316,7 +316,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing() // XTerminateListener void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; // we will never give a veto here if( mpDialog && !mpDialog->isClosable() ) @@ -346,7 +346,7 @@ void SAL_CALL XMLFilterDialogComponent::setTitle( const ::rtl::OUString& /* _rTi //------------------------------------------------------------------------- sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpResMgr ) { |