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#

1 files changed, 10 insertions, 39 deletions

diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index eb4827328ec2..60171c4b7c88 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: adminpages.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: rt $ $Date: 2007-04-26 07:57:30 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 10:24:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -118,18 +118,10 @@ namespace dbaui
 
 
     //=========================================================================
-    //= 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 @@ DBG_NAME(OGenericAdministrationPage)
     {
         if (_pSet)
         {
-            if (!checkItems())
+            if (!prepareLeave())
                 return KEEP_PAGE;
             FillItemSet(*_pSet);
         }
@@ -183,24 +175,6 @@ DBG_NAME(OGenericAdministrationPage)
     }
 
     // -----------------------------------------------------------------------
-    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 @@ DBG_NAME(OGenericAdministrationPage)
         }
         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 @@ DBG_NAME(OGenericAdministrationPage)
         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));
- //       }
+        delete(m_pFT_HeaderText);
+        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;
     }