Tag: cws_dev300_dba31c
User: fs      
Date: 2008-09-06 20:34:11+0000
Modified:
   dba/dbaccess/source/ui/browser/brwctrlr.cxx
   dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx
   dba/dbaccess/source/ui/browser/genericcontroller.cxx
   dba/dbaccess/source/ui/browser/unodatbr.cxx

Log:
 #i91830# replaced Mutex with SharedMutex

File Changes:

Directory: /dba/dbaccess/source/ui/browser/
===========================================

File [changed]: brwctrlr.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.108&r2=1.108.38.1
Delta lines:  +5 -5
-------------------
--- brwctrlr.cxx        2008-06-25 12:39:41+0000        1.108
+++ brwctrlr.cxx        2008-09-06 20:34:08+0000        1.108.38.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: brwctrlr.cxx,v $
- * $Revision: 1.108 $
+ * $Revision: 1.108.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -945,14 +945,14 @@
 // -----------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::setIdentifier( const ::rtl::OUString& 
_Identifier ) throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
     m_sModuleIdentifier = _Identifier;
 }
 
 // -----------------------------------------------------------------------
 ::rtl::OUString SAL_CALL SbaXDataBrowserController::getIdentifier(  ) throw 
(RuntimeException)
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_sModuleIdentifier;
 }
 
@@ -1219,7 +1219,7 @@
 
//------------------------------------------------------------------------------
 void SbaXDataBrowserController::frameAction(const 
::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
 
     SbaXDataBrowserController_Base::frameAction( aEvent );
 

File [changed]: dsbrowserDnD.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx?r1=1.81.38.1&r2=1.81.38.2
Delta lines:  +2 -3
-------------------
--- dsbrowserDnD.cxx    2008-09-03 12:03:38+0000        1.81.38.1
+++ dsbrowserDnD.cxx    2008-09-06 20:34:08+0000        1.81.38.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dsbrowserDnD.cxx,v $
- * $Revision: 1.81.38.1 $
+ * $Revision: 1.81.38.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -245,8 +245,7 @@
     {
            m_nAsyncDrop = 0;
            ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-           ::osl::MutexGuard aGuard(m_aMutex);
-
+           ::osl::MutexGuard aGuard( getMutex() );
 
            if ( m_aAsyncDrop.nType == E_TABLE )
            {

File [changed]: genericcontroller.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.94.38.1&r2=1.94.38.2
Delta lines:  +12 -12
---------------------
--- genericcontroller.cxx       2008-09-03 11:56:15+0000        1.94.38.1
+++ genericcontroller.cxx       2008-09-06 20:34:08+0000        1.94.38.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: genericcontroller.cxx,v $
- * $Revision: 1.94.38.1 $
+ * $Revision: 1.94.38.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -250,7 +250,7 @@
 DBG_NAME(OGenericUnoController)
 // -------------------------------------------------------------------------
 OGenericUnoController::OGenericUnoController(const Reference< 
XMultiServiceFactory >& _rM)
-       :OGenericUnoController_Base(m_aMutex)
+       :OGenericUnoController_Base( getMutex() )
 #ifdef DBG_UTIL
     ,m_bDescribingSupportedFeatures( false )
 #endif
@@ -266,7 +266,7 @@
 {
     osl_incrementInterlockedCount( &m_refCount );
     {
-        m_pData.reset( new OGenericUnoController_Data( *this, m_aMutex ) );
+        m_pData.reset( new OGenericUnoController_Data( *this, getMutex() ) );
     }
     osl_decrementInterlockedCount( &m_refCount );
 
@@ -284,7 +284,7 @@
 
 // 
-----------------------------------------------------------------------------
 OGenericUnoController::OGenericUnoController()
-       :OGenericUnoController_Base(m_aMutex)
+       :OGenericUnoController_Base( getMutex() )
 #ifdef DBG_UTIL
     ,m_bDescribingSupportedFeatures( false )
 #endif
@@ -356,7 +356,7 @@
 void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& 
aArguments ) throw(Exception, RuntimeException)
 {
        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-       ::osl::MutexGuard aGuard(m_aMutex);
+       ::osl::MutexGuard aGuard( getMutex() );
 
        Reference< XWindow >            xParent;
        Reference< XFrame > xFrame;
@@ -453,7 +453,7 @@
 //------------------------------------------------------------------------
 void OGenericUnoController::modified(const EventObject& aEvent) throw( 
RuntimeException )
 {
-       ::osl::MutexGuard aGuard(m_aMutex);     
+       ::osl::MutexGuard aGuard( getMutex() ); 
        if ( !isDataSourceReadOnly() )
        {
                Reference<XModifiable> xModi(aEvent.Source,UNO_QUERY);
@@ -481,7 +481,7 @@
 void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) 
throw( RuntimeException )
 {
     vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-       ::osl::MutexGuard aGuard(m_aMutex);     
+       ::osl::MutexGuard aGuard( getMutex() ); 
 
     stopFrameListening( m_aCurrentFrame.getFrame() );
        Reference< XFrame > xFrame = m_aCurrentFrame.attachFrame( _rxFrame );
@@ -962,7 +962,7 @@
 
//------------------------------------------------------------------------------
 void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) throw( 
RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
     if ( aEvent.Frame == m_aCurrentFrame.getFrame() )
         m_aCurrentFrame.frameAction( aEvent.Action );
 }
@@ -1216,7 +1216,7 @@
 // 
-----------------------------------------------------------------------------
 Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( 
RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_aCurrentFrame.getFrame();
 }
 
@@ -1439,7 +1439,7 @@
 Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw()
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
 
     if ( ! m_xTitleHelper.is ())
     {
@@ -1461,7 +1461,7 @@
 ::rtl::OUString SAL_CALL OGenericUnoController::getTitle()
     throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     if ( m_bExternalTitle )
         return impl_getTitleHelper_throw()->getTitle ();
     return getPrivateTitle() + impl_getTitleHelper_throw()->getTitle ();
@@ -1473,7 +1473,7 @@
     throw (RuntimeException)
 {
     vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-       ::osl::MutexGuard aGuard(m_aMutex);
+       ::osl::MutexGuard aGuard( getMutex() );
     m_bExternalTitle = sal_True;
     impl_getTitleHelper_throw()->setTitle (sTitle);
 }

File [changed]: unodatbr.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.203.24.1&r2=1.203.24.2
Delta lines:  +4 -4
-------------------
--- unodatbr.cxx        2008-09-03 12:02:40+0000        1.203.24.1
+++ unodatbr.cxx        2008-09-06 20:34:08+0000        1.203.24.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unodatbr.cxx,v $
- * $Revision: 1.203.24.1 $
+ * $Revision: 1.203.24.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -223,8 +223,8 @@
 
//------------------------------------------------------------------------------
 SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< 
XMultiServiceFactory >& _rM)
        :SbaXDataBrowserController(_rM)
-       ,m_aSelectionListeners(m_aMutex)
-    ,m_aContextMenuInterceptors(m_aMutex)
+       ,m_aSelectionListeners( getMutex() )
+    ,m_aContextMenuInterceptors( getMutex() )
     ,m_aTableCopyHelper(this)
     ,m_pTreeView(NULL)
     ,m_pSplitter(NULL)
@@ -835,7 +835,7 @@
 sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( 
RuntimeException )
 {
     vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-       ::osl::MutexGuard aGuard(m_aMutex);
+       ::osl::MutexGuard aGuard( getMutex() );
     if ( getView() && getView()->IsInModalMode() )
         return sal_False;
     sal_Bool bRet = sal_False;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to