From c94a7511bf72185b189f0535f2963a78817f8c39 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Oct 2010 03:15:13 -0500 Subject: [PATCH] merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually --- chart2/inc/pch/precompiled_chart2.hxx | 2 +- .../controller/accessibility/AccessibleTextHelper.cxx | 2 +- .../source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +- chart2/source/controller/main/ChartController.cxx | 2 +- .../source/controller/main/ChartController_EditData.cxx | 2 +- chart2/source/controller/main/ChartController_Insert.cxx | 2 +- .../source/controller/main/ChartController_Position.cxx | 2 +- .../source/controller/main/ChartController_Properties.cxx | 2 +- .../source/controller/main/ChartController_TextEdit.cxx | 2 +- chart2/source/controller/main/ChartController_Tools.cxx | 2 +- chart2/source/controller/main/ChartController_Window.cxx | 2 +- chart2/source/controller/main/ChartRenderer.cxx | 2 +- chart2/source/controller/main/DrawCommandDispatch.cxx | 2 +- chart2/source/controller/main/ElementSelector.cxx | 2 +- chart2/source/controller/main/SelectionHelper.cxx | 2 +- chart2/source/controller/main/ShapeController.cxx | 2 +- chart2/source/controller/main/ShapeToolbarController.cxx | 2 +- chart2/source/controller/main/UndoCommandDispatch.cxx | 2 +- chart2/source/view/main/ChartView.cxx | 2 +- sc/inc/refreshtimer.hxx | 8 ++++---- sc/source/core/data/documen3.cxx | 2 +- sc/source/core/tool/refreshtimer.cxx | 4 ++-- sc/source/filter/lotus/lotimpop.cxx | 4 ++-- sc/source/ui/app/drwtrans.cxx | 2 +- sc/source/ui/app/transobj.cxx | 2 +- sc/source/ui/inc/AccessibleContextBase.hxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 2 +- sc/source/ui/unoobj/unodoc.cxx | 2 +- sc/workben/addin.cxx | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-) diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index 199564a9f024..94b4f8556152 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -270,6 +270,6 @@ #include "vcl/fldunit.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" //---MARKER--- #endif diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index a16f9cb9dab0..013d423ad049 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -33,7 +33,7 @@ #include "DrawViewWrapper.hxx" #include -#include +#include #include #include diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 2dbb7da2d590..cb17d564752d 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -36,7 +36,7 @@ #include "ContainerHelper.hxx" #include "TimerTriggeredControllerLock.hxx" #include -#include +#include // header for class Application #include #include diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index cc3eb167ba96..c12966e17d62 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -77,7 +77,7 @@ #include #include #include -#include +#include //------- #include #include diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index c8aa5e317e9a..1ddb8ede5b93 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -42,7 +42,7 @@ // for RET_OK #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index bed77ac6df37..6a55514ac522 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -76,7 +76,7 @@ // header for class Application #include // header for class ::vos::OGuard -#include +#include using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index e89ba7e89e53..96942d1bf055 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include //............................................................................. namespace chart diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 4ac490cb1ad2..baaa3b1c3959 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -70,7 +70,7 @@ #include // for SolarMutex #include -#include +#include #include //............................................................................. diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 0047e6085682..631bce3d48aa 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 8d06e6389e73..2f2920f1538b 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -78,7 +78,7 @@ #include // for SolarMutex #include -#include +#include #include #include // for OutlinerView diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 7210fbca4aac..368cc60d5d2c 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -81,7 +81,7 @@ // header for class SdrDragMethod #include #include -#include +#include // for InfoBox #include diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx index 7182199261ec..c0d802b9a003 100644 --- a/chart2/source/controller/main/ChartRenderer.cxx +++ b/chart2/source/controller/main/ChartRenderer.cxx @@ -38,7 +38,7 @@ #include "macros.hxx" #include "ChartModelHelper.hxx" #include -#include +#include #include diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 874533810d0c..4f4f91022c18 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -36,7 +36,7 @@ #include "chartview/DrawModelWrapper.hxx" #include "macros.hxx" -#include +#include #include #include #include diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 8df744c16ad8..c097be6bd53b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -40,7 +40,7 @@ #include "Strings.hrc" #include -#include +#include #include #include diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 9caafc6d5730..7c91d18229ed 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -42,7 +42,7 @@ // header for class SdrPathObj #include #include -#include +#include #include #include diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 561e55375bfb..e3a76704abb6 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -41,7 +41,7 @@ #include -#include +#include #include #include #include diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index a4ffa8c1a723..b3e8fac02d0c 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -31,7 +31,7 @@ #include "ShapeToolbarController.hxx" -#include +#include #include #include #include diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 3917e16721fd..91557b6b1b35 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include // for ressource strings STR_UNDO and STR_REDO diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 74233f533848..cac71a27ef53 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -71,7 +71,7 @@ #include // header for class Application #include -#include +#include #include #include diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 2a8512848ef0..f60ccc74afb8 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include #define SC_REFRESHTIMER_CONTROL_LIST 0 @@ -42,8 +42,8 @@ DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* ) class ScRefreshTimerControl { private: - ::vos::OMutex aMutex; - USHORT nBlockRefresh; + ::osl::Mutex aMutex; + USHORT nBlockRefresh; public: #if SC_REFRESHTIMER_CONTROL_LIST @@ -60,7 +60,7 @@ public: ++nBlockRefresh; } BOOL IsRefreshAllowed() const { return !nBlockRefresh; } - ::vos::OMutex& GetMutex() { return aMutex; } + ::osl::Mutex& GetMutex() { return aMutex; } }; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 89e2274bc660..cb022714fe93 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -770,7 +770,7 @@ void ScDocument::RemoveUnoObject( SfxListener& rObject ) // This check is done after calling EndListening, so a later BroadcastUno call // won't touch this object. - vos::IMutex& rSolarMutex = Application::GetSolarMutex(); + osl::SolarMutex& rSolarMutex = Application::GetSolarMutex(); if ( rSolarMutex.tryToAcquire() ) { // BroadcastUno is always called with the SolarMutex locked, so if it diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx index a5c2e24f6082..e12916a9f907 100644 --- a/sc/source/core/tool/refreshtimer.cxx +++ b/sc/source/core/tool/refreshtimer.cxx @@ -42,7 +42,7 @@ ScRefreshTimerProtector::ScRefreshTimerProtector( ScRefreshTimerControl * const { (*ppControl)->SetAllowRefresh( FALSE ); // wait for any running refresh in another thread to finnish - ::vos::OGuard aGuard( (*ppControl)->GetMutex() ); + ::osl::MutexGuard aGuard( (*ppControl)->GetMutex() ); } } @@ -71,7 +71,7 @@ void ScRefreshTimer::Timeout() if ( ppControl && *ppControl && (*ppControl)->IsRefreshAllowed() ) { // now we COULD make the call in another thread ... - ::vos::OGuard aGuard( (*ppControl)->GetMutex() ); + ::osl::MutexGuard aGuard( (*ppControl)->GetMutex() ); maTimeoutHdl.Call( this ); // restart from now on, don't execute immediately again if timed out // a second time during refresh diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index a07998578f78..d5aad61a6054 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "lotimpop.hxx" -#include +#include #include "attrib.hxx" #include "document.hxx" @@ -49,7 +49,7 @@ #include "lotattr.hxx" -static NAMESPACE_VOS( OMutex ) aLotImpSemaphore; +static osl::Mutex aLotImpSemaphore; ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) : diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index fed861eaf961..cba682688f1f 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include "drwtrans.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index f23bb936c1a5..906a0f3e150a 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 0085d01435a8..4a8e3cf2f846 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index c59ee14f0c5d..5b9dcc5d6180 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 3c7a7c0f571b..0350546cce2a 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -37,7 +37,7 @@ #include #include "scmod.hxx" -#include +#include #include #include "docsh.hxx" diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 190b70569c36..9c724e0da871 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include