User: hr      
Date: 2007-11-01 15:18:37+0000
Modified:
   dba/dbaccess/source/ui/inc/TableConnection.hxx

Log:
 INTEGRATION: CWS dba24b (1.9.180); FILE MERGED
 2007/08/16 06:14:43 oj 1.9.180.1: #i56898# clean up of the class structure

File Changes:

Directory: /dba/dbaccess/source/ui/inc/
=======================================

File [changed]: TableConnection.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TableConnection.hxx?r1=1.9&r2=1.10
Delta lines:  +7 -6
-------------------
--- TableConnection.hxx 2006-06-20 03:13:24+0000        1.9
+++ TableConnection.hxx 2007-11-01 15:18:34+0000        1.10
@@ -54,6 +54,7 @@
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ 
 #include <com/sun/star/uno/Reference.h>
 #endif
+#include "TableConnectionData.hxx"
 
 class Point;
 class Rectangle;
@@ -69,7 +70,8 @@
        class OTableConnection : public Window
        {
                ::std::vector<OConnectionLine*> m_vConnLine;
-               OTableConnectionData*                   m_pData;
+        TTableConnectionData::value_type                       
+                                        m_pData;
                OJoinTableView*                                 m_pParent;
 
                BOOL                                                    
m_bSelected;
@@ -83,8 +85,7 @@
                OConnectionLine* CreateConnLine( const OConnectionLine& 
rConnLine );
 
        public:
-               TYPEINFO();
-               OTableConnection( OJoinTableView* pContainer, 
OTableConnectionData* pTabConnData );
+        OTableConnection( OJoinTableView* pContainer, const 
TTableConnectionData::value_type& pTabConnData );
                OTableConnection( const OTableConnection& rConn );
                        // WICHTIG : normalerweise bekomme ich von aussen einen 
Zeiger auf OTableConnectionData mitgegeben, hier aber muss ich
                        // mir (ueber OTableConnectionData::NewInstance) selber 
eine INstanz anlegen, die ich aber - wie in allen anderen Faellen auch -
@@ -118,9 +119,9 @@
 
                Rectangle       GetBoundingRect() const;
 
-               OTableConnectionData*                   GetData() const { 
return m_pData; }
+               inline TTableConnectionData::value_type GetData() const { 
return m_pData; }
                const ::std::vector<OConnectionLine*>* GetConnLineList() const 
{ return &m_vConnLine; }
-               OJoinTableView*                                 GetParent() 
const { return m_pParent; }
+               inline OJoinTableView*                                  
GetParent() const { return m_pParent; }
                virtual void                                    Draw( const 
Rectangle& rRect );
         using Window::Draw;
                virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > CreateAccessible();




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to