Tag: cws_dev300_odbmacros3
User: fs      
Date: 2008-07-28 06:24:18+0000
Modified:
   dba/dbaccess/source/core/dataaccess/ModelImpl.hxx

Log:
 #i76128#

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: ModelImpl.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.24.4.3&r2=1.24.4.4
Delta lines:  +10 -6
--------------------
--- ModelImpl.hxx       2008-07-24 05:33:20+0000        1.24.4.3
+++ ModelImpl.hxx       2008-07-28 06:24:16+0000        1.24.4.4
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ModelImpl.hxx,v $
- * $Revision: 1.24.4.3 $
+ * $Revision: 1.24.4.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -602,7 +602,7 @@
     }
 
 public:
-    struct GuardAccess { friend class ModelMethodGuard; friend class 
ModifyLock; private: GuardAccess() { } };
+    struct GuardAccess { friend class ModelMethodGuard; private: GuardAccess() 
{ } };
 
     /** returns the mutex used for thread safety
 
@@ -661,12 +661,12 @@
             throw ::com::sun::star::frame::DoubleInitializationException( 
::rtl::OUString(), getThis() );
     }
 
-    inline void lockModify( GuardAccess )
+    inline void lockModify()
     {
         m_pImpl->lockModify();
     }
 
-    inline void unlockModify( GuardAccess )
+    inline void unlockModify()
     {
         m_pImpl->unlockModify();
     }
@@ -678,12 +678,12 @@
     ModifyLock( ModelDependentComponent& _component )
         :m_rComponent( _component )
     {
-        m_rComponent.lockModify( ModelDependentComponent::GuardAccess() );
+        m_rComponent.lockModify();
     }
 
     ~ModifyLock()
     {
-        m_rComponent.unlockModify( ModelDependentComponent::GuardAccess() );
+        m_rComponent.unlockModify();
     }
 
 private:
@@ -743,6 +743,10 @@
         }
     }
 
+    ~ModelMethodGuard()
+    {
+    }
+
     inline void clear()
     {
         BaseMutexGuard::clear();




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

Reply via email to