1 files changed, 13 insertions, 13 deletions

diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index fa671b99eede..7043c3d9a971 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -65,7 +65,7 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
 
 AWT::Size BitmapTransporter::getSize() throw()
 {
-    vos::OGuard aGuard( m_aProtector );
+    osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
     AWT::Size   aRet;
 
@@ -89,7 +89,7 @@ AWT::Size BitmapTransporter::getSize() throw()
 
 SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
 {
-    vos::OGuard aGuard( m_aProtector );
+    osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
 
     // create return value
@@ -112,7 +112,7 @@ struct SaneHolder
 {
     Sane                m_aSane;
     REF( AWT::XBitmap ) m_xBitmap;
-    vos::OMutex         m_aProtector;
+    osl::Mutex          m_aProtector;
     ScanError           m_nError;
     bool                m_bBusy;
 
@@ -147,7 +147,7 @@ namespace
             m_aSanes.clear();
     }
 
-    struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {};
+    struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
     struct theSanes : public rtl::Static<allSanes, theSanes> {};
 }
 
@@ -193,7 +193,7 @@ ScannerThread::~ScannerThread()
 
 void ScannerThread::run()
 {
-    vos::OGuard         aGuard( m_pHolder->m_aProtector );
+    osl::MutexGuard         aGuard( m_pHolder->m_aProtector );
     BitmapTransporter*  pTransporter = new BitmapTransporter;
     REF( XInterface )   aIf( static_cast< OWeakObject* >( pTransporter ) );
 
@@ -225,13 +225,13 @@ void ScannerThread::run()
 
 void ScannerManager::AcquireData()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     theSanes::get().acquire();
 }
 
 void ScannerManager::ReleaseData()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     theSanes::get().release();
 }
 
@@ -255,7 +255,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
 
 SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( rSanes.empty() )
@@ -280,7 +280,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
 
 BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -315,7 +315,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
 void ScannerManager::startScan( const ScannerContext& scanner_context,
                                 const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -345,7 +345,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
 
 ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -364,7 +364,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
 
 REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -375,7 +375,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
             );
     boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
 
-    vos::OGuard aProtGuard( pHolder->m_aProtector );
+    osl::MutexGuard aProtGuard( pHolder->m_aProtector );
 
     REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap );
     pHolder->m_xBitmap = REF( AWT::XBitmap )();