Tag: cws_src680_dba30
User: fs      
Date: 06/05/11 05:28:47

Modified:
 /dba/dbaccess/source/core/dataaccess/
  datasource.hxx

Log:
 #i10000# merge error

File Changes:

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

File [changed]: datasource.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.29.12.7&r2=1.29.12.8
Delta lines:  +2 -3
-------------------
--- datasource.hxx      9 May 2006 07:16:32 -0000       1.29.12.7
+++ datasource.hxx      11 May 2006 12:28:44 -0000      1.29.12.8
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: datasource.hxx,v $
  *
- *  $Revision: 1.29.12.7 $
+ *  $Revision: 1.29.12.8 $
  *
- *  last change: $Author: fs $ $Date: 2006/05/09 07:16:32 $
+ *  last change: $Author: fs $ $Date: 2006/05/11 12:28:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -187,7 +187,6 @@
 
 private:
 
-    ::rtl::Reference<ODatabaseModelImpl>       m_pImpl;
     OBookmarkContainer                                 m_aBookmarks;
     ::cppu::OInterfaceContainerHelper          m_aFlushListeners;
 




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

Reply via email to