merge vosremoval-mutex.diff

In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually
2010-10-16 03:15:13 -05:00 · 2010-10-16 03:15:13 -05:00 · c94a7511bf
commit c94a7511bf
parent d2c8e2e76f
29 changed files with 34 additions and 34 deletions
--- 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
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@ -33,7 +33,7 @@
 #include "DrawViewWrapper.hxx"

 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshtxt.hxx>
--- 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 <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 // header for class Application
 #include <vcl/svapp.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@ -77,7 +77,7 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 //-------
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@ -42,7 +42,7 @@
 // for RET_OK
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>

 using namespace ::com::sun::star;
--- 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 <vcl/svapp.hxx>
 // header for class ::vos::OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>


 using namespace ::com::sun::star;
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@ -50,7 +50,7 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 //.............................................................................
 namespace chart
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@ -70,7 +70,7 @@
 #include <vcl/msgbox.hxx>
 // for SolarMutex
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/ActionDescriptionProvider.hxx>

 //.............................................................................
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@ -48,7 +48,7 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@ -78,7 +78,7 @@
 #include <unotools/streamwrap.hxx>
 // for SolarMutex
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 // for OutlinerView
--- 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 <svx/svddrgmt.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 // for InfoBox
 #include <vcl/msgbox.hxx>
--- 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 <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 #include <com/sun/star/util/XUpdatable.hpp>

--- 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 <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/adjitem.hxx>
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@ -40,7 +40,7 @@
 #include "Strings.hrc"

 #include <toolkit/helper/vclunohelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>

 #include <com/sun/star/chart2/XChartDocument.hpp>
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@ -42,7 +42,7 @@
 // header for class SdrPathObj
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@ -41,7 +41,7 @@

 #include <com/sun/star/frame/XStorable.hpp>

-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/brkitem.hxx>
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@ -31,7 +31,7 @@

 #include "ShapeToolbarController.hxx"

-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@ -35,7 +35,7 @@
 #include <com/sun/star/chart2/XUndoSupplier.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>

-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>

 // for ressource strings STR_UNDO and STR_REDO
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@ -71,7 +71,7 @@
 #include <svx/unoshape.hxx>
 // header for class Application
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/unofill.hxx>

 #include <time.h>
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@ -30,7 +30,7 @@

 #include <tools/list.hxx>
 #include <vcl/timer.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <scdllapi.h>

 #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; }
 };


--- 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
--- 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
--- 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 <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 #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 ) :
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@ -61,7 +61,7 @@
 #include <svl/itempool.hxx>
 #include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>

 #include "drwtrans.hxx"
 #include "docsh.hxx"
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@ -47,7 +47,7 @@
 #include <sot/storage.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>

--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@ -41,7 +41,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 <cppuhelper/interfacecontainer.h>


--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@ -65,7 +65,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <sot/storinfo.hxx>
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@ -37,7 +37,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

 #include "scmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>

 #include "docsh.hxx"
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@ -33,7 +33,7 @@
 #include <usr/factoryhlp.hxx>
 #include <usr/macros.hxx>
 #include <usr/reflserv.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <tools/date.hxx>