finalized the list/combo wizard

1 files changed, 12 insertions, 96 deletions

diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 4442caa6f8f3..ddc2db3a4634 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: groupboxwiz.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-23 15:19:08 $
+ *  last change: $Author: fs $ $Date: 2001-02-28 09:18:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -373,73 +373,6 @@ namespace dbp
     }
 
     //=====================================================================
-    //= OMaybeListSelectionPage
-    //=====================================================================
-    //---------------------------------------------------------------------
-    OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId )
-        :OGBWPage(_pParent, _rId)
-        ,m_pYes(NULL)
-        ,m_pNo(NULL)
-        ,m_pList(NULL)
-    {
-    }
-
-    //---------------------------------------------------------------------
-    void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection)
-    {
-        m_pYes = &_rYesButton;
-        m_pNo = &_rNoButton;
-        m_pList = &_rSelection;
-
-        m_pYes->SetClickHdl(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
-        m_pNo->SetClickHdl(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
-        implEnableWindows();
-    }
-
-    //---------------------------------------------------------------------
-    IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, NOTINTERESTEDIN )
-    {
-        implEnableWindows();
-        return 0L;
-    }
-
-    //---------------------------------------------------------------------
-    void OMaybeListSelectionPage::implInitialize(const String& _rSelection)
-    {
-        DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!");
-        sal_Bool bIsSelection = (0 != _rSelection.Len());
-        m_pYes->Check(bIsSelection);
-        m_pNo->Check(!bIsSelection);
-        m_pList->Enable(bIsSelection);
-
-        m_pList->SelectEntry(bIsSelection ? _rSelection : String());
-    }
-
-    //---------------------------------------------------------------------
-    void OMaybeListSelectionPage::implCommit(String& _rSelection)
-    {
-        _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : String();
-    }
-
-    //---------------------------------------------------------------------
-    void OMaybeListSelectionPage::implEnableWindows()
-    {
-        m_pList->Enable(m_pYes->IsChecked());
-    }
-
-    //---------------------------------------------------------------------
-    void OMaybeListSelectionPage::ActivatePage()
-    {
-        OGBWPage::ActivatePage();
-
-        DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::ActivatePage: no controls announced!");
-        if (m_pYes->IsChecked())
-            m_pList->GrabFocus();
-        else
-            m_pNo->GrabFocus();
-    }
-
-    //=====================================================================
     //= ODefaultFieldSelectionPage
     //=====================================================================
     //---------------------------------------------------------------------
@@ -481,8 +414,10 @@ namespace dbp
     {
         if (!OMaybeListSelectionPage::commitPage(_eReason))
             return sal_False;
+
         OOptionGroupSettings& rSettings = getSettings();
         implCommit(rSettings.sDefaultField);
+
         return sal_True;
     }
 
@@ -578,41 +513,19 @@ namespace dbp
     }
 
     //=====================================================================
-    //= OOptionValuesPage
+    //= OOptionDBFieldPage
     //=====================================================================
     //---------------------------------------------------------------------
     OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
-        :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD))
-        ,m_aFrame           (this, ResId(FL_DATABASEFIELD_EXPL))
-        ,m_aDescription     (this, ResId(FT_DATABASEFIELD_EXPL))
-        ,m_aQuestion        (this, ResId(FT_DATABASEFIELD_QUEST))
-        ,m_aStoreYes        (this, ResId(RB_STOREINFIELD_YES))
-        ,m_aStoreNo         (this, ResId(LB_STOREINFIELD))
-        ,m_aStoreWhere      (this, ResId(RB_STOREINFIELD_NO))
+        :ODBFieldPage(_pParent)
     {
-        FreeResource();
-        announceControls(m_aStoreYes, m_aStoreNo, m_aStoreWhere);
-        m_aStoreWhere.SetDropDownLineCount(10);
+        setDescriptionText(String(ModuleRes(RID_STR_GROUPWIZ_DBFIELD)));
     }
 
     //---------------------------------------------------------------------
-    void OOptionDBFieldPage::initializePage()
+    String& OOptionDBFieldPage::getDBFieldSetting()
     {
-        OMaybeListSelectionPage::initializePage();
-
-        // fill the fields page
-        fillListBox(m_aStoreWhere, getContext().aFieldNames);
-
-        const OOptionGroupSettings& rSettings = getSettings();
-        implInitialize(rSettings.sDBField);
-    }
-
-    //---------------------------------------------------------------------
-    sal_Bool OOptionDBFieldPage::commitPage(COMMIT_REASON _eReason)
-    {
-        if (!OMaybeListSelectionPage::commitPage(_eReason))
-            return sal_False;
-        return sal_True;
+        return getSettings().sDBField;
     }
 
     //=====================================================================
@@ -663,6 +576,9 @@ namespace dbp
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/02/23 15:19:08  fs
+ *  some changes / centralizations - added the list-/combobox wizard
+ *
  *  Revision 1.1  2001/02/21 09:23:55  fs
  *  initial checkin - form control auto pilots
  *