User: hr Date: 2007-11-01 15:30:01+0000 Modified: dba/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
Log: INTEGRATION: CWS dba24b (1.10.46); FILE MERGED 2007/08/22 11:41:58 oj 1.10.46.2: #i76374# handle cross join as natural join now in query design 2007/08/16 06:14:44 oj 1.10.46.1: #i56898# clean up of the class structure File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QTableConnectionData.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QTableConnectionData.cxx?r1=1.10&r2=1.11 Delta lines: +11 -16 --------------------- --- QTableConnectionData.cxx 2007-05-10 10:37:45+0000 1.10 +++ QTableConnectionData.cxx 2007-11-01 15:29:59+0000 1.11 @@ -49,7 +49,6 @@ #endif using namespace dbaui; -TYPEINIT1(OQueryTableConnectionData, OTableConnectionData); //======================================================================== // class OQueryTableConnectionData @@ -59,6 +58,7 @@ OQueryTableConnectionData::OQueryTableConnectionData() :OTableConnectionData() ,m_eJoinType (INNER_JOIN) + ,m_bNatural(false) { DBG_CTOR(OQueryTableConnectionData,NULL); } @@ -74,19 +74,20 @@ m_eFromType = rConnData.m_eFromType; m_eDestType = rConnData.m_eDestType; m_eJoinType = rConnData.m_eJoinType; + m_bNatural = rConnData.m_bNatural; } //------------------------------------------------------------------------ -OQueryTableConnectionData::OQueryTableConnectionData(const ::rtl::OUString& strSourceTable, const ::rtl::OUString& strDestTable, - const ::rtl::OUString& strSourceAlias, const ::rtl::OUString& strDestAlias, const ::rtl::OUString& rConnName) - :OTableConnectionData( strSourceAlias, strDestAlias, rConnName ) +OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable + ,const TTableWindowData::value_type& _pReferencedTable + ,const ::rtl::OUString& rConnName) + :OTableConnectionData( _pReferencingTable,_pReferencedTable, rConnName ) ,m_nFromEntryIndex(0) ,m_nDestEntryIndex(0) ,m_eJoinType (INNER_JOIN) + ,m_bNatural(false) ,m_eFromType(TAB_NORMAL_FIELD) ,m_eDestType(TAB_NORMAL_FIELD) - ,m_strSourceTableName(strSourceTable) - ,m_strDestTableName(strDestTable) { DBG_CTOR(OQueryTableConnectionData,NULL); } @@ -116,7 +117,6 @@ void OQueryTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { DBG_CHKTHIS(OQueryTableConnectionData,NULL); - DBG_ASSERT(rSource.ISA(OQueryTableConnectionData), "QueryTabConn::CopyFrom : ungueltiger Parameter !"); // wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator= *this = (const OQueryTableConnectionData&)rSource; } @@ -136,6 +136,7 @@ m_eFromType = rConnData.m_eFromType; m_eDestType = rConnData.m_eDestType; m_eJoinType = rConnData.m_eJoinType; + m_bNatural = rConnData.m_bNatural; return *this; } @@ -144,7 +145,7 @@ ::rtl::OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const { DBG_CHKTHIS(OQueryTableConnectionData,NULL); - return nWhich == JTCS_FROM ? GetSourceWinName() : GetDestWinName(); + return nWhich == JTCS_FROM ? m_pReferencingTable->GetWinName() : m_pReferencedTable->GetWinName(); } //------------------------------------------------------------------------------ @@ -156,8 +157,8 @@ OQueryTableWindow* pDestWin = static_cast<OQueryTableWindow*>(rDragRight->GetTabWindow()); OSL_ENSURE(pSourceWin,"NO Source window found!"); OSL_ENSURE(pDestWin,"NO Dest window found!"); - - Init(pSourceWin->GetWinName(), pDestWin->GetWinName()); + m_pReferencingTable = pSourceWin->GetData(); + m_pReferencedTable = pDestWin->GetData(); // und dann meine Members setzen SetFieldIndex(JTCS_FROM, rDragLeft->GetFieldIndex()); @@ -166,12 +167,6 @@ SetFieldType(JTCS_FROM, rDragLeft->GetFieldType()); SetFieldType(JTCS_TO, rDragRight->GetFieldType()); - m_strSourceTableName = pSourceWin->GetTableName(); - m_aSourceWinName = pSourceWin->GetWinName(); - - m_strDestTableName = pDestWin->GetTableName(); - m_aDestWinName = pDestWin->GetWinName(); - AppendConnLine((::rtl::OUString)rDragLeft->GetField(),(::rtl::OUString)rDragRight->GetField()); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
