Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:19:09+0000 Log: RESYNC: (1.45-1.47); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adminpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.cxx?r1=1.41.4.6&r2=1.41.4.7 Delta lines: +9 -38 -------------------- --- adminpages.cxx 2007-02-20 15:48:18+0000 1.41.4.6 +++ adminpages.cxx 2007-06-04 18:19:06+0000 1.41.4.7 @@ -115,18 +115,10 @@ //========================================================================= - //= OPageSettings - //========================================================================= - //------------------------------------------------------------------------- - OPageSettings::~OPageSettings() - { - } - - //========================================================================= //= OGenericAdministrationPage //========================================================================= -DBG_NAME(OGenericAdministrationPage) -//------------------------------------------------------------------------- + DBG_NAME(OGenericAdministrationPage) + //------------------------------------------------------------------------- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rAttrSet) ,m_abEnableRoadmap(sal_False) @@ -152,7 +144,7 @@ { if (_pSet) { - if (!checkItems()) + if (!prepareLeave()) return KEEP_PAGE; FillItemSet(*_pSet); } @@ -180,24 +172,6 @@ } // ----------------------------------------------------------------------- - OPageSettings* OGenericAdministrationPage::createViewSettings() - { - return NULL; - } - - // ----------------------------------------------------------------------- - void OGenericAdministrationPage::fillViewSettings(OPageSettings* /*_rSettings*/) - { - // nothing to do - } - - // ----------------------------------------------------------------------- - void OGenericAdministrationPage::restoreViewSettings(const OPageSettings* /*_pPageState*/) - { - // nothing to do - } - - // ----------------------------------------------------------------------- void OGenericAdministrationPage::getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly) { SFX_ITEMSET_GET(_rSet, pInvalid, SfxBoolItem, DSID_INVALID_SELECTION, sal_True); @@ -223,7 +197,7 @@ { // show an error message LocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE ); - String sError(ResId(STR_COULDNOTLOAD_ODBCLIB)); + String sError(ModuleRes(STR_COULDNOTLOAD_ODBCLIB)); sError.SearchAndReplaceAscii("#lib#", aEnumeration.getLibraryName()); ErrorBox aDialog(this, WB_OK, sError); aDialog.Execute(); @@ -241,8 +215,9 @@ } return sal_True; } + // ----------------------------------------------------------------------- - void OGenericAdministrationPage::postInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OGenericAdministrationPage::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; @@ -358,17 +333,13 @@ return 0L; } - void OGenericAdministrationPage::SetHeaderText( Window* _parent, USHORT _nFTResId, USHORT _StringResId) + void OGenericAdministrationPage::SetHeaderText( USHORT _nFTResId, USHORT _StringResId) { -// if (!m_pFT_HeaderText) -// { delete(m_pFT_HeaderText); - m_pFT_HeaderText = new FixedText(_parent, ModuleRes(_nFTResId)); - // } + m_pFT_HeaderText = new FixedText(this, ModuleRes(_nFTResId)); String sHeaderText = String(ModuleRes(_StringResId)); m_pFT_HeaderText->SetText(sHeaderText); SetControlFontWeight(m_pFT_HeaderText); -// return m_pFT_HeaderText; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
