summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:04:20 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:04:20 +0000
commitfabe902084460fceedec22356463139817704400 (patch)
treef55a790b4e3331334ecdc3855394a66873ac5824 /dbaccess/source/ui/dlg/TextConnectionHelper.cxx
parent26c78099d423b30a659fa599b19aca9366a52856 (diff)
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)
Diffstat (limited to 'dbaccess/source/ui/dlg/TextConnectionHelper.cxx')
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx17
1 files changed, 8 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index fae8f6b4f7c2..1bdd9157a882 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: TextConnectionHelper.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2006-05-04 08:40:47 $
+ * last change: $Author: hr $ $Date: 2006-06-20 03:04:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -163,8 +163,9 @@ namespace dbaui
//========================================================================
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 @@ DBG_NAME(OTextConnectionHelper)
,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 @@ DBG_NAME(OTextConnectionHelper)
// -----------------------------------------------------------------------
- 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 @@ DBG_NAME(OTextConnectionHelper)
}
// -----------------------------------------------------------------------
- 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 @@ DBG_NAME(OTextConnectionHelper)
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 )