merge vosremoval-mutex.diff

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

22 files changed, 30 insertions, 31 deletions

diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 8bda1ae2be62..d1f1eff1354e 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -124,7 +124,7 @@
 #include <sfx2/event.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/textenc.h>
 #include <ndindex.hxx>
 #include <pam.hxx>
@@ -2944,7 +2944,7 @@ SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl()
 void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
         throw (RuntimeException)
 {
-    SolarMutexGuard aGuard;
+    ::SolarMutexGuard aGuard;
     uno::Reference<XConnection> xSource(rSource.Source, UNO_QUERY);
     for(USHORT nPos = rDBMgr.aDataSourceParams.Count(); nPos; nPos--)
     {
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index f132a1a56099..4cf314bf3111 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -51,7 +51,7 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <dbtree.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <helpid.h>
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 7a88d5fac98b..86692a639112 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -67,7 +67,7 @@
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <dbmgr.hxx>
 #include <swunohelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <shellio.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 91334f881a4f..b69102196b18 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -135,7 +135,7 @@
 #include <SwRewriter.hxx>
 #include <undobj.hxx>
 #include <globals.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <swserv.hxx>
 
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index c1f22d3d6f73..845de5f37315 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -181,7 +181,7 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
         SidebarTxtControl& mrSidebarTxtControl;
         ::accessibility::AccessibleTextHelper* mpAccessibleTextHelper;
 
-        ::vos::OMutex maMutex;
+        ::osl::Mutex maMutex;
 
         void defunc();
 };
@@ -212,7 +212,7 @@ void SidebarTxtControlAccessibleContext::defunc()
 sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
     throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     sal_Int32 nChildCount( 0 );
 
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChild( sal_Int32 i )
     throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException )
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     css::uno::Reference< css::accessibility::XAccessible > xChild;
 
@@ -243,7 +243,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
     throw (css::uno::RuntimeException)
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     if ( mpAccessibleTextHelper )
     {
@@ -255,7 +255,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
     throw (css::uno::RuntimeException)
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     if ( mpAccessibleTextHelper )
     {
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx
index ff3f7ae1d911..e55ce359dcc0 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.cxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.cxx
@@ -67,7 +67,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 
         void ChangeAnchor( const SwFrm* pAnchorFrm )
         {
-            vos::OGuard aGuard(maMutex);
+            osl::MutexGuard aGuard(maMutex);
 
             mpAnchorFrm = pAnchorFrm;
         }
@@ -75,7 +75,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
             getAccessibleParent() throw (css::uno::RuntimeException)
         {
-            vos::OGuard aGuard(maMutex);
+            osl::MutexGuard aGuard(maMutex);
 
             css::uno::Reference< css::accessibility::XAccessible > xAccParent;
 
@@ -90,7 +90,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 
         virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException)
         {
-            vos::OGuard aGuard(maMutex);
+            osl::MutexGuard aGuard(maMutex);
 
             sal_Int32 nIndex( -1 );
 
@@ -108,7 +108,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
         ViewShell& mrViewShell;
         const SwFrm* mpAnchorFrm;
 
-        ::vos::OMutex maMutex;
+        ::osl::Mutex maMutex;
 };
 
 // =============================================================================
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 80f17ce04a9d..ad3938cadebd 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -131,7 +131,7 @@
 #include <pagedesc.hxx>
 #include <svtools/ruler.hxx> // #i23726#
 #include "formatclipboard.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <IMark.hxx>
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index f975ac07a69b..56b930b6fead 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -36,7 +36,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <list>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 class SwView;
 
@@ -50,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
     class DispatchMutexLock_Impl
     {
         //::osl::MutexGuard   aGuard; #102295# solar mutex has to be used currently
-        vos::OGuard         aGuard;
+        osl::SolarMutexGuard         aGuard;
         DispatchMutexLock_Impl();
     public:
         DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&);
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 25448da4f9b2..7e54dd7ce12d 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -92,7 +92,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 8673adb599f5..51ff90209e9e 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 3fdde6934ca2..b0b59aa3c044 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <SwXDocumentSettings.hxx>
 #include <SwXPrintPreviewSettings.hxx>
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index 9b01c9e58f92..a498e80a2e5e 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -32,7 +32,7 @@
 #include <shellio.hxx>
 #include <swdll.hxx>
 #include <unoprnms.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 47dcf9d31750..53359a88176b 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -40,7 +40,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/shl.hxx>
 #include "dlelstnr.hxx"
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 77ffb016ba05..fe14e63b02cd 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -52,7 +52,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <sot/storinfo.hxx>
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 14e77d9ed296..8885ca9d82ea 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -33,7 +33,7 @@
 #define _SVSTDARR_STRINGS
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <svl/svstdarr.hxx>
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index cb63448ed422..9bee47d7481c 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -44,7 +44,6 @@
 
 using namespace ::com::sun::star;
 using namespace rtl;
-using namespace vos;
 
 const char* cURLStart           = ".uno:DataSourceBrowser/";
 const char* cURLFormLetter      = ".uno:DataSourceBrowser/FormLetter";
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx
index 7d3e201ee078..30b8c0d79e87 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/ui/uno/unodoc.cxx
@@ -37,7 +37,7 @@
 #include "docsh.hxx"
 #include "globdoc.hxx"
 #include "wdocsh.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index ab368ca396a1..44597ea0cab9 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -31,7 +31,7 @@
 
 
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index f132497043ea..db20092bfb3f 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -43,7 +43,7 @@
 #include <docsh.hxx>
 #include <wrtsh.hxx>
 #include <viewopt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/text/NotePrintMode.hpp>
 #include <doc.hxx>
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx
index d08596cb56dd..91a3d07098e9 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/ui/uno/unomodule.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index a097aed0d82f..5836c9770d31 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 2a75f93200d9..d4765157b456 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -61,7 +61,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <frmatr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <IMark.hxx>
 #include <unotxdoc.hxx>
 #include <unodraw.hxx>