merge vosremoval-mutex.diff

In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually

8 files changed, 8 insertions, 8 deletions

diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index b5a418b236a4..6696bb698495 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -46,7 +46,7 @@
 #include <tools/urlobj.hxx>
 
 #include <vcl/button.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 namespace uui
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 3f669c3f8da7..2eea4a79fe7b 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -40,7 +40,7 @@
 
 #include "osl/diagnose.h"
 #include "rtl/digest.h"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "tools/errcode.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/abstdlg.hxx"
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index 64b1999b7a38..14db49bb79b5 100644
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
@@ -30,7 +30,7 @@
 #include "com/sun/star/ucb/XInteractionCookieHandling.hpp"
 #include "com/sun/star/task/XInteractionRequest.hpp"
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "tools/list.hxx"
 #include "svl/httpcook.hxx"
 #include "vcl/svapp.hxx"
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 50f0308b7990..e2e3dae684d8 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -28,7 +28,7 @@
 
 #include <memory>
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/msgbox.hxx"
 
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 3c7ababf9225..2c043443bed6 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -40,7 +40,7 @@
 #include "com/sun/star/task/XInteractionRequest.hpp"
 #include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "comphelper/sequenceashashmap.hxx"
 #include "vcl/svapp.hxx"
 
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index e8be19b1eddd..90c9188792fb 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -38,7 +38,7 @@
 #include "com/sun/star/task/XInteractionAbort.hpp"
 #include "com/sun/star/task/XInteractionRequest.hpp"
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/msgbox.hxx"
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 7ef7bbf317fd..d22a2da6b7e2 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -32,7 +32,7 @@
 #include "com/sun/star/task/XInteractionRequest.hpp"
 #include "com/sun/star/ucb/CertificateValidationRequest.hpp"
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "tools/datetime.hxx"
 #include "svl/zforlist.hxx"
 #include "vcl/svapp.hxx"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f557808f3b56..c0a80ea4148c 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -71,7 +71,7 @@
 #include "osl/conditn.hxx"
 #include "tools/rcid.h" // RSC_STRING
 #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "tools/diagnose_ex.h"
 #include "comphelper/documentconstants.hxx" // ODFVER_012_TEXT
 #include "svtools/sfxecode.hxx" // ERRCODE_SFX_*