Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:54:23 Modified: dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
Log: RESYNC: (1.7-1.8); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DBSetupConnectionPages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?r1=1.6.4.4&r2=1.6.4.5 Delta lines: +31 -32 --------------------- --- DBSetupConnectionPages.cxx 25 Apr 2006 13:02:50 -0000 1.6.4.4 +++ DBSetupConnectionPages.cxx 4 Jul 2006 07:54:20 -0000 1.6.4.5 @@ -166,7 +166,7 @@ { DBG_CTOR(OTextConnectionPageSetup,NULL); - m_pTextConnectionHelper = new OTextConnectionHelper(this, PAGE_DBWIZARD_TEXT, sal_True); + m_pTextConnectionHelper = new OTextConnectionHelper(this, sal_True); m_pTextConnectionHelper->SetClickHandler(LINK( this, OTextConnectionPageSetup, ImplGetExtensionHdl ) ); m_pTextConnectionHelper->m_aDecimalSeparator.SetPosPixel( MovePoint( m_pTextConnectionHelper->m_aDecimalSeparator.GetPosPixel(), 0, -14 ) ); @@ -189,9 +189,8 @@ DBG_DTOR(OTextConnectionPageSetup,NULL); } - IMPL_LINK(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, _pTextConnectionHelper) + IMPL_LINK(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, /*_pTextConnectionHelper*/) { - sal_Bool bRoadmapState = GetRoadmapStateValue(); SetRoadmapStateValue((m_pTextConnectionHelper->GetExtension().Len() > 0) && OConnectionTabPageSetup::checkTestConnection()); callModifiedHdl(); return sal_True; @@ -346,7 +345,7 @@ } // ----------------------------------------------------------------------- - IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, _pEdit) + IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/) { sal_Bool bRoadmapState = ((m_aETHostServer.GetText().Len() != 0 ) && ( m_aETBaseDN.GetText().Len() != 0 ) && (m_aFTPortNumber.GetText().Len() != 0 )); SetRoadmapStateValue(bRoadmapState); @@ -365,11 +364,11 @@ OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs) - , m_aFT_Headertext(this, ResId(FT_MYSQL_HEADERTEXT)) - , m_aFT_Helptext(this, ResId(FT_MYSQL_HELPTEXT)) - , m_aFT_ConnectionMode(this, ResId(FT_MYSQLCONNECTIONMODE)) - , m_aRB_ODBCDatabase(this, ResId(RB_CONNECTVIAODBC)) - , m_aRB_JDBCDatabase(this, ResId(RB_CONNECTVIAJDBC)) + ,m_aRB_ODBCDatabase(this, ResId(RB_CONNECTVIAODBC)) + ,m_aRB_JDBCDatabase(this, ResId(RB_CONNECTVIAJDBC)) + ,m_aFT_ConnectionMode(this, ResId(FT_MYSQLCONNECTIONMODE)) + ,m_aFT_Helptext(this, ResId(FT_MYSQL_HELPTEXT)) + ,m_aFT_Headertext(this, ResId(FT_MYSQL_HEADERTEXT)) { DBG_CTOR(OMySQLIntroPageSetup,NULL); @@ -379,7 +378,8 @@ FreeResource(); } - IMPL_LINK(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton*, _pBox){ + IMPL_LINK(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton*, /*_pBox*/) + { maClickHdl.Call( this ); return true; } @@ -393,24 +393,25 @@ // ----------------------------------------------------------------------- - void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/) { } // ----------------------------------------------------------------------- - void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } // ----------------------------------------------------------------------- - void OMySQLIntroPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OMySQLIntroPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - BOOL OMySQLIntroPageSetup::FillItemSet(SfxItemSet& _rSet) + // ----------------------------------------------------------------------- + BOOL OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/) { OSL_ENSURE(sal_False,"Who called me?! Please ask oj for more information."); return sal_True; @@ -459,7 +460,7 @@ //======================================================================== //= OMySQLJDBCConnectionPageSetup //======================================================================== - OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, char* _pDriverName, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId) + OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, const sal_Char* _pDriverName, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId) :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs) ,m_pFTHeaderText (NULL) ,m_aFTHelpText (this, ResId(FT_AUTOWIZARDHELPTEXT)) @@ -468,14 +469,13 @@ ,m_aFTHostname (this, ResId(FT_AUTOHOSTNAME)) ,m_aETHostname (this, ResId(ET_AUTOHOSTNAME)) ,m_aFTPortNumber (this, ResId(FT_AUTOPORTNUMBER)) + ,m_aFTDefaultPortNumber (this, ResId(FT_AUTOPORTNUMBERDEFAULT)) ,m_aNFPortNumber (this, ResId(NF_AUTOPORTNUMBER)) ,m_aFTDriverClass (this, ResId(FT_AUTOJDBCDRIVERCLASS)) ,m_aETDriverClass (this, ResId(ET_AUTOJDBCDRIVERCLASS)) ,m_aPBTestJavaDriver (this, ResId(PB_AUTOTESTDRIVERCLASS)) - ,m_aFTDefaultPortNumber (this, ResId(FT_AUTOPORTNUMBERDEFAULT)) ,m_nPortId(_nPortId) { - if (_nDriverClassId != -1) m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId))); m_aFTDefaultPortNumber.SetText(String(ModuleRes(_nDefaultPortResId))); String sHelpText = String(ModuleRes(_nHelpTextResId)); @@ -564,7 +564,7 @@ } // ----------------------------------------------------------------------- - IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, _pButton) + IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; @@ -604,14 +604,14 @@ // ----------------------------------------------------------------------- OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { - return ( new OJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_JDBC, _rAttrSet)); + return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } //======================================================================== //= OMySQLJDBCConnectionPageSetup //======================================================================== - OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, USHORT _nResId, const SfxItemSet& _rCoreAttrs) + OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) ,m_aFTDriverClass (this, ResId(FT_AUTOJDBCDRIVERCLASS)) ,m_aETDriverClass (this, ResId(ET_AUTOJDBCDRIVERCLASS)) @@ -675,7 +675,7 @@ // ----------------------------------------------------------------------- - IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, _pButton) + IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; @@ -739,7 +739,7 @@ } - void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } @@ -774,8 +774,8 @@ OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_AUTHENTIFICATION), _rCoreAttrs ) - , m_aFTHeaderText (this, ResId(FT_AUTHENTIFICATIONHEADERTEXT)) , m_aFTHelpText (this, ResId(FT_AUTHENTIFICATIONHELPTEXT)) + , m_aFTHeaderText (this, ResId(FT_AUTHENTIFICATIONHEADERTEXT)) , m_aFTUserName (this, ResId(FT_GENERALUSERNAME)) , m_aETUserName (this, ResId(ET_GENERALUSERNAME)) , m_aCBPasswordRequired (this, ResId(CB_GENERALPASSWORDREQUIRED)) @@ -814,7 +814,7 @@ } // ----------------------------------------------------------------------- - void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; @@ -914,7 +914,7 @@ } // ----------------------------------------------------------------------- - void OFinalDBPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/) { m_aCBOpenAfterwards.Check(); } @@ -925,10 +925,9 @@ } // ----------------------------------------------------------------------- - sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& _rSet ) + sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ ) { - sal_Bool bChangedSomething = sal_True; - return bChangedSomething; + return sal_True; } // ----------------------------------------------------------------------------- IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
