From 1d540cd38ae38d4c8c681484d1c49c6aaf08cce7 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 20 Jun 2006 02:24:53 +0000
Subject: INTEGRATION: CWS warnings01 (1.9.6); FILE MERGED 2006/03/24 15:36:24
fs 1.9.6.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro)
---
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
(limited to 'dbaccess/source/ui/querydesign/ConnectionLine.cxx')
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 3e01a15662b6..d737c83ff6be 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ConnectionLine.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: obo $ $Date: 2006-01-16 15:29:53 $
+ * last change: $Author: hr $ $Date: 2006-06-20 03:24:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -117,7 +117,7 @@ namespace
_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 @@ namespace
//========================================================================
// 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, OConnectionLineDataR
//------------------------------------------------------------------------
OConnectionLine::OConnectionLine( OTableConnection* _pConn, const String& _rSourceFieldName,
const String& _rDestFieldName )
- : m_pTabConn( _pConn )
- ,m_pSourceEntry( NULL )
- ,m_pDestEntry( NULL )
- ,m_pData(NULL)
+ :m_pTabConn( _pConn )
+ ,m_pData(NULL)
+ ,m_pSourceEntry( NULL )
+ ,m_pDestEntry( NULL )
{
DBG_CTOR(OConnectionLine,NULL);
m_pData = new OConnectionLineData( _rSourceFieldName,_rDestFieldName);
@@ -403,8 +403,6 @@ BOOL OConnectionLine::IsValid() const
//------------------------------------------------------------------------
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()));
--
cgit