summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-16 03:18:35 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:33 -0500
commitc17635d5752c010405efba458cfb3a98f5afaf75 (patch)
treef8c521b54c3c65cbcbcad293f63cfa81113f480f
parentd3756b8b7318ecae4eaf0552aea3cde940e91490 (diff)
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually
-rw-r--r--avmedia/source/framework/soundhandler.cxx4
-rw-r--r--avmedia/source/framework/soundhandler.hxx4
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx2
-rw-r--r--basic/inc/pch/precompiled_basic.hxx2
-rw-r--r--basic/source/classes/sb.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx2
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/runtime/iosys.cxx19
-rw-r--r--basic/source/uno/namecont.cxx2
-rw-r--r--connectivity/inc/pch/precompiled_connectivity.hxx2
-rw-r--r--connectivity/source/drivers/jdbc/Object.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx4
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx2
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx2
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx2
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx2
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx2
-rw-r--r--editeng/source/editeng/eeobj.cxx2
-rw-r--r--editeng/source/editeng/impedit.cxx2
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx2
-rw-r--r--editeng/source/uno/unoedprx.cxx2
-rw-r--r--editeng/source/uno/unofield.cxx3
-rw-r--r--editeng/source/uno/unonrule.cxx3
-rw-r--r--editeng/source/uno/unopracc.cxx2
-rw-r--r--editeng/source/uno/unotext.cxx3
-rw-r--r--editeng/source/uno/unotext2.cxx3
-rw-r--r--embeddedobj/source/msole/graphconvert.cxx2
-rw-r--r--fpicker/source/aqua/ControlHelper.cxx2
-rw-r--r--fpicker/source/aqua/FilterHelper.cxx2
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.cxx2
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.cxx2
-rw-r--r--fpicker/source/aqua/SalAquaPicker.cxx2
-rw-r--r--fpicker/source/aqua/resourceprovider.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx2
-rw-r--r--fpicker/source/office/commonpicker.cxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.cxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkFolderPicker.cxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkPicker.cxx2
-rw-r--r--fpicker/source/unx/gnome/resourceprovider.cxx2
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--fpicker/source/win32/filepicker/SolarMutex.cxx6
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.cxx2
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--framework/inc/pch/precompiled_framework.hxx2
-rw-r--r--framework/inc/threadhelp/lockhelper.hxx8
-rw-r--r--framework/inc/threadhelp/threadhelpbase.hxx2
-rw-r--r--framework/source/classes/fwkresid.cxx2
-rw-r--r--framework/source/classes/fwlresid.cxx2
-rw-r--r--framework/source/classes/menumanager.cxx3
-rw-r--r--framework/source/dispatch/closedispatcher.cxx2
-rw-r--r--framework/source/dispatch/menudispatcher.cxx7
-rw-r--r--framework/source/dispatch/popupmenudispatcher.cxx3
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx2
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx2
-rw-r--r--framework/source/helper/actiontriggerhelper.cxx3
-rw-r--r--framework/source/helper/propertysetcontainer.cxx1
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/inc/pattern/window.hxx2
-rw-r--r--framework/source/threadhelp/lockhelper.cxx29
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx2
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx2
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/headermenucontroller.cxx2
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/logoimagestatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/logotextstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx2
-rw-r--r--framework/source/uielement/popupmenucontroller.cxx2
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/simpletextstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/statusindicatorinterfacewrapper.cxx2
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx2
-rw-r--r--linguistic/source/thesdsp.hxx2
-rw-r--r--scripting/source/basprov/baslibnode.cxx2
-rw-r--r--scripting/source/basprov/basmethnode.cxx2
-rw-r--r--scripting/source/basprov/basmodnode.cxx2
-rw-r--r--scripting/source/basprov/basprov.cxx2
-rw-r--r--scripting/source/basprov/basscript.cxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx2
-rw-r--r--sfx2/inc/sfx2/docstoragemodifylistener.hxx8
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx2
-rw-r--r--sfx2/source/appl/appdata.cxx2
-rw-r--r--sfx2/source/appl/appmisc.cxx5
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/fwkhelper.cxx2
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx3
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm2
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx2
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx1
-rw-r--r--sfx2/source/bastyp/fltlst.cxx2
-rw-r--r--sfx2/source/control/querystatus.cxx2
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx8
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx2
-rw-r--r--sfx2/source/doc/Metadatable.cxx2
-rw-r--r--sfx2/source/doc/docstoragemodifylistener.cxx8
-rw-r--r--sfx2/source/doc/doctempl.cxx2
-rw-r--r--sfx2/source/doc/doctemplates.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx2
-rw-r--r--sfx2/source/doc/objuno.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/printhelper.cxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx2
-rw-r--r--sfx2/source/inc/eventsupplier.hxx2
-rw-r--r--sfx2/source/inc/sfxtypes.hxx2
-rw-r--r--sfx2/source/inc/workwin.hxx2
-rw-r--r--sfx2/source/inet/inettbc.cxx2
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx2
-rw-r--r--sfx2/source/view/frmload.cxx2
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx2
-rw-r--r--svx/inc/svx/gridctrl.hxx2
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx2
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx2
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx2
-rw-r--r--svx/source/accessibility/DGColorNameLookUp.cxx2
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx2
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx63
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx2
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx22
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx12
-rw-r--r--svx/source/fmcomp/trace.cxx10
-rw-r--r--svx/source/form/ParseContext.cxx2
-rw-r--r--svx/source/form/fmscriptingenv.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmundo.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/gengal/gengal.cxx1
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/charmapacc.hxx2
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx2
-rw-r--r--svx/source/inc/trace.hxx4
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx2
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx2
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
-rw-r--r--svx/source/table/accessibletableshape.cxx2
-rw-r--r--svx/source/table/cell.cxx19
-rw-r--r--svx/source/table/celleditsource.cxx5
-rw-r--r--svx/source/table/tabledesign.cxx3
-rw-r--r--svx/source/table/tablemodel.cxx29
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx2
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx2
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx2
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx7
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx3
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx3
-rw-r--r--svx/source/unodraw/recoveryui.cxx2
-rw-r--r--svx/source/unodraw/unomlstr.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx15
-rw-r--r--svx/source/unodraw/unomtabl.cxx3
-rw-r--r--svx/source/unodraw/unopage.cxx3
-rw-r--r--svx/source/unodraw/unopool.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx37
-rw-r--r--svx/source/unodraw/unoshap3.cxx3
-rw-r--r--svx/source/unodraw/unoshap4.cxx3
-rw-r--r--svx/source/unodraw/unoshape.cxx97
-rw-r--r--svx/source/unodraw/unoshtxt.cxx5
-rw-r--r--svx/source/unogallery/unogalitem.cxx2
-rw-r--r--svx/source/unogallery/unogaltheme.cxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
-rw-r--r--svx/workben/edittest.cxx1
-rw-r--r--ucb/inc/pch/precompiled_ucb.hxx2
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx2
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/iahndl-authentication.cxx2
-rw-r--r--uui/source/iahndl-cookies.cxx2
-rw-r--r--uui/source/iahndl-errorhandler.cxx2
-rw-r--r--uui/source/iahndl-filter.cxx2
-rw-r--r--uui/source/iahndl-locking.cxx2
-rw-r--r--uui/source/iahndl-ssl.cxx2
-rw-r--r--uui/source/iahndl.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbashape.cxx3
-rw-r--r--xmloff/inc/pch/precompiled_xmloff.hxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx6
199 files changed, 381 insertions, 421 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 338bc0855193..d292bd723647 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -330,7 +330,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
{
// SAFE {
- const ::vos::OGuard aLock( m_aLock );
+ const ::osl::MutexGuard aLock( m_aLock );
{
//close streams otherwise on windows we can't reopen the file in the
@@ -449,7 +449,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
{
// SAFE {
- ::vos::OClearableGuard aLock( m_aLock );
+ ::osl::ClearableMutexGuard aLock( m_aLock );
if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
{
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 55d30536d8ce..54135a93b39d 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -53,7 +53,7 @@
#include <vcl/timer.hxx>
#include <tools/link.hxx>
#include <avmedia/mediawindow.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace css = ::com::sun::star;
@@ -74,7 +74,7 @@ namespace avmedia{
struct ThreadHelpBase
{
public:
- mutable ::vos::OMutex m_aLock;
+ mutable ::osl::Mutex m_aLock;
};
/*-************************************************************************************************************//**
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index b9e45c1a9074..0e8dfe0ca295 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -29,7 +29,7 @@
#include "mediaevent_impl.hxx"
#include "mediawindow_impl.hxx"
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 7769a1fb2f5c..eacfc86d3b1b 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -277,7 +277,7 @@
#include "osl/diagnose.h"
#include "vos/macros.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
#include "xmlscript/xmldlg_imexp.hxx"
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 32d6ba279ac4..4cebf35be0c7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -53,7 +53,7 @@
#include "filefmt.hxx"
#include "sb.hrc"
#include <basrid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "errobject.hxx"
#include <hash_map>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e22cb142f0ca..876513216205 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/errcode.hxx>
#include <svl/hint.hxx>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index fa8e5604a54f..2384ee0d1e3c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -51,7 +51,7 @@
#include <svtools/syntaxhighlight.hxx>
#include <basic/basrdll.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <basic/sbobjmod.hxx>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 0cbab9ec2a0f..40cf7f2f3ece 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -36,7 +36,7 @@
#include <osl/security.h>
#include <osl/file.hxx>
#include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "runtime.hxx"
@@ -67,7 +67,6 @@
#include <com/sun/star/bridge/XBridgeFactory.hpp>
using namespace comphelper;
-using namespace osl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
@@ -344,7 +343,7 @@ BOOL hasUno( void )
class OslStream : public SvStream
{
- File maFile;
+ osl::File maFile;
short mnStrmMode;
public:
@@ -376,14 +375,14 @@ OslStream::OslStream( const String& rName, short nStrmMode )
nFlags = OpenFlag_Read;
}
- FileBase::RC nRet = maFile.open( nFlags );
- if( nRet == FileBase::E_NOENT && nFlags != OpenFlag_Read )
+ osl::FileBase::RC nRet = maFile.open( nFlags );
+ if( nRet == osl::FileBase::E_NOENT && nFlags != OpenFlag_Read )
{
nFlags |= OpenFlag_Create;
nRet = maFile.open( nFlags );
}
- if( nRet != FileBase::E_None )
+ if( nRet != osl::FileBase::E_None )
{
SetError( ERRCODE_IO_GENERAL );
}
@@ -398,7 +397,7 @@ OslStream::~OslStream()
ULONG OslStream::GetData( void* pData, ULONG nSize )
{
sal_uInt64 nBytesRead = nSize;
- FileBase::RC nRet = FileBase::E_None;
+ osl::FileBase::RC nRet = osl::FileBase::E_None;
nRet = maFile.read( pData, nBytesRead, nBytesRead );
return (ULONG)nBytesRead;
}
@@ -406,14 +405,14 @@ ULONG OslStream::GetData( void* pData, ULONG nSize )
ULONG OslStream::PutData( const void* pData, ULONG nSize )
{
sal_uInt64 nBytesWritten;
- FileBase::RC nRet = FileBase::E_None;
+ osl::FileBase::RC nRet = osl::FileBase::E_None;
nRet = maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
return (ULONG)nBytesWritten;
}
ULONG OslStream::SeekPos( ULONG nPos )
{
- FileBase::RC nRet;
+ osl::FileBase::RC nRet;
if( nPos == STREAM_SEEK_TO_END )
{
nRet = maFile.setPos( Pos_End, 0 );
@@ -433,7 +432,7 @@ void OslStream::FlushData()
void OslStream::SetSize( ULONG nSize )
{
- FileBase::RC nRet = FileBase::E_None;
+ osl::FileBase::RC nRet = osl::FileBase::E_None;
nRet = maFile.setSize( (sal_uInt64)nSize );
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index cf74f128737f..e2321c90e1fc 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#ifndef __RSC //autogen
#include <tools/errinf.hxx>
#endif
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index c752b823fa58..141367ed714a 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -326,7 +326,7 @@
#include "unotools/processfactory.hxx"
#include "unotools/sharedunocomponent.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
//---MARKER---
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index f5a66fabd10a..04a5d0b58b96 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -36,7 +36,7 @@
#include "java/tools.hxx"
#include "java/sql/SQLException.hxx"
#include <vos/process.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <com/sun/star/uno/Sequence.hxx>
#include "java/LocalRef.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 1e2461cfd6b2..4b631a45939a 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -49,7 +49,7 @@
#include "vcl/scrbar.hxx"
#include "vcl/svapp.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "svtools/extensionlistbox.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index a7e6faec3b00..cac4ae05f65e 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -32,7 +32,7 @@
#include "vcl/svapp.hxx"
#include "vcl/msgbox.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "toolkit/helper/vclunohelper.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e45cf7f3292f..b2e176550f0f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -104,7 +104,7 @@
#include "vcl/image.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/svapp.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "comphelper/processfactory.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 88d80966478a..685ce8b7c533 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -42,7 +42,7 @@
#include "vcl/dialog.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/svapp.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vcl/dialog.hxx"
#include "cppuhelper/implbase3.hxx"
@@ -80,7 +80,7 @@
#include "dp_gui_extensioncmdqueue.hxx"
#include "ucbhelper/content.hxx"
#include "osl/mutex.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
#include "com/sun/star/uno/Sequence.h"
#include "comphelper/anytostring.hxx"
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d33419d80984..d9c29b4e5cad 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -877,7 +877,7 @@
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index b7460484cce1..2c33b83e2250 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -42,7 +42,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <utility>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a11d110b04cf..f6e4ff48d2d7 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -38,7 +38,7 @@
#include <limits.h>
#include <vector>
#include <algorithm>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <editeng/flditem.hxx>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index c78dc1960a96..7400004bd132 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_editeng.hxx"
#include <tools/gen.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/awt/Point.hpp>
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 0ef08ea2c15c..41ec49fb2dd1 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -39,7 +39,7 @@
#include <vector>
#include <algorithm>
#include <boost/bind.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/sequenceasvector.hxx>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index a32662f03013..5228d80dccaa 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -37,7 +37,7 @@
#include <sot/formats.hxx>
#include <editeng/editeng.hxx>
#include <svl/itempool.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 77d94e928c71..e3d624fceced 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <editeng/flditem.hxx>
#include <svl/intitem.hxx>
#include <svtools/transfer.hxx>
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index a1019d61b46b..3e1a5f9143ad 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -30,7 +30,7 @@
#include "precompiled_editeng.hxx"
#include <editeng/UnoForbiddenCharsTable.hxx>
#include <editeng/forbiddencharacterstable.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unolingu.hxx> // LocalToLanguage, LanguageToLocale
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index a6da5f8d99a5..1c42104550f4 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -38,7 +38,7 @@
#include <limits.h>
#include <vector>
#include <algorithm>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/uno/Any.hxx>
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 81ffffabb2c7..1ef3d1c3ce0b 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
@@ -46,7 +46,6 @@
#include <comphelper/serviceinfohelper.hxx>
using namespace ::rtl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index bfdca69c6304..12d0d0986af8 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/graph.hxx>
#include <svtools/grfmgr.hxx>
#include <toolkit/unohlp.hxx>
@@ -57,7 +57,6 @@ using ::com::sun::star::util::XCloneable;
using ::com::sun::star::ucb::XAnyCompare;
-using namespace ::vos;
using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 4a0eca1cc416..6a0ebeede6a0 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -34,7 +34,7 @@
// Global header
//
//------------------------------------------------------------------------
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index dfa4b23361b4..4c9aadfdae98 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/text/ControlCharacter.hpp>
#include <com/sun/star/text/ControlCharacter.hpp>
#include <com/sun/star/text/XTextField.hdl>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svl/itemset.hxx>
#include <svl/itempool.hxx>
#include <svl/intitem.hxx>
@@ -57,7 +57,6 @@
#include <comphelper/serviceinfohelper.hxx>
using namespace ::rtl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 124dd1f97145..5a1132fb23ea 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_editeng.hxx"
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
@@ -44,7 +44,6 @@
#include <comphelper/serviceinfohelper.hxx>
using namespace ::rtl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 9d3291413004..0642d66f383d 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <tools/link.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/seqstream.hxx>
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index 20add6db18e9..15b01c88db95 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "CFStringUtilities.hxx"
#include "resourceprovider.hxx"
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index 0cd614b950ec..b85e7ab8448b 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -28,7 +28,7 @@
#include <functional>
#include <algorithm>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "CFStringUtilities.hxx"
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index ae63488256b1..e05fe4fb8dc9 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index 17fb370603b2..115bc1afe50c 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "SalAquaFolderPicker.hxx"
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index 5ebd975be240..43962a30d3d5 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -36,7 +36,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "SalAquaPicker.hxx"
#include <tools/urlobj.hxx>
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index d957892f629e..2d5c4595f886 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -32,7 +32,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 7b7259275ede..a5ea04e122bf 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -59,7 +59,7 @@
#include <unotools/pathoptions.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vcl/svapp.hxx"
// define ----------------------------------------------------------------
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 43d97bcd12d5..ea5d284d6084 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/weakeventlistener.hxx>
#include <comphelper/types.hxx>
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index dade4572ae4c..3f9c2c6937c3 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -51,7 +51,7 @@
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <SalGtkFilePicker.hxx>
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index 306f32c95579..dba73a512ce8 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "SalGtkFolderPicker.hxx"
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 4ffb60e594a5..70b99fcd543b 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -52,7 +52,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/uno/Any.hxx>
#include <FPServiceInfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "SalGtkPicker.hxx"
#include <tools/urlobj.hxx>
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index f4c89c752272..2fe687937103 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -35,7 +35,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include "resourceprovider.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 7a3cf65df5ae..9e7392a0dc45 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -41,7 +41,7 @@
#include <svtools/svtools.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx
index ed44e4bde1ce..b11d35a16aaf 100644
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.cxx
@@ -30,18 +30,18 @@
#include "precompiled_fpicker.hxx"
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.hxx>
int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
{
int nAcquireCount = 0;
- vos::IMutex& rSolarMutex = Application::GetSolarMutex();
+ osl::SolarMutex& rSolarMutex = Application::GetSolarMutex();
oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
if ( nMainThreadId == nThreadId )
{
- ::vos::IMutex& rMutex = Application::GetSolarMutex();
+ ::osl::SolarMutex& rMutex = Application::GetSolarMutex();
if ( rMutex.tryToAcquire() )
nAcquireCount = Application::ReleaseSolarMutex() - 1;
}
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index 9b177db586f0..7dcf6dac9a0f 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -28,7 +28,7 @@
#include "asyncrequests.hxx"
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//-----------------------------------------------------------------------------
// namespace
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 3146431d9456..d0ee330cc170 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -35,7 +35,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include "resourceprovider.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/simplerm.hxx>
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index f8cf02eebdfb..cebdb1ee7c50 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -487,7 +487,7 @@
#include "vcl/window.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
#include "vos/thread.hxx"
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 5677350b5349..5cbbbdae353d 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -45,8 +45,6 @@
// other includes
//_________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
-
//_________________________________________________________________________________________________________________
// namespace
//_________________________________________________________________________________________________________________
@@ -116,7 +114,7 @@ class LockHelper : public IMutex
//-------------------------------------------------------------------------------------------------------------
// ctor/dtor
//-------------------------------------------------------------------------------------------------------------
- LockHelper( ::vos::IMutex* pSolarMutex = NULL );
+ LockHelper( ::osl::SolarMutex* pSolarMutex = NULL );
virtual ~LockHelper( );
//-------------------------------------------------------------------------------------------------------------
@@ -137,7 +135,7 @@ class LockHelper : public IMutex
//-------------------------------------------------------------------------------------------------------------
// something else
//-------------------------------------------------------------------------------------------------------------
- static LockHelper& getGlobalLock ( ::vos::IMutex* pSolarMutex = NULL );
+ static LockHelper& getGlobalLock ( ::osl::SolarMutex* pSolarMutex = NULL );
::osl::Mutex& getShareableOslMutex( );
//-------------------------------------------------------------------------------------------------------------
@@ -169,7 +167,7 @@ class LockHelper : public IMutex
mutable FairRWLock* m_pFairRWLock ;
mutable ::osl::Mutex* m_pOwnMutex ;
- mutable ::vos::IMutex* m_pSolarMutex ;
+ mutable ::osl::SolarMutex* m_pSolarMutex ;
mutable ::osl::Mutex* m_pShareableOslMutex ;
mutable sal_Bool m_bDummySolarMutex ;
};
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index 499d6324d6ca..74c6b4d149ca 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -77,7 +77,7 @@ struct ThreadHelpBase
// public methods
//-------------------------------------------------------------------------------------------------------------
public:
- ThreadHelpBase( ::vos::IMutex* pSolarMutex = NULL )
+ ThreadHelpBase( ::osl::SolarMutex* pSolarMutex = NULL )
: m_aLock( pSolarMutex )
{
}
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx
index 74b8c50661ac..a5c701c7838a 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/classes/fwkresid.cxx
@@ -31,7 +31,7 @@
#include "classes/fwkresid.hxx"
#include <tools/string.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <rtl/strbuf.hxx>
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index 9e06707eac2a..27a5485c4484 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -31,7 +31,7 @@
#include "classes/fwlresid.hxx"
#include <tools/string.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <rtl/strbuf.hxx>
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 1c86cdd421c3..2275a1d7eb82 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -73,7 +73,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -83,7 +83,6 @@
//_________________________________________________________________________________________________________________
using namespace ::cppu;
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 693bda1e07df..38546c1640d3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -55,7 +55,7 @@
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/moduleoptions.hxx>
//_______________________________________________
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 6ae5f86c5ed0..e76c11ecf8da 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -59,7 +59,7 @@
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
#include <tools/rcid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/logfile.hxx>
@@ -84,10 +84,7 @@ using namespace ::com::sun::star::lang ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::util ;
using namespace ::cppu ;
-using namespace ::osl ;
-using namespace ::rtl ;
-using namespace ::vos ;
-
+ using ::rtl::OUString;
//_________________________________________________________________________________________________________________
// non exported const
//_________________________________________________________________________________________________________________
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index d5bf9e513b7a..96c57d78c3fe 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -58,7 +58,7 @@
//_________________________________________________________________________________________________________________
#include <ucbhelper/content.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
@@ -79,7 +79,6 @@ using namespace ::com::sun::star::util ;
using namespace ::cppu ;
using namespace ::osl ;
using namespace ::rtl ;
-using namespace ::vos ;
//_________________________________________________________________________________________________________________
// non exported const
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index c2f4c584c981..d5b6a9d287d0 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -57,7 +57,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/moduleoptions.hxx>
//_______________________________________________
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 7138f2656cc8..1df848ad358f 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -51,7 +51,7 @@
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <vcl/cmdevt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/logfile.hxx>
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 1827e6d6d99b..3506e0590af9 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/XBitmap.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/stream.hxx>
#include <cppuhelper/weak.hxx>
#include <comphelper/processfactory.hxx>
@@ -46,7 +46,6 @@
const USHORT START_ITEMID = 1000;
using namespace rtl;
-using namespace vos;
using namespace com::sun::star::awt;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx
index f2ddda2c085f..a21a634a9106 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/helper/propertysetcontainer.cxx
@@ -36,7 +36,6 @@
#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!"
using namespace rtl;
-using namespace vos;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index c063fd34241b..2e595386f8a3 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -63,7 +63,7 @@
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/configurationhelper.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//-----------------------------------------------
// namespace
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 0741a35d2018..d283d75f73ab 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -46,7 +46,7 @@
#include <vcl/syswin.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
//_______________________________________________
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index 25268bc514d0..49bb0245f49b 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -37,6 +37,7 @@
#include <macros/debug.hxx>
#include <macros/generic.hxx>
+#include "vcl/solarmutex.hxx"
//_________________________________________________________________________________________________________________
// interface includes
@@ -77,7 +78,7 @@ namespace framework{
@onerror -
*//*-*************************************************************************************************************/
-LockHelper::LockHelper( ::vos::IMutex* pSolarMutex )
+LockHelper::LockHelper( ::osl::SolarMutex* pSolarMutex )
: m_pFairRWLock ( NULL )
, m_pOwnMutex ( NULL )
, m_pSolarMutex ( NULL )
@@ -93,17 +94,17 @@ LockHelper::LockHelper( ::vos::IMutex* pSolarMutex )
}
break;
case E_SOLARMUTEX : {
- if( pSolarMutex == NULL )
- {
- m_pSolarMutex = new ::vos::OMutex;
- m_bDummySolarMutex = sal_True;
- }
- else
- {
- m_pSolarMutex = pSolarMutex;
- }
- }
- break;
+ if( pSolarMutex == NULL )
+ {
+ m_pSolarMutex = new ::vcl::SolarMutexObject;
+ m_bDummySolarMutex = sal_True;
+ }
+ else
+ {
+ m_pSolarMutex = pSolarMutex;
+ }
+ }
+ break;
case E_FAIRRWLOCK : {
m_pFairRWLock = new FairRWLock;
}
@@ -148,7 +149,7 @@ LockHelper::~LockHelper()
{
if (m_bDummySolarMutex)
{
- delete static_cast<vos::OMutex*>(m_pSolarMutex);
+ delete static_cast<vcl::SolarMutexObject*>(m_pSolarMutex);
m_bDummySolarMutex = sal_False;
}
m_pSolarMutex = NULL;
@@ -433,7 +434,7 @@ void LockHelper::downgradeWriteAccess()
@onerror No error should occure.
*//*-*************************************************************************************************************/
-LockHelper& LockHelper::getGlobalLock( ::vos::IMutex* pSolarMutex )
+LockHelper& LockHelper::getGlobalLock( ::osl::SolarMutex* pSolarMutex )
{
// Initialize static "member" only for one time!
// Algorithm:
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 54191bef7787..c57eb210b4fc 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -53,7 +53,7 @@
//_________________________________________________________________________________________________________________
#include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 6288e157030c..47300348d993 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -53,7 +53,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 320b68bd1970..2448f2004f98 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -53,7 +53,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 2139ebef9165..7cf66b62405a 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -63,7 +63,7 @@
#include <vcl/image.hxx>
#include <svtools/menuoptions.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// Copied from svx
// Function-Id's
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 8ac988114332..cb1fa6cc9e4e 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -52,7 +52,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index b52ce4f4aba0..2b9a6b811467 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -52,7 +52,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index b593cf453b08..3ef69ce99276 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -56,7 +56,7 @@
#include <rtl/ustrbuf.hxx>
#include <vcl/mnemonic.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index abc6f9157a79..955b909891cd 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -57,7 +57,7 @@
#include <vcl/print.hxx>
#include <svtools/ctrltool.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 1fc728e419d6..42f1acbb4ac0 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -52,7 +52,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 9e4abf317472..642dcf3cd5fb 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -60,7 +60,7 @@
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 4bd53d6d2436..fc99b77451c6 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -53,7 +53,7 @@
//_________________________________________________________________________________________________________________
#include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 2b68790a46d0..ec7f306cce03 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -72,7 +72,7 @@
#include <dispatch/uieventloghelper.hxx>
#include "helper/mischelper.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <map>
#include <set>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 50b2f44c97c9..a668d4890986 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -33,7 +33,7 @@
#include <classes/fwkresid.hxx>
#include <services.h>
#include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/status.hxx>
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index a4ba634c307d..6b20e717c457 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -32,7 +32,7 @@
#include <classes/fwlresid.hxx>
#include <services.h>
#include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/status.hxx>
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index 6ae22de22474..f332c458a6e7 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -32,7 +32,7 @@
#include <classes/fwlresid.hxx>
#include <services.h>
#include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/status.hxx>
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 6a8ab3f1c3f1..83ed615f1d80 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -49,7 +49,7 @@
#include <rtl/ustrbuf.hxx>
#include <dispatch/uieventloghelper.hxx>
#include "helper/mischelper.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 6e6e72aad362..d6a6c0473656 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -87,7 +87,7 @@
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -113,7 +113,6 @@ struct SystemMenuData
//_________________________________________________________________________________________________________________
using namespace ::cppu;
-using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index c5d09e12584e..a89daf163cf2 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -66,7 +66,7 @@
#include <svtools/acceleratorexecute.hxx>
#include <unotools/moduleoptions.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 2668c0cdf288..ebe99722af25 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -56,7 +56,7 @@
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 0eb398000eef..31308e9a7df1 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -39,7 +39,7 @@
#include <vcl/toolbox.hxx>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "uielement/popupmenucontroller.hxx"
#include "services.h"
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index d0ce26a9f330..78186f94aac8 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -64,7 +64,7 @@
#include <odma_lib.hxx>
#endif
#include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index fe9be5614e84..df968765a6e6 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -32,7 +32,7 @@
#include <classes/fwkresid.hxx>
#include <services.h>
#include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/status.hxx>
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 0cf4455fe697..32c1fbb0777e 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -55,7 +55,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 521b9e5a312f..28bc86fb49b5 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -41,7 +41,7 @@
//_________________________________________________________________________________________________________________
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
using namespace cppu;
using namespace com::sun::star::uno;
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 6dc632bbf8d3..e15a63c20f74 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -53,7 +53,7 @@
//_________________________________________________________________________________________________________________
#include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <tools/urlobj.hxx>
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index e7eeeff120ee..f79ad08e0caa 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -45,7 +45,7 @@
#include <cppuhelper/implbase5.hxx> // helper for implementations
#include <cppuhelper/interfacecontainer.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <boost/shared_ptr.hpp>
#include <map>
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index 6ce97eb241ea..acec5ae07bef 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -31,7 +31,7 @@
#include "baslibnode.hxx"
#include "basmodnode.hxx"
#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbstar.hxx>
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index ecc0734df638..f87ee1759dd2 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbstar.hxx>
#include <basic/sbmeth.hxx>
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index d6b908e582a6..d64cdac165d4 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -31,7 +31,7 @@
#include "basmodnode.hxx"
#include "basmethnode.hxx"
#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbx.hxx>
#include <basic/sbstar.hxx>
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 2893f2cf3a19..5cb4e1425f7b 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -40,7 +40,7 @@
#include <rtl/uri.hxx>
#include <osl/process.h>
#include <osl/file.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbx.hxx>
#include <basic/basmgr.hxx>
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index f6fc16332905..978065053d5d 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_scripting.hxx"
#include "basscript.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbx.hxx>
#include <basic/sbstar.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index dbae6747e73c..ae7edcd1f87d 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -659,7 +659,7 @@
#include "vcl/wintypes.hxx"
#include "osl/diagnose.h"
#include "vos/module.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
#include "vos/xception.hxx"
//---MARKER---
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index 977916ed532c..bb0b3226bdb2 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
@@ -36,10 +36,6 @@
#include <cppuhelper/implbase1.hxx>
-namespace vos
-{
- class IMutex;
-}
//........................................................................
namespace sfx2
@@ -66,10 +62,10 @@ namespace sfx2
class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base
{
IModifiableDocument* m_pDocument;
- ::vos::IMutex& m_rMutex;
+ ::osl::SolarMutex& m_rMutex;
public:
- DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::vos::IMutex& _rMutex );
+ DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::osl::SolarMutex& _rMutex );
void dispose();
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index d6a46a7c40fc..0ed460f4f11c 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -85,7 +85,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/script/XStarBasicAccess.hpp>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/link.hxx>
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 6c9fc38b545e..3cf26042b47d 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -35,7 +35,7 @@
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index ec59acf5b66f..51e78740c72b 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/uno/Reference.h>
#include <tools/config.hxx>
#include <tools/rcid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
@@ -87,7 +87,6 @@
#include <sfx2/objface.hxx>
#include "helper.hxx" // SfxContentHelper::Kill()
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
@@ -165,7 +164,7 @@ void SfxApplication::InitializeDisplayName_Impl()
String aTitle = Application::GetDisplayName();
if ( !aTitle.Len() )
{
- OClearableGuard aGuard( OMutex::getGlobalMutex() );
+ osl::ClearableMutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// create version string
/*!!! (pb) don't show a version number at the moment
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 7a7c4ee29e10..553d804d0a97 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -81,7 +81,7 @@
#include <comphelper/docpasswordhelper.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/logfile.hxx>
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index 1b080cb7df21..60ae5499cc8e 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include "sal/config.h"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "workwin.hxx"
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 594b64691679..b5126744aa50 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -51,7 +51,7 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "vcl/svapp.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
namespace css = com::sun::star;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 7af9797e4d94..d75c3ef86b8f 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -32,7 +32,7 @@
#include <shutdownicon.hxx>
#include <app.hrc>
#include <sfx2/app.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/miscopt.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -77,7 +77,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::ui::dialogs;
-using namespace ::vos;
using namespace ::rtl;
using namespace ::sfx2;
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index a3fb6d15c398..8ce1927f80bf 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -34,7 +34,7 @@
#include "tools/urlobj.hxx"
#include "osl/file.h"
#include "comphelper/sequenceashashmap.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "sfx2/app.hxx"
#include <sal/macros.h>
#include "app.hrc"
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 1722d022e106..ab3b2c6bb4ec 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -9,7 +9,7 @@
#include <gtk/gtk.h>
#include <glib.h>
#include <eggtray/eggtrayicon.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bmpacc.hxx>
#include <sfx2/app.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 64c093a1cf22..5b54302a6a09 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -98,7 +98,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::beans;
-using namespace ::vos;
#include <svl/ctypeitm.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/syslocale.hxx>
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 059e55a0b169..d921e3496062 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -42,7 +42,7 @@
#include <sfx2/docfac.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//*****************************************************************************************************************
// namespaces
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 77ec791cf7d3..b28143f9661a 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -38,7 +38,7 @@
#include <svl/visitem.hxx>
#include <cppuhelper/weak.hxx>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/status/ItemStatus.hpp>
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 59e6181c0472..d585f6374604 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -38,7 +38,7 @@
#include <svl/visitem.hxx>
#include <cppuhelper/weak.hxx>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 285e0ba2be4f..ff016fe03509 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -51,7 +51,7 @@
#include <com/sun/star/frame/status/Visibility.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <uno/current_context.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 05d29f701f20..dad3134ea671 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -64,7 +64,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/localfilehelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/security.hxx>
#include <osl/thread.hxx>
#include <vcl/cvtgrf.hxx>
@@ -1160,7 +1160,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl()
class PickerThread_Impl : public ::osl::Thread
{
uno::Reference < XFilePicker > mxPicker;
- ::vos::OMutex maMutex;
+ ::osl::Mutex maMutex;
virtual void SAL_CALL run();
sal_Int16 mnRet;
public:
@@ -1168,10 +1168,10 @@ public:
: mxPicker( rPicker ), mnRet(nMagic) {}
sal_Int16 GetReturnValue()
- { ::vos::OGuard aGuard( maMutex ); return mnRet; }
+ { ::osl::MutexGuard aGuard( maMutex ); return mnRet; }
void SetReturnValue( sal_Int16 aRetValue )
- { ::vos::OGuard aGuard( maMutex ); mnRet = aRetValue; }
+ { ::osl::MutexGuard aGuard( maMutex ); mnRet = aRetValue; }
};
void SAL_CALL PickerThread_Impl::run()
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index 45593c1f3342..93d0291ac310 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -46,7 +46,7 @@
#include <com/sun/star/system/SimpleMailClientFlags.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <rtl/textench.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/uri.h>
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 6f9b99f5ee3e..c96b627b3cee 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -31,7 +31,7 @@
#include <sfx2/Metadatable.hxx>
#include <sfx2/XmlIdRegistry.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx> // solarmutex
#include <rtl/random.h>
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index ccaa7829525d..25bf00d241be 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sfx2.hxx"
#include "sfx2/docstoragemodifylistener.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
/** === begin UNO includes === **/
/** === end UNO includes === **/
@@ -57,7 +57,7 @@ namespace sfx2
//=
//====================================================================
//--------------------------------------------------------------------
- DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::vos::IMutex& _rMutex )
+ DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::osl::SolarMutex& _rMutex )
:m_pDocument( &_rDocument )
,m_rMutex( _rMutex )
{
@@ -71,14 +71,14 @@ namespace sfx2
//--------------------------------------------------------------------
void DocumentStorageModifyListener::dispose()
{
- ::vos::OGuard aGuard( m_rMutex );
+ ::osl::SolarMutexGuard aGuard( m_rMutex );
m_pDocument = NULL;
}
//--------------------------------------------------------------------
void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( m_rMutex );
+ ::osl::SolarMutexGuard aGuard( m_rMutex );
// storageIsModified must not contain any locking!
if ( m_pDocument )
m_pDocument->storageIsModified();
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 953f9de242f6..6d40eed84105 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -31,7 +31,7 @@
#include <limits.h>
#include <com/sun/star/uno/Any.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <tools/resary.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 75420ecfd2d3..9c6a821e952f 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sfx2.hxx"
#include "doctemplates.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <rtl/ustring.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index bbc4ddb0aa05..b4f30307080a 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -35,7 +35,7 @@
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <svtools/svparser.hxx> // SvKeyValue
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 509f98536c21..adb597c91a13 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -55,7 +55,7 @@
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/errcode.hxx>
#include <svl/cntwids.hrc>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 9d2c32574370..2bd8aa5a8bec 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XTitle.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/resary.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index a07882f19c8a..671c6098fe4f 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -53,7 +53,7 @@
#include <tools/urlobj.hxx>
#include <ucbhelper/content.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svtools/printdlg.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3a11248c8d94..d6fb6e5e68de 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -81,7 +81,7 @@
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/tempfile.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/salctype.hxx>
#include <sot/clsids.hxx>
#include <sot/storinfo.hxx>
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index e012eea39c2d..524fa6c326a9 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -52,7 +52,7 @@
#include <comphelper/sequenceasvector.hxx>
#include <sfx2/sfxuno.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <svl/lstner.hxx>
#include <unotools/eventcfg.hxx>
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 0ba5de4f7b6f..565d148c6e8b 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -35,7 +35,7 @@
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#ifndef DELETEZ
#define DELETEZ(pPtr) ( delete pPtr, pPtr = 0 )
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 247f5e7f3caf..19f03eab458e 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -39,7 +39,7 @@
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx> // SvUShorts
#include <rtl/ustring.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/childwin.hxx>
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index fc5f4ab49983..95a1b4de926a 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -41,7 +41,7 @@
#include <vcl/toolbox.hxx>
#include <toolkit/unohlp.hxx>
#include <osl/thread.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <svl/itemset.hxx>
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 1d70023b172e..7dc74d5b0fc8 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -45,7 +45,7 @@
#include <tools/rcid.h>
#include <tools/link.hxx>
#include <svtools/miscopt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 0bdd6f908980..9794bc8735e0 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -76,7 +76,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/simpleinteractionrequest.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
/** === begin UNO using === **/
using ::com::sun::star::beans::PropertyValue;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 1e8076f5d87e..37da366100a8 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -81,7 +81,7 @@
#include <workwin.hxx>
#include <sfx2/objface.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/sequence.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c7e5a0297ec4..3f6499d629ea 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -50,7 +50,7 @@
#include <cppuhelper/implbase1.hxx>
#include <osl/file.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/urlobj.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 6f47b2ace69e..3d801720decd 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -944,7 +944,7 @@
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 32eb131423c2..bdc1e749d2e7 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -42,7 +42,7 @@
#include <tools/date.hxx>
#include <tools/ref.hxx>
#include <svtools/editbrowsebox.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/propmultiplex.hxx>
#include <svtools/transfer.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index d1a63b5dfd27..ed675738de9d 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/awt/FocusChangeReason.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svx/frmsel.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index d416bffc767c..fff5c6e82895 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -39,7 +39,7 @@
#include <memory>
#include <algorithm>
#include <deque>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 9e82a96434db..51f61e1d3e11 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -32,7 +32,7 @@
#include <svx/AccessibleShapeTreeInfo.hxx>
#include <editeng/AccessibleContextBase.hxx>
#include <cppuhelper/compbase2.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vector>
#include <memory>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index d8d7f7fdbb2f..5b36cb30efff 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 795b2913377c..5cd04a2f4cec 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/uno/Exception.hpp>
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 1e5f9d32ac83..648d422973d1 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -63,7 +63,6 @@
//===== namespaces ===========================================================
-using namespace ::vos;
using namespace ::cppu;
using namespace ::osl;
using ::rtl::OUString;
@@ -118,7 +117,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
}
else
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_NAME );
}
@@ -128,7 +127,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
}
else
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION );
}
@@ -288,7 +287,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpPage )
throw DisposedException();
@@ -302,7 +301,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void
SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
throw( RuntimeException, lang::IndexOutOfBoundsException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpPage )
throw DisposedException();
@@ -342,7 +341,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve
Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
throw( RuntimeException, lang::IndexOutOfBoundsException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return getAccessible( getSdrObject( nIndex ) );
}
@@ -358,7 +357,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessiblePa
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
// Use a simple but slow solution for now. Optimize later.
// Iterate over all the parent's children and search for this object.
@@ -397,7 +396,7 @@ sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) thro
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return msDescription;
}
@@ -405,7 +404,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return msName;
}
@@ -423,7 +422,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA
Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -450,7 +449,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce
lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mxParent.is() )
{
@@ -470,7 +469,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference<
{
if (xListener.is())
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if (!mnClientId)
mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
@@ -484,7 +483,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc
{
if (xListener.is())
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
if ( !nListenerCount )
@@ -504,7 +503,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc
void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener )
throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( xListener.is() )
{
@@ -519,7 +518,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference<
void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener )
throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( xListener.is() )
{
@@ -533,7 +532,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc
void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpControl )
throw DisposedException();
@@ -583,7 +582,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) t
sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
// Iterate over all supported service names and return true if on of them
// matches the given name.
Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
@@ -615,7 +614,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return getUniqueId();
}
@@ -630,7 +629,7 @@ OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeExc
void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -645,7 +644,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI
sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -657,7 +656,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_
void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -669,7 +668,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R
void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -681,7 +680,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -695,7 +694,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun
Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex )
throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
checkChildIndexOnSelection( nIndex );
@@ -713,7 +712,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce
void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
checkChildIndexOnSelection( nIndex );
@@ -760,7 +759,7 @@ void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) th
void SvxGraphCtrlAccessibleContext::setName( const OUString& rName )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
msName = rName;
}
@@ -769,7 +768,7 @@ void SvxGraphCtrlAccessibleContext::setName( const OUString& rName )
void SvxGraphCtrlAccessibleContext::setDescription( const OUString& rDescr )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
msDescription = rDescr;
}
@@ -784,7 +783,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
SdrModel* pModel,
SdrView* pView)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
mpModel = pModel;
if (mpModel != NULL)
@@ -811,7 +810,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mbDisposed )
return;
@@ -850,7 +849,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpControl )
throw DisposedException();
@@ -869,7 +868,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R
*/
Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Rectangle aBounds ( 0, 0, 0, 0 );
@@ -898,7 +897,7 @@ Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
static OImplementationId* pId = 0;
if( !pId )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( !pId)
{
static OImplementationId aId;
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 53a23159f8b5..78ebf9c6c6c9 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -33,7 +33,7 @@
#include <svx/SvxShapeTypes.hxx>
#include <svx/AccessibleShapeInfo.hxx>
#include <com/sun/star/drawing/XShapeDescriptor.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
#include "svdstr.hrc"
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 84d4c838e049..603f9e4a68de 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -167,7 +167,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
msName = *pName;
else
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_NAME : RID_SVXSTR_RECTCTL_ACC_CORN_NAME );
}
@@ -175,7 +175,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
msDescription = *pDesc;
else
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR : RID_SVXSTR_RECTCTL_ACC_CORN_DESCR );
}
@@ -292,7 +292,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
Reference< XAccessible > xChild = mpChilds[ nIndex ];
if( !xChild.is() )
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -486,7 +486,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeFocusListener( const Reference<
void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException )
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -503,7 +503,7 @@ Any SAL_CALL SvxRectCtlAccessibleContext::getAccessibleKeyBinding() throw( Runti
sal_Int32 SvxRectCtlAccessibleContext::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -512,7 +512,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( )
sal_Int32 SvxRectCtlAccessibleContext::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -561,7 +561,7 @@ Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId(
void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -756,7 +756,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException )
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -766,7 +766,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run
Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -922,7 +922,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleKeyBinding() throw(
sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( maMutex );
ThrowExceptionIfNotAlive();
return mrParentWindow.GetControlForeground().GetColor();
@@ -930,7 +930,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( )
sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( maMutex );
ThrowExceptionIfNotAlive();
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 3cec635b2596..334b3ffd0841 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -38,7 +38,7 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/toolbox.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sfx2/imagemgr.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 70509e1ac7d9..7ac2e5a84e93 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -99,7 +99,7 @@ void TabDialog4Recovery::addTabPage(IExtendedTabPage* pPage)
//===============================================
short TabDialog4Recovery::Execute()
{
- SolarMutexGuard aLock;
+ ::SolarMutexGuard aLock;
Show();
m_pActualPage = m_lTabPages.begin();
@@ -807,7 +807,7 @@ IMPL_LINK( SaveDialog, OKButtonHdl, void*, EMPTYARG )
//===============================================
short SaveDialog::execute()
{
- SolarMutexGuard aLock;
+ ::SolarMutexGuard aLock;
// wait for user input "OK"
m_nResult = DLG_RET_UNKNOWN;
@@ -858,7 +858,7 @@ SaveProgressDialog::~SaveProgressDialog()
//===============================================
short SaveProgressDialog::Execute()
{
- SolarMutexGuard aLock;
+ ::SolarMutexGuard aLock;
m_pCore->setProgressHandler(m_xProgress);
m_pCore->setUpdateListener(this);
@@ -1121,7 +1121,7 @@ RecoveryDialog::~RecoveryDialog()
//===============================================
short RecoveryDialog::execute()
{
- SolarMutexGuard aSolarLock;
+ ::SolarMutexGuard aSolarLock;
switch(m_eRecoveryState)
{
@@ -1658,7 +1658,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
short ErrorRepWelcomeDialog::execute()
{
- SolarMutexGuard aLock;
+ ::SolarMutexGuard aLock;
Show();
m_nResult = DLG_RET_UNKNOWN;
while(m_nResult == DLG_RET_UNKNOWN)
@@ -1768,7 +1768,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
short ErrorRepSendDialog::execute()
{
- SolarMutexGuard aLock;
+ ::SolarMutexGuard aLock;
Show();
m_nResult = DLG_RET_UNKNOWN;
while(m_nResult == DLG_RET_UNKNOWN)
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 7db917607631..d0692180b3fe 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
//==============================================================================
//------------------------------------------------------------------------------
-::vos::OMutex Tracer::s_aMapSafety;
+::osl::Mutex Tracer::s_aMapSafety;
::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::osl::ThreadIdentifier > >
Tracer::s_aThreadIndents;
@@ -44,7 +44,7 @@
Tracer::Tracer(const char* _pBlockDescription)
:m_sBlockDescription(_pBlockDescription)
{
- ::vos::OGuard aGuard(s_aMapSafety);
+ ::osl::MutexGuard aGuard(s_aMapSafety);
INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
ByteString sIndent;
@@ -64,7 +64,7 @@ Tracer::Tracer(const char* _pBlockDescription)
//------------------------------------------------------------------------------
Tracer::~Tracer()
{
- ::vos::OGuard aGuard(s_aMapSafety);
+ ::osl::MutexGuard aGuard(s_aMapSafety);
INT32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
@@ -84,7 +84,7 @@ Tracer::~Tracer()
//------------------------------------------------------------------------------
void Tracer::TraceString(const char* _pMessage)
{
- ::vos::OGuard aGuard(s_aMapSafety);
+ ::osl::MutexGuard aGuard(s_aMapSafety);
INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
@@ -105,7 +105,7 @@ void Tracer::TraceString(const char* _pMessage)
//------------------------------------------------------------------------------
void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
{
- ::vos::OGuard aGuard(s_aMapSafety);
+ ::osl::MutexGuard aGuard(s_aMapSafety);
INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index fdc226ef618e..b92f39caa6d1 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -39,7 +39,7 @@
#include <unotools/syslocale.hxx>
#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
using namespace svxform;
using namespace ::connectivity;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 47184603eda7..fe9542d0a7c1 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -46,7 +46,7 @@
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sfx2/objsh.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1802c5e00857..7185a0dae03e 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -112,7 +112,7 @@
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <algorithm>
#include <functional>
@@ -865,7 +865,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
// (Solche Paints passieren zum Beispiel, wenn man einfach nur eine andere Applikation ueber das Office legt und wieder
// zurueckschaltet).
// Deshalb die Benutzung des SolarMutex, der sichert das ab.
- ::vos::IMutex& rSolarSafety = Application::GetSolarMutex();
+ ::osl::SolarMutex& rSolarSafety = Application::GetSolarMutex();
if (rSolarSafety.tryToAcquire())
{
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_RECORD_TOTAL , sal_True, sal_False);
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 2b7064aa316a..a1a3f1592f68 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -74,7 +74,7 @@
#include <tools/diagnose_ex.h>
#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <memory>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 2fdd700b8ad2..7dfbea35000b 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -64,7 +64,7 @@
#include <sfx2/sfx.hrc>
#include <sfx2/event.hxx>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/property.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 05aebc76ceee..2165fed5ffe7 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -94,7 +94,7 @@
#include <tools/diagnose_ex.h>
#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/logfile.hxx>
#include <algorithm>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index fa9590c76912..d9be80fb949f 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -90,7 +90,7 @@
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/logfile.hxx>
#include <algorithm>
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 856ed4742a04..8712a12c1bca 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -71,7 +71,6 @@
#include <galtheme.hxx>
#include <svx/gallery1.hxx>
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::lang;
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index fcd23eeea474..75e42799a3da 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -43,7 +43,7 @@
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <svl/lstner.hxx>
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index b0a1aead4aaf..36f7785f6347 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -25,7 +25,7 @@
*
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/list.hxx>
#include <tools/color.hxx>
#include <tools/string.hxx>
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index a50ccca56b7a..e6ae46625980 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -44,7 +44,7 @@
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/compbase6.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index 5ef608810ba2..e28aacf4cf96 100644
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
@@ -31,7 +31,7 @@
#include <tools/string.hxx>
#include <osl/thread.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/stl_types.hxx>
@@ -42,7 +42,7 @@ class Tracer
DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
static MapThreadId2Int s_aThreadIndents;
- static ::vos::OMutex s_aMapSafety;
+ static ::osl::Mutex s_aMapSafety;
public:
Tracer(const char* _pBlockDescription);
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index a2d124dc58cd..4de86259677b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -61,7 +61,7 @@
#include <toolkit/helper/formpdfexport.hxx>
#include <vcl/pdfextoutdevdata.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/scopeguard.hxx>
#include <cppuhelper/implbase4.hxx>
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index e67b2d8e151b..8ed5ddd39de5 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -32,7 +32,7 @@
#include "precompiled_svx.hxx"
#include <svx/SmartTagMgr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 77074eeb15f4..1f3c9c9eb761 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -43,7 +43,7 @@
#include <sdrpaintwindow.hxx>
#include <svx/sdr/contact/objectcontactofpageview.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svx/fmview.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index eba7259dac63..32bab5888d41 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -73,7 +73,7 @@
#include <svl/solar.hrc>
#include <svl/urihelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svx/svdpagv.hxx>
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index cf414fa932d3..2af13fcd44a2 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <comphelper/accessiblewrapper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index aea9736ae2b1..359517193e82 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -39,7 +39,7 @@
#include <svl/style.hxx>
#include <svl/itemset.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "svx/sdr/properties/textproperties.hxx"
@@ -66,7 +66,6 @@
// -----------------------------------------------------------------------------
using ::rtl::OUString;
-using ::vos::OGuard;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
@@ -994,7 +993,7 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE
void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1139,7 +1138,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1255,7 +1254,7 @@ void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName
void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1286,7 +1285,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName
Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1340,7 +1339,7 @@ void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPr
PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1452,7 +1451,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1483,7 +1482,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt
void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1526,7 +1525,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U
Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index c9b4c6f294c5..e172dc31aa95 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -33,7 +33,7 @@
#include <rtl/ref.hxx>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
#include <svl/lstner.hxx>
@@ -62,7 +62,6 @@
using ::rtl::OUString;
using namespace ::osl;
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::linguistic2;
@@ -939,7 +938,7 @@ CellEditSource::CellEditSource( CellEditSourceImpl* pImpl )
//------------------------------------------------------------------------
CellEditSource::~CellEditSource()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
mpImpl->release();
}
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 86926f878344..f52b7ae7b1a6 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -41,7 +41,7 @@
#include <comphelper/serviceinfohelper.hxx>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -71,7 +71,6 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::container;
using ::rtl::OUString;
-using ::vos::OGuard;
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
using ::cppu::OInterfaceContainerHelper;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index af99e593d0e4..ef2723f45fc1 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -35,7 +35,7 @@
#include <boost/bind.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "cell.hxx"
#include "cellcursor.hxx"
@@ -54,7 +54,6 @@
using ::rtl::OUString;
using namespace ::osl;
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::lang;
@@ -316,7 +315,7 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV
Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return createCursorByRange( Reference< XCellRange >( this ) );
}
@@ -324,7 +323,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep
Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& Range ) throw (IllegalArgumentException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
ICellRange* pRange = dynamic_cast< ICellRange* >( Range.get() );
if( (pRange == 0) || (pRange->getTable().get() != this) )
@@ -338,7 +337,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen
sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return getRowCountImpl();
}
@@ -346,7 +345,7 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return getColumnCountImpl();
}
@@ -356,7 +355,7 @@ sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
void TableModel::dispose() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
TableModelBase::dispose();
}
@@ -380,7 +379,7 @@ void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >
sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return mbModified;
}
@@ -389,7 +388,7 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException)
void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException)
{
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
mbModified = bModified;
}
if( bModified )
@@ -418,7 +417,7 @@ void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener
Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( !mxTableColumns.is() )
mxTableColumns.set( new TableColumns( this ) );
@@ -429,7 +428,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep
Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( !mxTableRows.is() )
mxTableRows.set( new TableRows( this ) );
@@ -442,7 +441,7 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
CellRef xCell( getCell( nColumn, nRow ) );
if( xCell.is() )
@@ -455,7 +454,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa
Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (nLeft >= 0) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) && (nRight < getColumnCountImpl()) && (nBottom < getRowCountImpl() ) )
{
@@ -593,14 +592,14 @@ void TableModel::disposing()
void TableModel::lockBroadcasts() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
++mnNotifyLock;
}
// -----------------------------------------------------------------------------
void TableModel::unlockBroadcasts() throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
--mnNotifyLock;
if( mnNotifyLock <= 0 )
{
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 742035cc69fe..b01d80e7b473 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/awt/XPopupMenuExtended.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/toolbox.hxx>
#include <sfx2/app.hxx>
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 0fab0efb2be2..84072d2c07bc 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -40,7 +40,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/ctrlbox.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <memory>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index bcb87e57eaea..a416636bed3d 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -41,7 +41,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace svx
{
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 48ebaf6fc68c..428a57fc0817 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -39,7 +39,7 @@
#include <tools/shl.hxx>
#include <sfx2/imagemgr.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sfx2/app.hxx>
#include <vcl/toolbox.hxx>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 281080e2d2e7..288b6d2967a2 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -32,7 +32,7 @@
#include "chinese_translation_unodialog.hxx"
#include "chinese_translationdialog.hxx"
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index d57d7e94e5f7..cdaa93041f73 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -30,7 +30,7 @@
#include "precompiled_svx.hxx"
#include <vector>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -85,7 +85,6 @@
using namespace ::comphelper;
using namespace ::osl;
-using namespace ::vos;
using ::rtl::OUString;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -1000,7 +999,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor )
throw(RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == mpUnoPage )
return sal_False;
@@ -1091,7 +1090,7 @@ void SAL_CALL GraphicExporter::cancel()
void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent )
throw(IllegalArgumentException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
mxShapes = NULL;
mpUnoPage = NULL;
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 909b2b3e9d8c..e9ac73c05451 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -37,7 +37,7 @@
#include <svx/svdmodel.hxx>
#include "UnoNameItemTable.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "unoapi.hxx"
@@ -45,7 +45,6 @@
using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::cppu;
-using namespace ::vos;
SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw()
: mpModel( pModel ),
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index a9835ae262fa..4947bf6149bd 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/drawing/Hatch.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -50,7 +50,6 @@
using namespace com::sun::star;
using namespace ::cppu;
using namespace ::rtl;
-using namespace ::vos;
class SvxUnoXPropertyTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
{
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 43d0bac31849..6f010ad688b9 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -110,7 +110,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL&
{
// Internaly we use VCL ... every call into vcl based code must
// be guarded by locking the global solar mutex.
- SolarMutexGuard aSolarLock;
+ ::SolarMutexGuard aSolarLock;
css::uno::Any aRet;
RecoveryUI::EJob eJob = impl_classifyJob(aURL);
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 5dd4e859cde4..6a9ac061bb15 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -30,7 +30,7 @@
#include "precompiled_svx.hxx"
#include <svx/svdobj.hxx>
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 79bab2d5c227..42cbf2ef4a6e 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/drawing/XShape.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/list.hxx>
#include <svl/itemprop.hxx>
@@ -67,7 +67,6 @@
using namespace ::rtl;
using namespace ::osl;
-using namespace ::vos;
using namespace ::com::sun::star;
//-////////////////////////////////////////////////////////////////////
@@ -348,7 +347,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( )
uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPages > xDrawPages( mxDrawPagesAccess );
@@ -362,7 +361,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages(
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) )
{
@@ -601,7 +600,7 @@ SvxUnoDrawPagesAccess::~SvxUnoDrawPagesAccess() throw()
sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nCount = 0;
@@ -614,7 +613,7 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Any aAny;
@@ -666,7 +665,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPage > xDrawPage;
@@ -689,7 +688,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy
void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount();
if( nPageCount > 1 )
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 843be28f22ff..635f78a5e07b 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -47,7 +47,7 @@
#include <svx/xflhtit.hxx>
#include <vector>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -58,7 +58,6 @@
using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::cppu;
-using namespace ::vos;
typedef std::vector< SfxItemSet* > ItemPoolVector;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index c67fad50d698..57cc94230450 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -32,7 +32,7 @@
#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/document/EventObject.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <sfx2/dispatch.hxx>
#include <sot/clsids.hxx>
@@ -61,7 +61,6 @@
#include <vcl/svapp.hxx>
using ::rtl::OUString;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 9896b361bbd6..420e85331057 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -33,7 +33,7 @@
#include <comphelper/propertysetinfo.hxx>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "unopool.hxx"
#include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 04c0ff829e45..49bce7951530 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -45,7 +45,7 @@
#include <hash_map>
#include <vcl/fldunit.hxx>
#include <tools/shl.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 5b1024155e3c..1d4e0b8c3089 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -43,7 +43,7 @@
#include <tools/urlobj.hxx>
#include <unotools/localfilehelper.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svtools/fltcall.hxx>
#include <svtools/filter.hxx>
@@ -75,7 +75,6 @@
using ::rtl::OUString;
using namespace ::osl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -222,7 +221,7 @@ void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException)
void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -264,7 +263,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap
void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdrObject* pSdrShape = NULL;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -318,7 +317,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
//----------------------------------------------------------------------
sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nRetval = 0;
@@ -334,7 +333,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( !mpObj.is() || mpObj->GetSubList() == NULL )
throw uno::RuntimeException();
@@ -362,7 +361,7 @@ uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException
//----------------------------------------------------------------------
sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
}
@@ -480,7 +479,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -496,7 +495,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -512,7 +511,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
mpObj->DisconnectFromNode( sal_True );
@@ -525,7 +524,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
mpObj->DisconnectFromNode( sal_False );
@@ -648,7 +647,7 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< awt::XControlModel > xModel;
@@ -663,7 +662,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdrUnoObj* pUnoObj = dynamic_cast< SdrUnoObj * >(mpObj.get());
if( pUnoObj )
@@ -1290,7 +1289,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
((SdrPathObj*)mpObj.get())->SetPathPoly(rNew);
@@ -1299,7 +1298,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(
//----------------------------------------------------------------------
basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
{
@@ -1586,7 +1585,7 @@ drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
static_cast<SdrPathObj*>(mpObj.get())->SetPathPoly(rNew);
@@ -1595,7 +1594,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
//----------------------------------------------------------------------
basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(mpObj.is())
{
@@ -1957,7 +1956,7 @@ OUString SAL_CALL SvxCustomShape::getShapeType()
//------------------------------------------------------------------1----
awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if ( mpModel && mpObj.is() )
{
SdrAShapeObjGeoData aCustomShapeGeoData;
@@ -2062,7 +2061,7 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize )
void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdrObject* pObject = mpObj.get();
sal_Bool bCustomShapeGeometry = pObject && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShapeGeometry" ) );
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index e2dc8988bb58..49bffe3565f9 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/drawing/DoubleSequence.hpp>
#include <com/sun/star/drawing/CameraGeometry.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <rtl/uuid.h>
@@ -60,7 +60,6 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
using ::rtl::OUString;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index abf23b1d3d0b..6765b586cf29 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -44,7 +44,7 @@
#include <sfx2/frmdescr.hxx>
#endif
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/objsh.hxx>
@@ -72,7 +72,6 @@ extern sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rT
///////////////////////////////////////////////////////////////////////
using namespace ::osl;
-using namespace ::vos;
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index ffa3849ce9be..2c57a016db09 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -38,7 +38,7 @@
#include <vcl/svapp.hxx>
#include <svl/itemprop.hxx>
#include <svtools/fltcall.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <editeng/unotext.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoole2.hxx>
@@ -110,7 +110,6 @@
using ::rtl::OUString;
using namespace ::osl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -253,7 +252,7 @@ SvxShape::SvxShape() throw()
//----------------------------------------------------------------------
SvxShape::~SvxShape() throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount == 0, "Locked shape was disposed!" );
@@ -1242,7 +1241,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1265,7 +1264,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpModel )
{
@@ -1295,7 +1294,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
//----------------------------------------------------------------------
awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1312,7 +1311,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
throw(beans::PropertyVetoException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1356,7 +1355,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
// XNamed
OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() )
{
return mpObj->GetName();
@@ -1371,7 +1370,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce
void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() )
{
mpObj->SetName( aName );
@@ -1398,7 +1397,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpImpl->mbDisposing )
return; // caught a recursion
@@ -1931,7 +1930,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u
void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName);
@@ -2056,7 +2055,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -2115,7 +2114,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
// XMultiPropertySet
void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
+ ::SolarMutexGuard aSolarGuard;
const sal_Int32 nCount = aPropertyNames.getLength();
const OUString* pNames = aPropertyNames.getConstArray();
@@ -2341,7 +2340,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper
beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -3338,7 +3337,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -3371,7 +3370,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName);
@@ -3397,7 +3396,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
// XMultiPropertyStates
void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( !mpObj.is() )
throw lang::DisposedException();
@@ -3517,7 +3516,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()
uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor)
{
@@ -3530,7 +3529,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_GroupServices;
@@ -3550,7 +3549,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CustomShapeServices;
@@ -3581,7 +3580,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_LineServices;
@@ -3616,7 +3615,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_RectServices;
@@ -3653,7 +3652,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CircServices;
@@ -3690,7 +3689,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PathServices;
@@ -3725,7 +3724,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PolyServices;
@@ -3762,7 +3761,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeLineServices;
@@ -3801,7 +3800,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeFillServices;
@@ -3839,7 +3838,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_TextServices;
@@ -3873,7 +3872,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_GrafServices;
@@ -3905,7 +3904,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_Ole2Services;
@@ -3925,7 +3924,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CaptionServices;
@@ -3961,7 +3960,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PageServices;
@@ -3982,7 +3981,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_MeasureServices;
@@ -4019,7 +4018,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FrameServices;
@@ -4040,7 +4039,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard _aGuard;
+// ::SolarMutexGuard _aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
@@ -4059,7 +4058,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_EdgeServices;
@@ -4094,7 +4093,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_MediaServices;
@@ -4119,7 +4118,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// SolarMutexGuard aGuard;
+// ::SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
@@ -4156,7 +4155,7 @@ sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw
uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints );
if( mpObj.is() && !xGluePoints.is() )
@@ -4174,7 +4173,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mpObj.is() && mpObj->GetObjList() )
{
@@ -4228,7 +4227,7 @@ void SvxShape::unlock()
// XActionLockable
sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return mnLockCount != 0;
}
@@ -4237,7 +4236,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::Run
void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount < 0xffff, "lock overflow in SvxShape!" );
mnLockCount++;
@@ -4250,7 +4249,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeE
void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount > 0, "lock underflow in SvxShape!" );
mnLockCount--;
@@ -4263,7 +4262,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::Runti
void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (mnLockCount == 0) && (nLock != 0) )
unlock();
@@ -4278,7 +4277,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta
sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( mnLockCount != 0 )
unlock();
@@ -4479,7 +4478,7 @@ void SvxShapeText::unlock()
// ::com::sun::star::text::XTextRange
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4489,7 +4488,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4498,7 +4497,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru
OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4508,7 +4507,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException)
void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index ba7782e3e62a..221325175ab4 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -55,11 +55,10 @@
#include <editeng/unotext.hxx>
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sdrpaintwindow.hxx>
using namespace ::osl;
-using namespace ::vos;
using namespace ::rtl;
using ::com::sun::star::uno::XInterface;
@@ -1054,7 +1053,7 @@ SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl )
//------------------------------------------------------------------------
SvxTextEditSource::~SvxTextEditSource()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
mpImpl->release();
}
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index d20dbcc6ffc2..393cc6cb2b5b 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -35,7 +35,7 @@
#include "svx/galmisc.hxx"
#include <svx/fmmodel.hxx>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/graph.hxx>
#include <svl/itemprop.hxx>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 1eb72f036835..6eb1eef180e0 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -41,7 +41,7 @@
#include <svx/unopage.hxx>
#include <svl/itempool.hxx>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index f389664a346f..f602873e4206 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -33,7 +33,7 @@
#include "unogaltheme.hxx"
#include "svx/gallery1.hxx"
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx>
#include <com/sun/star/gallery/XGalleryTheme.hpp>
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index e2e3630e9b3c..b8b90bc788bf 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -157,7 +157,6 @@ USHORT nZoom = 100;
BOOL bURLClicked = FALSE;
using namespace ::com::sun::star::connection;
-using namespace ::vos;
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::registry;
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index d3af6260001a..bdbfee17a650 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -176,7 +176,7 @@
#include "ucbhelper/proxydecider.hxx"
#include "osl/diagnose.h"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
//---MARKER---
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 60f7129cc3ec..4d95f95febe5 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -31,7 +31,7 @@
#include <stack>
#include <rtl/ustrbuf.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vos/process.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/bootstrap.hxx>
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_*
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 8603a4a12b11..7eafdfde1b39 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -41,7 +41,7 @@
#include <ooo/vba/word/WdRelativeVerticalPosition.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svx/unopage.hxx>
#include <svx/unoshape.hxx>
@@ -55,7 +55,6 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-using namespace ::vos;
ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
{
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 241edc9b4bc6..807d4eed3cfe 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 04a3f00a6753..2deb1c7a7f9d 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 )