merge vosremoval-mutex.diff

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

1 files changed, 14 insertions, 15 deletions

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 )
     {