Tag: cws_src680_oj14 User: oj Date: 06/03/22 03:10:36 Modified: /dba/connectivity/source/inc/odbc/ OResultSet.hxx
Log: conflict resolved File Changes: Directory: /dba/connectivity/source/inc/odbc/ ============================================= File [changed]: OResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/odbc/OResultSet.hxx?r1=1.25&r2=1.25.42.1 Delta lines: +3 -4 ------------------- --- OResultSet.hxx 3 Jan 2006 16:04:48 -0000 1.25 +++ OResultSet.hxx 22 Mar 2006 11:10:25 -0000 1.25.42.1 @@ -4,9 +4,9 @@ * * $RCSfile: OResultSet.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.42.1 $ * - * last change: $Author: kz $ $Date: 2006/01/03 16:04:48 $ + * last change: $Author: oj $ $Date: 2006/03/22 11:10:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -217,7 +217,6 @@ TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex); SQLRETURN unbind(sal_Bool _bUnbindHandle = sal_True); - // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
