User: hr      
Date: 06/06/19 20:04:22

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

Log:
 INTEGRATION: CWS warnings01 (1.5.74); FILE MERGED
 2006/05/23 23:51:16 sb 1.5.74.3: RESYNC: (1.6-1.7); FILE MERGED
 2006/04/07 20:51:47 sb 1.5.74.2: RESYNC: (1.5-1.6); FILE MERGED
 2006/03/24 15:36:09 fs 1.5.74.1: #i57457# warning-free code (unxlngi6/.pro + 
unxsoli4.pro)

File Changes:

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

File [changed]: TextConnectionHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?r1=1.7&r2=1.8
Delta lines:  +7 -8
-------------------
--- TextConnectionHelper.cxx    4 May 2006 08:40:47 -0000       1.7
+++ TextConnectionHelper.cxx    20 Jun 2006 03:04:20 -0000      1.8
@@ -163,8 +163,9 @@
        
//========================================================================
 DBG_NAME(OTextConnectionHelper)
 //------------------------------------------------------------------------
-       OTextConnectionHelper::OTextConnectionHelper( Window* pParent, USHORT 
nResId, sal_Bool _bWizardMode )
+       OTextConnectionHelper::OTextConnectionHelper( Window* pParent, sal_Bool 
_bWizardMode )
                :Control(pParent)
+               ,m_aHeader                                      (pParent, 
ResId(CB_AUTOHEADER))
                ,m_aLineFormat                          (pParent, 
ResId(FL_AUTOSEPARATOR2))
         ,m_aFTExtensionHeader       (pParent, ResId(FT_AUTOEXTENSIONHEADER))
         ,m_aRBAccessTextFiles       (pParent, ResId(RB_AUTOACCESSCTEXTFILES))
@@ -172,7 +173,6 @@
         ,m_aRBAccessOtherFiles      (pParent, ResId(RB_AUTOACCESSOTHERS))
         ,m_aETOwnExtension          (pParent, ResId(ET_AUTOOWNEXTENSION))
         ,m_aFTExtensionExample      (pParent, 
ResId(FT_AUTOOWNEXTENSIONAPPENDIX))
-               ,m_aHeader                                      (pParent, 
ResId(CB_AUTOHEADER))
         ,m_aFieldSeparatorLabel                (pParent, 
ResId(FT_AUTOFIELDSEPARATOR))
                ,m_aFieldSeparator                      (pParent, 
ResId(CM_AUTOFIELDSEPARATOR))
                ,m_aTextSeparatorLabel          (pParent, 
ResId(FT_AUTOTEXTSEPARATOR))
@@ -226,21 +226,21 @@
 
 
        // 
-----------------------------------------------------------------------
-       IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*, EMPTYARG)
+       IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*, 
/*EMPTYARG*/)
        {
                callModifiedHdl();
                return 0L;
        }
 
     // -----------------------------------------------------------------------
-       IMPL_LINK(OTextConnectionHelper, OnEditModified, Edit*, _pEdit)
+       IMPL_LINK(OTextConnectionHelper, OnEditModified, Edit*, /*_pEdit*/)
        {
                m_aGetExtensionHandler.Call(this);
                return 0L;
        }
 
 
-    IMPL_LINK(OTextConnectionHelper, OnSetExtensionHdl, RadioButton*, 
_pRadioButton)
+    IMPL_LINK(OTextConnectionHelper, OnSetExtensionHdl, RadioButton*, 
/*_pRadioButton*/)
     {
         sal_Bool bDoEnable = m_aRBAccessOtherFiles.IsChecked();
         m_aETOwnExtension.Enable(bDoEnable);
@@ -269,7 +269,7 @@
        }
        
     // -----------------------------------------------------------------------
-       void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, 
sal_Bool _bSaveValue, sal_Bool _bValid)
+       void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, 
sal_Bool /*_bSaveValue*/, sal_Bool _bValid)
        {
         m_aHeader.Show(!m_bWizardMode);
                
@@ -458,7 +458,6 @@
        String OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const 
String& rList )
        {
                sal_Unicode     nTok = '\t';
-               sal_Int32       nRet(0);
                xub_StrLen      nPos(rBox.GetEntryPos( rBox.GetText() ));
 
                if( nPos == COMBOBOX_ENTRY_NOTFOUND )




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

Reply via email to