User: hr Date: 2007-11-01 15:33:18+0000 Modified: dba/dbaccess/source/ui/querydesign/TableConnectionData.cxx
Log: INTEGRATION: CWS dba24b (1.9.130); FILE MERGED 2007/08/22 11:41:59 oj 1.9.130.3: #i76374# handle cross join as natural join now in query design 2007/08/16 09:57:46 oj 1.9.130.2: #i56898# accept more than one relation 2007/08/16 06:14:44 oj 1.9.130.1: #i56898# clean up of the class structure File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableConnectionData.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableConnectionData.cxx?r1=1.9&r2=1.10 Delta lines: +12 -35 --------------------- --- TableConnectionData.cxx 2006-09-17 07:24:33+0000 1.9 +++ TableConnectionData.cxx 2007-11-01 15:33:16+0000 1.10 @@ -51,24 +51,23 @@ // class OTableConnectionData //================================================================== DBG_NAME(OTableConnectionData) -TYPEINIT0(OTableConnectionData); //------------------------------------------------------------------------ OTableConnectionData::OTableConnectionData() { DBG_CTOR(OTableConnectionData,NULL); Init(); } - -//------------------------------------------------------------------------ -OTableConnectionData::OTableConnectionData( const String& rSourceWinName, const String& rDestWinName, const String& rConnName ) - :m_aSourceWinName( rSourceWinName ) - ,m_aDestWinName( rDestWinName ) +// ----------------------------------------------------------------------------- +OTableConnectionData::OTableConnectionData(const TTableWindowData::value_type& _pReferencingTable + ,const TTableWindowData::value_type& _pReferencedTable + ,const String& rConnName ) + :m_pReferencingTable(_pReferencingTable) + ,m_pReferencedTable(_pReferencedTable) ,m_aConnName( rConnName ) { DBG_CTOR(OTableConnectionData,NULL); Init(); } - //------------------------------------------------------------------------ void OTableConnectionData::Init() { @@ -78,28 +77,12 @@ ResetConnLines(TRUE); // das legt Defaults an } - -//------------------------------------------------------------------------ -void OTableConnectionData::Init(const String& rSourceWinName, const String& rDestWinName, const String& rConnName) -{ - // erst mal alle LineDatas loeschen - OConnectionLineDataVec().swap(m_vConnLineData); - // dann die Strings - m_aSourceWinName = rSourceWinName; - m_aDestWinName = rDestWinName; - m_aConnName = rConnName; - - // den Rest erledigt das andere Init - Init(); -} - //------------------------------------------------------------------------ OTableConnectionData::OTableConnectionData( const OTableConnectionData& rConnData ) { DBG_CTOR(OTableConnectionData,NULL); *this = rConnData; } - //------------------------------------------------------------------------ void OTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { @@ -122,8 +105,8 @@ if (&rConnData == this) return *this; - m_aSourceWinName = rConnData.GetSourceWinName(); - m_aDestWinName = rConnData.GetDestWinName(); + m_pReferencingTable = rConnData.m_pReferencingTable; + m_pReferencedTable = rConnData.m_pReferencedTable; m_aConnName = rConnData.GetConnName(); // clear line list @@ -179,15 +162,9 @@ } //------------------------------------------------------------------------ -void OTableConnectionData::ResetConnLines( BOOL bUseDefaults ) +void OTableConnectionData::ResetConnLines( BOOL /*bUseDefaults*/ ) { OConnectionLineDataVec().swap(m_vConnLineData); - - if (bUseDefaults) - { - for (USHORT i=0; i<MAX_CONN_COUNT; i++) - m_vConnLineData.push_back( new OConnectionLineData()); - } } //------------------------------------------------------------------------ @@ -213,7 +190,7 @@ sal_Int32 nCount = m_vConnLineData.size(); for(sal_Int32 i=0;i<nCount;) { - if(!m_vConnLineData[i]->GetSourceFieldName().getLength() && !m_vConnLineData[i]->GetDestFieldName().getLength()) + if(!m_vConnLineData[i]->GetSourceFieldName().getLength() || !m_vConnLineData[i]->GetDestFieldName().getLength()) { OConnectionLineDataRef pData = m_vConnLineData[i]; m_vConnLineData.erase(m_vConnLineData.begin()+i); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
