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

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

File Changes:

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

File [changed]: RelationDlg.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/RelationDlg.hxx?r1=1.9&r2=1.10
Delta lines:  +8 -8
-------------------
--- RelationDlg.hxx     2007-07-06 08:24:24+0000        1.9
+++ RelationDlg.hxx     2007-11-01 15:17:57+0000        1.10
@@ -72,7 +72,7 @@
                                                        ,public 
IRelationControlInterface
        {
         OModuleClient                m_aModuleClient;
-               OTableListBoxControl*                           m_pTableControl;
+        ::std::auto_ptr<OTableListBoxControl>  m_pTableControl;
                OJoinTableView::OTableWindowMap*        m_pTableMap;
 
         FixedLine   aFL_CascUpd;
@@ -91,15 +91,15 @@
                HelpButton      aPB_HELP;
 
                
-               ORelationTableConnectionData*                                   
                                                m_pConnData;
-               ORelationTableConnectionData*                                   
                                                m_pOrigConnData;
+               TTableConnectionData::value_type                                
                                                m_pConnData;
+               TTableConnectionData::value_type                                
                                                m_pOrigConnData;
                ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XConnection > m_xConnection;
 
                BOOL                                                            
                                                                        
m_bTriedOneUpdate;
 
        public:
                ORelationDialog(OJoinTableView* pParent,
-                                               ORelationTableConnectionData* 
pConnectionData,
+                                               const 
TTableConnectionData::value_type& pConnectionData,
                                                BOOL bAllowTableSelect = FALSE 
);
                virtual ~ORelationDialog();
 
@@ -115,7 +115,7 @@
                /** getConnectionData returns the current connection data
                        @return the current connectiondata
                */
-               virtual OTableConnectionData* getConnectionData() const;
+               virtual TTableConnectionData::value_type getConnectionData() 
const;
 
                /** setValid set the valid inside, can be used for OK buttons
                        @param  _bValid true when the using control allows an 
update
@@ -127,7 +127,7 @@
                */
                virtual void notifyConnectionChange();
        protected:
-               void Init(ORelationTableConnectionData* _pConnData);
+               void Init(const TTableConnectionData::value_type& 
_pConnectionData);
 
        private:
                DECL_LINK( OKClickHdl, Button* );       




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

Reply via email to