User: hr Date: 05/09/23 05:26:19 Modified: /dba/dbaccess/source/ui/dlg/ DBSetupConnectionPages.cxx
Log: INTEGRATION: CWS dba201b (1.4.44); FILE MERGED 2005/09/21 08:20:37 oj 1.4.44.4: RESYNC: (1.4-1.5); FILE MERGED 2005/07/11 13:37:18 fs 1.4.44.3: merging CWS dba201 into CWS dba201b 2005/07/06 11:02:49 oj 1.4.44.2: #i49690# check if jvm is null 2005/07/06 08:20:11 oj 1.4.44.1: #i48453# disable table wizard when open of db app is not checked 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.5&r2=1.6 Delta lines: +44 -10 --------------------- --- DBSetupConnectionPages.cxx 8 Sep 2005 14:46:27 -0000 1.5 +++ DBSetupConnectionPages.cxx 23 Sep 2005 12:26:16 -0000 1.6 @@ -162,10 +162,13 @@ //======================================================================== //= OTextConnectionPageSetup //======================================================================== - //------------------------------------------------------------------------ +DBG_NAME(OTextConnectionPageSetup) +//------------------------------------------------------------------------ OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_TEXT, _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE) { + DBG_CTOR(OTextConnectionPageSetup,NULL); + m_pTextConnectionHelper = new OTextConnectionHelper(this, PAGE_DBWIZARD_TEXT, sal_True); m_pTextConnectionHelper->SetClickHandler(LINK( this, OTextConnectionPageSetup, ImplGetExtensionHdl ) ); @@ -185,6 +188,8 @@ OTextConnectionPageSetup::~OTextConnectionPageSetup() { DELETEZ(m_pTextConnectionHelper); + + DBG_DTOR(OTextConnectionPageSetup,NULL); } IMPL_LINK(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, _pTextConnectionHelper) @@ -359,6 +364,7 @@ return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) ); } +DBG_NAME(OMySQLIntroPageSetup) OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs) @@ -368,6 +374,8 @@ , m_aRB_ODBCDatabase(this, ResId(RB_CONNECTVIAODBC)) , m_aRB_JDBCDatabase(this, ResId(RB_CONNECTVIAJDBC)) { + DBG_CTOR(OMySQLIntroPageSetup,NULL); + SetControlFontWeight(&m_aFT_Headertext); m_aRB_JDBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); m_aRB_JDBCDatabase.SetState(sal_True); @@ -382,6 +390,8 @@ // ----------------------------------------------------------------------- OMySQLIntroPageSetup::~OMySQLIntroPageSetup() { + + DBG_DTOR(OMySQLIntroPageSetup,NULL); } @@ -678,7 +688,7 @@ { // TODO chage jvmaccess ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_pAdminDialog->getORB()); - bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText()); + bSuccess = xJVM.is() && ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText()); } } catch(::com::sun::star::uno::Exception&) @@ -711,11 +721,14 @@ return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } +DBG_NAME(OSpreadSheetConnectionPageSetup) OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_SPREADSHEET, _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) , m_aCBPasswordrequired(this, ResId(CB_SPREADSHEETPASSWORDREQUIRED)) { + DBG_CTOR(OSpreadSheetConnectionPageSetup,NULL); + m_aCBPasswordrequired.SetToggleHdl(getControlModifiedLink()); FreeResource(); } @@ -724,6 +737,8 @@ // ----------------------------------------------------------------------- OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() { + + DBG_DTOR(OSpreadSheetConnectionPageSetup,NULL); } @@ -758,6 +773,7 @@ return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } +DBG_NAME(OAuthentificationPageSetup) OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_AUTHENTIFICATION), _rCoreAttrs ) @@ -768,6 +784,8 @@ , m_aCBPasswordRequired (this, ResId(CB_GENERALPASSWORDREQUIRED)) , m_aPBTestConnection (this, ResId(PB_TESTCONNECTION)) { + DBG_CTOR(OAuthentificationPageSetup,NULL); + SetControlFontWeight(&m_aFTHeaderText); m_aETUserName.SetModifyHdl(getControlModifiedLink()); m_aCBPasswordRequired.SetClickHdl(getControlModifiedLink()); @@ -779,6 +797,8 @@ // ----------------------------------------------------------------------- OAuthentificationPageSetup::~OAuthentificationPageSetup() { + + DBG_DTOR(OAuthentificationPageSetup,NULL); } @@ -832,6 +852,7 @@ return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } +DBG_NAME(OFinalDBPageSetup) OFinalDBPageSetup::OFinalDBPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_FINAL), _rCoreAttrs ) @@ -844,9 +865,11 @@ , m_aCBStartTableWizard (this, ResId(CB_STARTTABLEWIZARD)) , m_aFTFinalText (this, ResId(FT_FINALTEXT)) { + DBG_CTOR(OFinalDBPageSetup,NULL); + String stext = m_aFTFinalHeader.GetText(); SetControlFontWeight(&m_aFTFinalHeader); - m_aCBOpenAfterwards.SetClickHdl(getControlModifiedLink()); + m_aCBOpenAfterwards.SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected)); m_aCBStartTableWizard.SetClickHdl(getControlModifiedLink()); FreeResource(); } @@ -855,6 +878,8 @@ // ----------------------------------------------------------------------- OFinalDBPageSetup::~OFinalDBPageSetup() { + + DBG_DTOR(OFinalDBPageSetup,NULL); } sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() @@ -908,6 +933,15 @@ sal_Bool bChangedSomething = sal_True; return bChangedSomething; } + // ----------------------------------------------------------------------------- + IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox) + { + m_aCBStartTableWizard.Enable( _pBox->IsEnabled() && _pBox->IsChecked() ); + callModifiedHdl(); + // outta here + return 0L; + } //......................................................................... -} // namespace dbaui +} +// namespace dbaui //......................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
