remove unused RefEdit/RefButton

and rename WeldRefEdit/WeldRefButton back

Change-Id: I3aab8585d4ba1017cc755bf21e827522e7ee6980
Reviewed-on: https://gerrit.libreoffice.org/71957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 46 insertions, 46 deletions

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 070c75c62714..0efce49f4f99 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,14 +93,14 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     , mxSourceRadioNamedRange(m_xBuilder->weld_radio_button("source-radio-named-range"))
     , mxSourceRadioSelection(m_xBuilder->weld_radio_button("source-radio-selection"))
     , mxSourceListBox(m_xBuilder->weld_combo_box("source-list"))
-    , mxSourceEdit(new formula::WeldRefEdit(m_xBuilder->weld_entry("source-edit")))
-    , mxSourceButton(new formula::WeldRefButton(m_xBuilder->weld_button("source-button")))
+    , mxSourceEdit(new formula::RefEdit(m_xBuilder->weld_entry("source-edit")))
+    , mxSourceButton(new formula::RefButton(m_xBuilder->weld_button("source-button")))
     , mxDestinationRadioNewSheet(m_xBuilder->weld_radio_button("destination-radio-new-sheet"))
     , mxDestinationRadioNamedRange(m_xBuilder->weld_radio_button("destination-radio-named-range"))
     , mxDestinationRadioSelection(m_xBuilder->weld_radio_button("destination-radio-selection"))
     , mxDestinationListBox(m_xBuilder->weld_combo_box("destination-list"))
-    , mxDestinationEdit(new formula::WeldRefEdit(m_xBuilder->weld_entry("destination-edit")))
-    , mxDestinationButton(new formula::WeldRefButton(m_xBuilder->weld_button("destination-button")))
+    , mxDestinationEdit(new formula::RefEdit(m_xBuilder->weld_entry("destination-edit")))
+    , mxDestinationButton(new formula::RefButton(m_xBuilder->weld_button("destination-button")))
     , mxBtnOK(m_xBuilder->weld_button("ok"))
     , mxBtnCancel(m_xBuilder->weld_button("cancel"))
     , mxSourceFrame(m_xBuilder->weld_frame("frame2"))
@@ -118,7 +118,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     mxSourceEdit->SetReferences(this, mxSourceLabel.get());
     mxSourceButton->SetReferences(this, mxSourceEdit.get());
 
-    Link<formula::WeldRefEdit&,void> aEditLink = LINK(this, ScPivotLayoutDialog, GetEditFocusHandler);
+    Link<formula::RefEdit&,void> aEditLink = LINK(this, ScPivotLayoutDialog, GetEditFocusHandler);
     mxDestinationEdit->SetGetFocusHdl(aEditLink);
     mxSourceEdit->SetGetFocusHdl(aEditLink);
 
@@ -138,7 +138,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     mxDestinationEdit->SetReferences(this, mxDestLabel.get());
     mxDestinationButton->SetReferences(this, mxDestinationEdit.get());
 
-    Link<formula::WeldRefButton&,void> aButtonLink = LINK(this, ScPivotLayoutDialog, GetButtonFocusHandler);
+    Link<formula::RefButton&,void> aButtonLink = LINK(this, ScPivotLayoutDialog, GetButtonFocusHandler);
     mxSourceButton->SetGetFocusHdl(aButtonLink);
     mxDestinationButton->SetGetFocusHdl(aButtonLink);
 
@@ -637,13 +637,13 @@ IMPL_LINK_NOARG( ScPivotLayoutDialog, CancelClicked, weld::Button&, void )
     m_xDialog->response(RET_CANCEL);
 }
 
-IMPL_LINK(ScPivotLayoutDialog, GetEditFocusHandler, formula::WeldRefEdit&, rCtrl, void)
+IMPL_LINK(ScPivotLayoutDialog, GetEditFocusHandler, formula::RefEdit&, rCtrl, void)
 {
     mpActiveEdit = &rCtrl;
     mpActiveEdit->SelectAll();
 }
 
-IMPL_LINK(ScPivotLayoutDialog, GetButtonFocusHandler, formula::WeldRefButton&, rCtrl, void)
+IMPL_LINK(ScPivotLayoutDialog, GetButtonFocusHandler, formula::RefButton&, rCtrl, void)
 {
     mpActiveEdit = nullptr;
 
@@ -656,12 +656,12 @@ IMPL_LINK(ScPivotLayoutDialog, GetButtonFocusHandler, formula::WeldRefButton&, r
         mpActiveEdit->SelectAll();
 }
 
-IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseEditFocusHandler, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseEditFocusHandler, formula::RefEdit&, void)
 {
     mbDialogLostFocus = !m_xDialog->has_toplevel_focus();
 }
 
-IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseButtonFocusHandler, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScPivotLayoutDialog, LoseButtonFocusHandler, formula::RefButton&, void)
 {
     mbDialogLostFocus = !m_xDialog->has_toplevel_focus();
 }
@@ -671,7 +671,7 @@ IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceListSelected, weld::ComboBox&, void)
     UpdateSourceRange();
 }
 
-IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, formula::RefEdit&, void)
 {
     UpdateSourceRange();
 }
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 26778575f672..d5a1de99c164 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -84,11 +84,11 @@ ScConsolidateDlg::ScConsolidateDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::W
     , m_xLbFunc(m_xBuilder->weld_combo_box("func"))
     , m_xLbConsAreas(m_xBuilder->weld_tree_view("consareas"))
     , m_xLbDataArea(m_xBuilder->weld_combo_box("lbdataarea"))
-    , m_xEdDataArea(new formula::WeldRefEdit(m_xBuilder->weld_entry("eddataarea")))
-    , m_xRbDataArea(new formula::WeldRefButton(m_xBuilder->weld_button("rbdataarea")))
+    , m_xEdDataArea(new formula::RefEdit(m_xBuilder->weld_entry("eddataarea")))
+    , m_xRbDataArea(new formula::RefButton(m_xBuilder->weld_button("rbdataarea")))
     , m_xLbDestArea(m_xBuilder->weld_combo_box("lbdestarea"))
-    , m_xEdDestArea(new formula::WeldRefEdit(m_xBuilder->weld_entry("eddestarea")))
-    , m_xRbDestArea(new formula::WeldRefButton(m_xBuilder->weld_button("rbdestarea")))
+    , m_xEdDestArea(new formula::RefEdit(m_xBuilder->weld_entry("eddestarea")))
+    , m_xRbDestArea(new formula::RefButton(m_xBuilder->weld_button("rbdestarea")))
     , m_xExpander(m_xBuilder->weld_expander("more"))
     , m_xBtnByRow(m_xBuilder->weld_check_button("byrow"))
     , m_xBtnByCol(m_xBuilder->weld_check_button("bycol"))
@@ -283,7 +283,7 @@ void ScConsolidateDlg::Deactivate()
     bDlgLostFocus = true;
 }
 
-bool ScConsolidateDlg::VerifyEdit( formula::WeldRefEdit* pEd )
+bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
 {
     if ( !pRangeUtil || !pDoc ||
          ((pEd != m_xEdDataArea.get()) && (pEd != m_xEdDestArea.get())) )
@@ -316,7 +316,7 @@ bool ScConsolidateDlg::VerifyEdit( formula::WeldRefEdit* pEd )
 
 // Handler:
 
-IMPL_LINK( ScConsolidateDlg, GetEditFocusHdl, formula::WeldRefEdit&, rControl, void )
+IMPL_LINK( ScConsolidateDlg, GetEditFocusHdl, formula::RefEdit&, rControl, void )
 {
     m_pRefInputEdit = &rControl;
 }
@@ -447,7 +447,7 @@ IMPL_LINK( ScConsolidateDlg, SelectTVHdl, weld::TreeView&, rLb, void )
 
 IMPL_LINK( ScConsolidateDlg, SelectCBHdl, weld::ComboBox&, rLb, void )
 {
-    formula::WeldRefEdit* pEd = (&rLb == m_xLbDataArea.get()) ? m_xEdDataArea.get() : m_xEdDestArea.get();
+    formula::RefEdit* pEd = (&rLb == m_xLbDataArea.get()) ? m_xEdDataArea.get() : m_xEdDestArea.get();
     const sal_Int32 nSelPos = rLb.get_active();
 
     if (    pRangeUtil
@@ -476,7 +476,7 @@ IMPL_LINK( ScConsolidateDlg, SelectCBHdl, weld::ComboBox&, rLb, void )
     }
 }
 
-IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::WeldRefEdit&, rEd, void )
+IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit&, rEd, void )
 {
     if ( &rEd == m_xEdDataArea.get() )
     {
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 0299367a240f..c0f656035311 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -56,7 +56,7 @@ namespace
 class DBSaveData
 {
 public:
-    DBSaveData( formula::WeldRefEdit& rEd, weld::CheckButton& rHdr, weld::CheckButton& rTot, weld::CheckButton& rSize, weld::CheckButton& rFmt,
+    DBSaveData( formula::RefEdit& rEd, weld::CheckButton& rHdr, weld::CheckButton& rTot, weld::CheckButton& rSize, weld::CheckButton& rFmt,
                             weld::CheckButton& rStrip, ScRange& rArea )
         : rEdAssign(rEd)
         , rBtnHeader(rHdr)
@@ -77,7 +77,7 @@ public:
     void Restore();
 
 private:
-    formula::WeldRefEdit& rEdAssign;
+    formula::RefEdit& rEdAssign;
     weld::CheckButton& rBtnHeader;
     weld::CheckButton& rBtnTotals;
     weld::CheckButton& rBtnSize;
@@ -134,8 +134,8 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pPa
     , aLocalDbCol(*(pDoc->GetDBCollection()))
     , m_xEdName(m_xBuilder->weld_entry_tree_view("entrygrid", "entry", "entry-list"))
     , m_xAssignFrame(m_xBuilder->weld_frame("RangeFrame"))
-    , m_xEdAssign(new formula::WeldRefEdit(m_xBuilder->weld_entry("assign")))
-    , m_xRbAssign(new formula::WeldRefButton(m_xBuilder->weld_button("assignrb")))
+    , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("assign")))
+    , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("assignrb")))
     , m_xOptions(m_xBuilder->weld_widget("Options"))
     , m_xBtnHeader(m_xBuilder->weld_check_button("ContainsColumnLabels"))
     , m_xBtnTotals(m_xBuilder->weld_check_button("ContainsTotalsRow"))
@@ -605,7 +605,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl, weld::ComboBox&, void)
     }
 }
 
-IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl, formula::RefEdit&, void)
 {
     //  parse here for Save(), etc.
 
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 9a2686cb57ee..eec177bb2f91 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -88,8 +88,8 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pPa
     , m_xBtnUnique(m_xBuilder->weld_check_button("unique"))
     , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
     , m_xLbCopyArea(m_xBuilder->weld_combo_box("lbcopyarea"))
-    , m_xEdCopyArea(new formula::WeldRefEdit(m_xBuilder->weld_entry("edcopyarea")))
-    , m_xRbCopyArea(new formula::WeldRefButton(m_xBuilder->weld_button("rbcopyarea")))
+    , m_xEdCopyArea(new formula::RefEdit(m_xBuilder->weld_entry("edcopyarea")))
+    , m_xRbCopyArea(new formula::RefButton(m_xBuilder->weld_button("rbcopyarea")))
     , m_xBtnDestPers(m_xBuilder->weld_check_button("destpers"))
     , m_xFtDbAreaLabel(m_xBuilder->weld_label("dbarealabel"))
     , m_xFtDbArea(m_xBuilder->weld_label("dbarea"))
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 4ceedd4934bf..84fb097dd97e 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -41,8 +41,8 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
                                 weld::CheckButton* refBtnCopyResult,
                                 weld::CheckButton* refBtnDestPers,
                                 weld::ComboBox* refLbCopyArea,
-                                formula::WeldRefEdit* refEdCopyArea,
-                                formula::WeldRefButton* refRbCopyArea,
+                                formula::RefEdit* refEdCopyArea,
+                                formula::RefButton* refRbCopyArea,
                                 weld::Label* refFtDbAreaLabel,
                                 weld::Label* refFtDbArea,
                                 const OUString&     refStrUndefined )
@@ -213,7 +213,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, weld::ComboBox&, rLb, void )
     }
 }
 
-IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, formula::WeldRefEdit&, rEd, void )
+IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, formula::RefEdit&, rEd, void )
 {
     if ( &rEd == pEdCopyArea )
     {
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 6bfed89324e5..71b1693e225c 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -64,8 +64,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, we
     , bRefInputMode(false)
     , m_pRefInputEdit(nullptr)
     , m_xLbFilterArea(m_xBuilder->weld_combo_box("lbfilterarea"))
-    , m_xEdFilterArea(new formula::WeldRefEdit(m_xBuilder->weld_entry("edfilterarea")))
-    , m_xRbFilterArea(new formula::WeldRefButton(m_xBuilder->weld_button("rbfilterarea")))
+    , m_xEdFilterArea(new formula::RefEdit(m_xBuilder->weld_entry("edfilterarea")))
+    , m_xRbFilterArea(new formula::RefButton(m_xBuilder->weld_button("rbfilterarea")))
     , m_xExpander(m_xBuilder->weld_expander("more"))
     , m_xBtnCase(m_xBuilder->weld_check_button("case"))
     , m_xBtnRegExp(m_xBuilder->weld_check_button("regexp"))
@@ -73,8 +73,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, we
     , m_xBtnUnique(m_xBuilder->weld_check_button("unique"))
     , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
     , m_xLbCopyArea(m_xBuilder->weld_combo_box("lbcopyarea"))
-    , m_xEdCopyArea(new formula::WeldRefEdit(m_xBuilder->weld_entry("edcopyarea")))
-    , m_xRbCopyArea(new formula::WeldRefButton(m_xBuilder->weld_button("rbcopyarea")))
+    , m_xEdCopyArea(new formula::RefEdit(m_xBuilder->weld_entry("edcopyarea")))
+    , m_xRbCopyArea(new formula::RefButton(m_xBuilder->weld_button("rbcopyarea")))
     , m_xBtnDestPers(m_xBuilder->weld_check_button("destpers"))
     , m_xFtDbAreaLabel(m_xBuilder->weld_label("dbarealabel"))
     , m_xFtDbArea(m_xBuilder->weld_label("dbarea"))
@@ -90,8 +90,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, we
 
     Init( rArgSet );
 
-    Link<formula::WeldRefEdit&, void> aLinkEdit = LINK(this, ScSpecialFilterDlg, RefInputEditHdl);
-    Link<formula::WeldRefButton&, void> aLinkButton = LINK(this, ScSpecialFilterDlg, RefInputButtonHdl);
+    Link<formula::RefEdit&, void> aLinkEdit = LINK(this, ScSpecialFilterDlg, RefInputEditHdl);
+    Link<formula::RefButton&, void> aLinkButton = LINK(this, ScSpecialFilterDlg, RefInputButtonHdl);
     m_xEdCopyArea->SetGetFocusHdl(aLinkEdit);
     m_xRbCopyArea->SetGetFocusHdl(aLinkButton);
     m_xEdFilterArea->SetGetFocusHdl(aLinkEdit);
@@ -359,12 +359,12 @@ IMPL_LINK(ScSpecialFilterDlg, EndDlgHdl, weld::Button&, rBtn, void)
     }
 }
 
-IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputEditHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputEditHdl, formula::RefEdit&, void)
 {
     RefInputHdl();
 }
 
-IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputButtonHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputButtonHdl, formula::RefButton&, void)
 {
     RefInputHdl();
 }
@@ -405,7 +405,7 @@ IMPL_LINK(ScSpecialFilterDlg, FilterAreaSelHdl, weld::ComboBox&, rLb, void)
     }
 }
 
-IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::WeldRefEdit&, rEd, void )
+IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit&, rEd, void )
 {
     if (&rEd == m_xEdFilterArea.get())
     {
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index c9c8bbc84be9..c611fd3933fb 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -126,7 +126,7 @@ void ScTPValidationValue:: SetActiveHdl()
         }
 }
 
-void ScTPValidationValue::RefInputStartPreHdl( formula::WeldRefEdit* pEdit, const formula::WeldRefButton* pButton )
+void ScTPValidationValue::RefInputStartPreHdl( formula::RefEdit* pEdit, const formula::RefButton* pButton )
 {
     if (ScValidationDlg *pValidationDlg = GetValidationDlg())
     {
@@ -343,12 +343,12 @@ ScTPValidationValue::ScTPValidationValue(TabPageParent pParent, const SfxItemSet
     , m_xLbValue(m_xBuilder->weld_combo_box("data"))
     , m_xFtMin(m_xBuilder->weld_label("minft"))
     , m_xMinGrid(m_xBuilder->weld_widget("mingrid"))
-    , m_xEdMin(new formula::WeldRefEdit(m_xBuilder->weld_entry("min")))
+    , m_xEdMin(new formula::RefEdit(m_xBuilder->weld_entry("min")))
     , m_xEdList(m_xBuilder->weld_text_view("minlist"))
     , m_xFtMax(m_xBuilder->weld_label("maxft"))
-    , m_xEdMax(new formula::WeldRefEdit(m_xBuilder->weld_entry("max")))
+    , m_xEdMax(new formula::RefEdit(m_xBuilder->weld_entry("max")))
     , m_xFtHint(m_xBuilder->weld_label("hintft"))
-    , m_xBtnRef(new formula::WeldRefButton(m_xBuilder->weld_button("validref")))
+    , m_xBtnRef(new formula::RefButton(m_xBuilder->weld_button("validref")))
     , m_xRefGrid(m_xBuilder->weld_container("refgrid"))
     , m_pRefEditParent(m_xRefGrid.get())
     , m_pBtnRefParent(m_xRefGrid.get())
@@ -578,7 +578,7 @@ void ScTPValidationValue::RemoveRefDlg(bool bRestoreModal)
     }
 }
 
-IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, formula::RefEdit&, void)
 {
     const sal_Int32 nPos = m_xLbAllow->get_active();
 
@@ -588,7 +588,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, formula::WeldRefEdit&, voi
     }
 }
 
-IMPL_LINK( ScTPValidationValue, KillEditFocusHdl, formula::WeldRefEdit&, rWnd, void )
+IMPL_LINK( ScTPValidationValue, KillEditFocusHdl, formula::RefEdit&, rWnd, void )
 {
     if (&rWnd != m_pRefEdit)
         return;
@@ -604,7 +604,7 @@ IMPL_LINK( ScTPValidationValue, KillEditFocusHdl, formula::WeldRefEdit&, rWnd, v
     }
 }
 
-IMPL_LINK( ScTPValidationValue, KillButtonFocusHdl, formula::WeldRefButton&, rWnd, void )
+IMPL_LINK( ScTPValidationValue, KillButtonFocusHdl, formula::RefButton&, rWnd, void )
 {
     if( &rWnd != m_xBtnRef.get())
         return;
@@ -909,7 +909,7 @@ bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ )
     return true;
 }
 
-IMPL_LINK_NOARG(ScTPValidationValue, ClickHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScTPValidationValue, ClickHdl, formula::RefButton&, void)
 {
     SetupRefDlg();
 }