Tag: cws_src680_dba24b User: oj Date: 2007-10-01 06:37:47+0000 Modified: dba/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
Log: merge conflict File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RTableConnectionData.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx?r1=1.12.130.5&r2=1.12.130.6 Delta lines: +5 -5 ------------------- --- RTableConnectionData.cxx 2007-09-28 12:00:47+0000 1.12.130.5 +++ RTableConnectionData.cxx 2007-10-01 06:37:45+0000 1.12.130.6 @@ -4,9 +4,9 @@ * * $RCSfile: RTableConnectionData.cxx,v $ * - * $Revision: 1.12.130.5 $ + * $Revision: 1.12.130.6 $ * - * last change: $Author: oj $ $Date: 2007/09/28 12:00:47 $ + * last change: $Author: oj $ $Date: 2007/10/01 06:37:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -299,8 +299,8 @@ bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules) && (lhs.m_nDeleteRules == rhs.m_nDeleteRules) && (lhs.m_nCardinality == rhs.m_nCardinality) - && (lhs.m_aSourceWinName == rhs.m_aSourceWinName) - && (lhs.m_aDestWinName == rhs.m_aDestWinName) + && (lhs.getReferencingTable() == rhs.getReferencingTable()) + && (lhs.getReferencedTable() == rhs.getReferencedTable()) && (lhs.m_aConnName == rhs.m_aConnName) && (lhs.m_vConnLineData.size() == rhs.m_vConnLineData.size()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
