diff options
31 files changed, 37 insertions, 37 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 0f1b004cde6c..993722d9814e 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -500,7 +500,7 @@ #include "unotools/processfactory.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "xmloff/ProgressBarHelper.hxx" #include "xmloff/XMLConstantsPropertyHandler.hxx" diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 41925b2a8b2f..5d31055d2cc2 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1227,7 +1227,7 @@ namespace { void lcl_modifyListening( ::sfx2::IModifiableDocument& _rDocument, const Reference< XStorage >& _rxStorage, ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >& _inout_rListener, - ::vos::IMutex& _rMutex, bool _bListen ) + ::osl::SolarMutex& _rMutex, bool _bListen ) { Reference< XModifiable > xModify( _rxStorage, UNO_QUERY ); OSL_ENSURE( xModify.is() || !_rxStorage.is(), "lcl_modifyListening: storage can't notify us!" ); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index a2d0f32e600c..9973af429c08 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -80,7 +80,7 @@ #include <sfx2/docstoragemodifylistener.hxx> #include <tools/string.hxx> #include <unotools/sharedunocomponent.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ref.hxx> #include <memory> @@ -140,7 +140,7 @@ class OSharedConnectionManager; //============================================================ /** a class which provides an IMutex interface to an OSL-based mutex */ -class VosMutexFacade : public ::vos::IMutex +class VosMutexFacade : public ::osl::SolarMutex { public: /** beware of life time: the mutex you pass here must live as least as long diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index bb7560d49640..498882f5885e 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -52,7 +52,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/namedvaluecollection.hxx> using namespace ::com::sun::star::uno; @@ -533,7 +533,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const , sal_Int32 /*SearchFlags*/ , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException) { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; MutexGuard aGuard(m_aMutex); Reference< XComponent > xComp; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 8fac5c8edc9d..305a01363177 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -89,7 +89,7 @@ #include <comphelper/interaction.hxx> #include <connectivity/dbtools.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sal/macros.h> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include "core_resource.hxx" @@ -1016,7 +1016,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co // However, we do /not/ have control over the EmbeddedObject implementation, and from a first look, it seems as // making it release the own mutex before calling SolarMutex-code is ... difficult, at least. // So, to be on the same side, we lock the SolarMutex here. Yes, it sucks. - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; ::osl::ClearableMutexGuard aGuard(m_aMutex); if ( m_bInExecute ) return aRet; @@ -1271,7 +1271,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) { { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; // the request Reference<XNameAccess> xName(m_xParentContainer,UNO_QUERY); @@ -1367,7 +1367,7 @@ sal_Bool ODocumentDefinition::saveAs() try { { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; // the request Reference<XNameAccess> xName(m_xParentContainer,UNO_QUERY); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index e6b894178dc8..35262dd70038 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -42,7 +42,7 @@ #include <cppuhelper/weakref.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace dbaccess { diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index 6045515264fc..a151edee2a58 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -36,7 +36,7 @@ /** === end UNO includes === **/ #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //........................................................................ namespace dbmm diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 2d56c70ea8f2..25c48491af22 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -61,7 +61,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include <unotools/moduleoptions.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 62c358f9a098..68d5aac5fa33 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -124,7 +124,7 @@ #include <svx/dbaobjectex.hxx> #include <svx/svxdlg.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "AppView.hxx" #include "browserids.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 46c3f5f5e66e..b89f72956344 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -92,7 +92,7 @@ #include <svtools/fileview.hxx> #include <tools/diagnose_ex.h> #include "defaultobjectnamecheck.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "subcomponentmanager.hxx" //........................................................................ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 6d30c639b0df..906607406e3a 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -80,7 +80,7 @@ #include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 16287ac0078e..641051f20d49 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -43,7 +43,7 @@ #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <hash_map> #include <algorithm> diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 0e652020bdd5..57618dea47b1 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -45,7 +45,7 @@ #include <unotools/moduleoptions.hxx> #include <tools/diagnose_ex.h> #include <svtools/menuoptions.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "dbu_reghelper.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 71cb668216e6..8be379b9aa89 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -81,7 +81,7 @@ #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> #include <vcl/waitobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <algorithm> #include <functional> diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index a4ae710d7f73..d964da262c30 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -36,7 +36,7 @@ #include <comphelper/types.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/diagnose_ex.h> //........................................................................ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 62f676e10a25..441aa6c6f846 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -54,7 +54,7 @@ #include <vcl/msgbox.hxx> #include "dbaccess_helpid.hrc" #include "UITools.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/imgdef.hxx> #include "TablesSingleDlg.hxx" #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index b820d80acbae..3f3059967447 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -64,7 +64,7 @@ #include "adtabdlg.hxx" #include <vcl/waitobj.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "UITools.hxx" #include <boost/optional.hpp> diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index fa48701f6768..82122c97aed1 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -92,7 +92,7 @@ #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> extern "C" void SAL_CALL createRegistryInfo_OQueryControl() { diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 48cb50dedf24..43400cb2c6a9 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -73,7 +73,7 @@ #include <tools/diagnose_ex.h> #include <vcl/waitobj.hxx> #include <osl/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define MAX_THREADS 10 @@ -489,7 +489,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData // ----------------------------------------------------------------------------- IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); try { diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 651e7926861a..390f339384f7 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -46,7 +46,7 @@ #include "dbu_uno.hrc" #include "paramdialog.hxx" #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "CollectionView.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index ef3c6c8f6542..c48a2e54a250 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -43,7 +43,7 @@ #include <vcl/msgbox.hxx> // --- needed because of the solar mutex -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> // --- diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 4ecd1a38c563..fd9360e30b3c 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/document/XEventListener.hpp> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 43cdd2c8f120..737e43af74be 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -55,7 +55,7 @@ #include <vcl/svapp.hxx> #include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace rptui { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 556563b56908..780113958495 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -54,7 +54,7 @@ #include <vcl/svapp.hxx> #include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace rptui { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 591f0a74489c..a8fdacf51e9e 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -64,7 +64,7 @@ #include "RptDef.hxx" // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sal/macros.h> #include <boost/bind.hpp> diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 2843fafc4773..1e1f2ba71305 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -59,7 +59,7 @@ #include <xmloff/xmlmetai.hxx> #include <com/sun/star/util/XModifiable.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 42c1b5a13e0f..f2a87ea06bde 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -55,7 +55,7 @@ #include <vcl/fldunit.hxx> #include "metadata.hxx" #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "helpids.hrc" #include "uistrings.hrc" #include "RptResId.hrc" diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index df462f9ee450..a169c8279026 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -38,7 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/status.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> namespace rptui diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 5f7c59b8c9d8..a009e4393de0 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -43,7 +43,7 @@ #include <svtools/miscopt.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/menuoptions.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/svxids.hrc> #define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a028dfaf52c6..2f7fc8997d16 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -143,7 +143,7 @@ #include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "PropertyForward.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 115d03de8e5b..45c389f94bef 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -32,7 +32,7 @@ #include <ReportControllerObserver.hxx> #include <ReportController.hxx> #include <svl/smplhint.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/awt/FontSlant.hpp> |