Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:55:11 Modified: dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
Log: RESYNC: (1.5-1.8); FILE MERGED 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.5.4.3&r2=1.5.4.4 Delta lines: +11 -15 --------------------- --- TextConnectionHelper.cxx 25 Apr 2006 13:02:51 -0000 1.5.4.3 +++ TextConnectionHelper.cxx 4 Jul 2006 07:55:09 -0000 1.5.4.4 @@ -86,9 +86,6 @@ #include <svtools/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> -#ifndef DBAUI_ADABASPAGE_HRC -#include "AdabasPage.hrc" -#endif #ifndef _DBAUI_ADASTAT_HXX_ #include "AdabasStat.hxx" #endif @@ -162,8 +159,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)) @@ -171,7 +169,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)) @@ -225,21 +222,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); @@ -268,7 +265,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); @@ -301,7 +298,7 @@ // ----------------------------------------------------------------------- sal_Bool OTextConnectionHelper::checkItems() { - OLocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); + LocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); // for accessing the strings which are local to our own resource block String sExtension = GetExtension(); String aErrorText; @@ -457,7 +454,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]
