User: hr      
Date: 06/06/19 20:02:40

Modified:
 /dba/dbaccess/source/ui/dlg/
  ConnectionPage.cxx

Log:
 INTEGRATION: CWS warnings01 (1.13.24); FILE MERGED
 2006/05/23 23:50:46 sb 1.13.24.2: RESYNC: (1.13-1.14); FILE MERGED
 2006/03/24 15:36:08 fs 1.13.24.1: #i57457# warning-free code (unxlngi6/.pro + 
unxsoli4.pro)

File Changes:

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

File [changed]: ConnectionPage.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.14&r2=1.15
Delta lines:  +6 -8
-------------------
--- ConnectionPage.cxx  4 May 2006 08:40:32 -0000       1.14
+++ ConnectionPage.cxx  20 Jun 2006 03:02:38 -0000      1.15
@@ -196,18 +196,18 @@
        DBG_NAME(OConnectionTabPage)    
        OConnectionTabPage::OConnectionTabPage(Window* pParent, const 
SfxItemSet& _rCoreAttrs)
         :OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
+               ,m_pCollection(NULL)
+               ,m_bUserGrabFocus(sal_True)
+               ,m_aFL1(this, ResId(FL_SEPARATOR1))
+               ,m_aFL2(this, ResId(FL_SEPARATOR2))
                ,m_aUserNameLabel(this, ResId(FT_USERNAME))
                ,m_aUserName(this, ResId(ET_USERNAME))
                ,m_aPasswordRequired(this, ResId(CB_PASSWORD_REQUIRED))
+               ,m_aFL3(this, ResId(FL_SEPARATOR3))
                ,m_aJavaDriverLabel(this, ResId(FT_JDBCDRIVERCLASS))
                ,m_aJavaDriver(this, ResId(ET_JDBCDRIVERCLASS))
                ,m_aTestJavaDriver(this, ResId(PB_TESTDRIVERCLASS))
                ,m_aTestConnection(this, ResId(PB_TESTCONNECTION))
-               ,m_aFL1(this, ResId(FL_SEPARATOR1))
-               ,m_aFL2(this, ResId(FL_SEPARATOR2))
-               ,m_aFL3(this, ResId(FL_SEPARATOR3))
-               ,m_pCollection(NULL)
-               ,m_bUserGrabFocus(sal_True)
        {
                DBG_CTOR(OConnectionTabPage,NULL);              
                m_aET_Connection.SetModifyHdl(LINK(this, OConnectionTabPage, 
OnEditModified));
@@ -330,11 +330,9 @@
                // collect the items
                SFX_ITEMSET_GET(_rSet, pUidItem, SfxStringItem, DSID_USER, 
sal_True);
 
-               SFX_ITEMSET_GET(_rSet, pPwdItem, SfxStringItem, DSID_PASSWORD, 
sal_True);
                SFX_ITEMSET_GET(_rSet, pJdbcDrvItem, SfxStringItem, 
DSID_JDBCDRIVERCLASS, sal_True);
                SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, 
DSID_CONNECTURL, sal_True);
                SFX_ITEMSET_GET(_rSet, pAllowEmptyPwd, SfxBoolItem, 
DSID_PASSWORDREQUIRED, sal_True);
-               SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, 
DSID_CONN_HOSTNAME, sal_True);
 
                // forward the values to the controls
                if ( bValid )
@@ -409,7 +407,7 @@
                return bChangedSomething;
        }
        // 
-----------------------------------------------------------------------
-       IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, _pButton)
+       IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, 
/*_pButton*/)
        {
                OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
                sal_Bool bSuccess = sal_False;




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

Reply via email to