User: kz Date: 2007-05-10 10:24:15+0000 Log: INTEGRATION: CWS dba23a (1.45.6); FILE MERGED 2007/03/13 08:42:13 fs 1.45.6.1: some slight re-factoring (class/method renaming), plus some rudimentary fix for #b6532894#
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.46&r2=1.47 Delta lines: +8 -37 -------------------- --- adminpages.cxx 2007-04-26 07:57:30+0000 1.46 +++ adminpages.cxx 2007-05-10 10:24:13+0000 1.47 @@ -118,18 +118,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) @@ -155,7 +147,7 @@ { if (_pSet) { - if (!checkItems()) + if (!prepareLeave()) return KEEP_PAGE; FillItemSet(*_pSet); } @@ -183,24 +175,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); @@ -244,8 +218,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; @@ -361,17 +336,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]
