summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-09-26 13:49:51 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-09-26 13:49:51 +0000
commit8157bd346294c2240aefcd22df0d6429808f14a1 (patch)
tree8ed9a2d74cfcbaf679423771cf75d2fdaa935e8e
parent2587389712454302c72097db062ed93678798f13 (diff)
INTEGRATION: CWS dba24a (1.5.298); FILE MERGED
2007/09/25 11:24:07 oj 1.5.298.1: #i81922# new method to compare relation data
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineData.hxx7
-rw-r--r--dbaccess/source/ui/inc/RTableConnectionData.hxx7
2 files changed, 10 insertions, 4 deletions
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 3447b86c3..446d8f93b 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ConnectionLineData.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 15:16:14 $
+ * last change: $Author: hr $ $Date: 2007-09-26 14:49:25 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -75,6 +75,8 @@ namespace dbaui
::rtl::OUString m_aSourceFieldName;
::rtl::OUString m_aDestFieldName;
+ friend bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs);
+ friend bool operator!=(const OConnectionLineData& lhs, const OConnectionLineData& rhs) { return !(lhs == rhs); }
protected:
virtual ~OConnectionLineData();
public:
@@ -109,6 +111,7 @@ namespace dbaui
OConnectionLineData& operator=( const OConnectionLineData& rConnLineData );
};
+ //-------------------------------------------------------------------------
//------------------------------------------------------------------
typedef ::vos::ORef< OConnectionLineData > OConnectionLineDataRef;
typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec;
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index aec58fab2..6c9d27617 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: RTableConnectionData.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 15:31:28 $
+ * last change: $Author: hr $ $Date: 2007-09-26 14:49:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -63,6 +63,9 @@ namespace dbaui
class ORelationTableConnectionData : public OTableConnectionData,
public ::utl::OEventListenerAdapter
{
+ friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs);
+ friend bool operator!=(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { return !(lhs == rhs); }
+
::osl::Mutex m_aMutex;
::rtl::OUString m_sDatabaseName;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables;