Tag: cws_src680_oj14
User: oj      
Date: 2007/02/20 22:29:44

Modified:
   dba/dbaccess/inc/AsyncronousLink.hxx

Log:
 merge conflict

File Changes:

Directory: /dba/dbaccess/inc/
=============================

File [changed]: AsyncronousLink.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/inc/AsyncronousLink.hxx?r1=1.1.2.1&r2=1.1.2.2
Delta lines:  +6 -3
-------------------
--- AsyncronousLink.hxx 3 Jan 2006 08:29:10 -0000       1.1.2.1
+++ AsyncronousLink.hxx 21 Feb 2007 06:29:41 -0000      1.1.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AsyncronousLink.hxx,v $
  *
- *  $Revision: 1.1.2.1 $
+ *  $Revision: 1.1.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2006/01/03 08:29:10 $
+ *  last change: $Author: oj $ $Date: 2007/02/21 06:29:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -81,6 +81,9 @@
                */
                OAsyncronousLink(const Link& _rHandler, ::vos::OMutex* 
_pEventSafety = NULL, ::vos::OMutex* _pDestructionSafety = NULL);
                virtual ~OAsyncronousLink();
+
+        bool    IsRunning() const { return m_nEventId != 0; }
+
 
                void Call(void* _pArgument = NULL);
                void CancelCall();




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

Reply via email to