Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:16:08 Modified: dba/dbaccess/source/ui/querydesign/ConnectionLine.cxx
Log: RESYNC: (1.9-1.10); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: ConnectionLine.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/ConnectionLine.cxx?r1=1.8.8.1&r2=1.8.8.2 Delta lines: +9 -11 -------------------- --- ConnectionLine.cxx 3 Jan 2006 07:49:22 -0000 1.8.8.1 +++ ConnectionLine.cxx 4 Jul 2006 08:16:05 -0000 1.8.8.2 @@ -117,7 +117,7 @@ _rNewConPos.Y() = _pWin->GetPosPixel().Y(); _rNewConPos.Y() += pListBox->GetPosPixel().Y(); - long nEntryPos = pListBox->GetEntryPos( _pEntry ).Y(); + long nEntryPos = pListBox->GetEntryPosition( _pEntry ).Y(); if( nEntryPos >= 0 ) { @@ -141,7 +141,7 @@ //======================================================================== // class OConnectionLine //======================================================================== -DBG_NAME(OConnectionLine); +DBG_NAME(OConnectionLine) //------------------------------------------------------------------------ OConnectionLine::OConnectionLine( OTableConnection* _pConn, OConnectionLineDataRef _pLineData ) : m_pTabConn( _pConn ) @@ -155,10 +155,10 @@ //------------------------------------------------------------------------ OConnectionLine::OConnectionLine( OTableConnection* _pConn, const String& _rSourceFieldName, const String& _rDestFieldName ) - : m_pTabConn( _pConn ) + :m_pTabConn( _pConn ) + ,m_pData(NULL) ,m_pSourceEntry( NULL ) ,m_pDestEntry( NULL ) - ,m_pData(NULL) { DBG_CTOR(OConnectionLine,NULL); m_pData = new OConnectionLineData( _rSourceFieldName,_rDestFieldName); @@ -403,8 +403,6 @@ //------------------------------------------------------------------------ double dist_Euklid(const Point &p1, const Point& p2,const Point& pM, Point& q) { - int vx = p2.X() - p1.X(); - int vy = p2.Y() - p1.Y(); Point v(p2 - p1); Point w(pM - p1); double a = sqrt((double)(v.X()*v.X() + v.Y()*v.Y())); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
