Tag: cws_src680_oj14
User: oj      
Date: 2006/07/04 00:54:02

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

Log:
 RESYNC: (1.5-1.6); FILE MERGED

File Changes:

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

File [changed]: ConnectionPageSetup.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx?r1=1.5.8.3&r2=1.5.8.4
Delta lines:  +8 -8
-------------------
--- ConnectionPageSetup.cxx     25 Apr 2006 13:02:50 -0000      1.5.8.3
+++ ConnectionPageSetup.cxx     4 Jul 2006 07:53:59 -0000       1.5.8.4
@@ -216,10 +216,10 @@
        //= OConnectionTabPageSetup
        
//========================================================================
        DBG_NAME(OConnectionTabPageSetup)
-       OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, 
USHORT _rId, const SfxItemSet& _rCoreAttrs, USHORT _nHelpTextResId, USHORT 
_nHeaderResId, USHORT _nUrlResId, sal_Bool _bgetConnection)
+       OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, 
USHORT _rId, const SfxItemSet& _rCoreAttrs, USHORT _nHelpTextResId, USHORT 
_nHeaderResId, USHORT _nUrlResId)
                :OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs)
-        , m_aFT_HelpText(this, ResId(FT_AUTOWIZARDHELPTEXT))
         ,m_bUserGrabFocus(sal_True)
+        ,m_aFT_HelpText(this, ResId(FT_AUTOWIZARDHELPTEXT))
        {
                DBG_CTOR(OConnectionTabPageSetup, NULL);
 
@@ -283,7 +283,7 @@
                {
                        String sDisplayName = 
m_pCollection->getTypeDisplayName(m_eType);
                        FixedText* ppTextControls[] ={&m_aFT_Connection};
-                       for (int i = 0; i < 
sizeof(ppTextControls)/sizeof(ppTextControls[0]); ++i)
+                       for (size_t i = 0; i < 
sizeof(ppTextControls)/sizeof(ppTextControls[0]); ++i)
                        {
                                ppTextControls[i]->SetText(sDisplayName);
                        }
@@ -292,7 +292,7 @@
                callModifiedHdl();
        }
        // 
-----------------------------------------------------------------------
-       sal_Bool OConnectionTabPageSetup::commitPage(COMMIT_REASON _eReason)
+       sal_Bool OConnectionTabPageSetup::commitPage(COMMIT_REASON /*_eReason*/)
        {
                return commitURL();
        }
@@ -311,7 +311,7 @@
        }
 
     // -----------------------------------------------------------------------
-       IMPL_LINK(OConnectionTabPageSetup, OnEditModified, Edit*, _pEdit)
+       IMPL_LINK(OConnectionTabPageSetup, OnEditModified, Edit*, /*_pEdit*/)
        {
         SetRoadmapStateValue(checkTestConnection());
                callModifiedHdl();




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

Reply via email to