summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx374
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx24
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx4
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx60
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx4
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx20
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx26
7 files changed, 81 insertions, 431 deletions
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 44eec39037c8..e13bf804204a 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -47,19 +47,10 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
: m_pDlg(_pDlg)
, m_pRefEdit (nullptr)
, m_pRefBtn (nullptr)
- , m_pWeldRefEdit (nullptr)
- , m_pWeldRefBtn (nullptr)
- , m_pWindow(nullptr)
, m_pDialog(nullptr)
, m_pBindings(_pBindings)
- , m_nOldBorderWidth (0)
, m_nRefTab(0)
- , m_nOldEditWidthReq(-1)
- , m_pOldEditParent(nullptr)
- , m_bOldDlgLayoutEnabled(false)
- , m_bOldEditParentLayoutEnabled(false)
, m_bHighlightRef(false)
- , m_bAccInserted(false)
{
ScInputOptions aInputOption=SC_MOD()->GetInputOptions();
m_bEnableColorRef=aInputOption.GetRangeFinder();
@@ -72,10 +63,6 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
void ScFormulaReferenceHelper::dispose()
{
- if (m_bAccInserted)
- Application::RemoveAccel( m_pAccel.get() );
- m_bAccInserted = false;
-
// common cleanup for ScAnyRefDlg and ScFormulaDlg is done here
HideReference();
enableInput( true );
@@ -84,13 +71,7 @@ void ScFormulaReferenceHelper::dispose()
if ( pInputHdl )
pInputHdl->ResetDelayTimer(); // stop the timer for disabling the input line
- m_pAccel.reset();
-
- m_pOldEditParent.clear();
- m_pWindow.clear();
m_pDialog = nullptr;
- m_pRefBtn.clear();
- m_pRefEdit.clear();
}
void ScFormulaReferenceHelper::enableInput( bool bEnable )
@@ -325,39 +306,6 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit )
}
}
-void ScFormulaReferenceHelper::ReleaseFocus( formula::WeldRefEdit* pEdit )
-{
- if( !m_pWeldRefEdit && pEdit )
- {
- m_pDlg->RefInputStart( pEdit );
- }
-
- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- if( pViewShell )
- {
- pViewShell->ActiveGrabFocus();
- if( m_pWeldRefEdit )
- {
- const ScViewData& rViewData = pViewShell->GetViewData();
- ScDocument* pDoc = rViewData.GetDocument();
- ScRangeList aRangeList;
- if( ParseWithNames( aRangeList, m_pWeldRefEdit->GetText(), pDoc ) )
- {
- if ( !aRangeList.empty() )
- {
- const ScRange & rRange = aRangeList.front();
- pViewShell->SetTabNo( rRange.aStart.Tab() );
- pViewShell->MoveCursorAbs( rRange.aStart.Col(),
- rRange.aStart.Row(), SC_FOLLOW_JUMP, false, false );
- pViewShell->MoveCursorAbs( rRange.aEnd.Col(),
- rRange.aEnd.Row(), SC_FOLLOW_JUMP, true, false );
- m_pDlg->SetReference( rRange, pDoc );
- }
- }
- }
- }
-}
-
void ScFormulaReferenceHelper::Init()
{
ScViewData* pViewData=ScDocShell::GetViewData(); //! use pScViewShell?
@@ -377,23 +325,10 @@ void ScFormulaReferenceHelper::Init()
}
}
-IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator&, rSelAccel, void )
-{
- switch ( rSelAccel.GetCurKeyCode().GetCode() )
- {
- case KEY_RETURN:
- case KEY_ESCAPE:
- if( m_pRefEdit )
- m_pRefEdit->GrabFocus();
- m_pDlg->RefInputDone( true );
- break;
- }
-}
-
IMPL_LINK_NOARG(ScFormulaReferenceHelper, ActivateHdl, weld::Widget&, bool)
{
- if (m_pWeldRefEdit)
- m_pWeldRefEdit->GrabFocus();
+ if (m_pRefEdit)
+ m_pRefEdit->GrabFocus();
m_pDlg->RefInputDone(true);
return true;
}
@@ -402,88 +337,22 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
{
if ( CanInputDone( bForced ) )
{
- if (m_bAccInserted) // disable accelerator
- {
- Application::RemoveAccel( m_pAccel.get() );
- m_bAccInserted = false;
- }
-
if (m_pDialog)
{
// Adjust window title
m_pDialog->set_title(m_sOldDialogText);
- if (m_pWeldRefEdit)
- m_pWeldRefEdit->SetActivateHdl(Link<weld::Widget&, bool>());
+ if (m_pRefEdit)
+ m_pRefEdit->SetActivateHdl(Link<weld::Widget&, bool>());
// set button image
- if (m_pWeldRefBtn)
- {
- m_pWeldRefBtn->SetActivateHdl(Link<weld::Widget&, bool>());
- m_pWeldRefBtn->SetStartImage();
- }
-
- m_pDialog->undo_collapse();
-
- m_pWeldRefEdit = nullptr;
- m_pWeldRefBtn = nullptr;
- }
-
- if (m_pWindow)
- {
- //get rid of all this junk when we can
- if (!m_bOldDlgLayoutEnabled)
- {
- m_pWindow->SetOutputSizePixel(m_aOldDialogSize);
-
- // restore the parent of the edit field
- m_pRefEdit->SetParent(m_pOldEditParent);
-
- // the window is at the old size again
- m_pWindow->SetOutputSizePixel(m_aOldDialogSize);
-
- // set button parent
- if( m_pRefBtn )
- {
- m_pRefBtn->SetParent(m_pWindow);
- }
- }
-
- if (!m_bOldEditParentLayoutEnabled)
+ if (m_pRefBtn)
{
- // set pEditCell to old position
- m_pRefEdit->SetPosSizePixel(m_aOldEditPos, m_aOldEditSize);
-
- // set button position
- if( m_pRefBtn )
- {
- m_pRefBtn->SetPosPixel( m_aOldButtonPos );
- }
- }
-
- // Adjust window title
- m_pWindow->SetText(m_sOldDialogText);
-
- // set button image
- if( m_pRefBtn )
+ m_pRefBtn->SetActivateHdl(Link<weld::Widget&, bool>());
m_pRefBtn->SetStartImage();
-
- // All others: Show();
- for (VclPtr<vcl::Window> const & pWindow : m_aHiddenWidgets)
- {
- pWindow->Show();
}
- m_aHiddenWidgets.clear();
- if (m_bOldDlgLayoutEnabled)
- {
- m_pRefEdit->set_width_request(m_nOldEditWidthReq);
- Dialog* pResizeDialog = m_pRefEdit->GetParentDialog();
- pResizeDialog->set_border_width(m_nOldBorderWidth);
- if (vcl::Window *pActionArea = pResizeDialog->get_action_area())
- pActionArea->Show();
- pResizeDialog->setOptimalLayoutSize();
- }
+ m_pDialog->undo_collapse();
m_pRefEdit = nullptr;
m_pRefBtn = nullptr;
@@ -491,31 +360,6 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
}
}
-typedef std::set<VclPtr<vcl::Window> > winset;
-
-namespace
-{
- void hideUnless(const vcl::Window *pTop, const winset& rVisibleWidgets,
- std::vector<VclPtr<vcl::Window> > &rWasVisibleWidgets)
- {
- for (vcl::Window* pChild = pTop->GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
- {
- if (!pChild->IsVisible())
- continue;
- if (rVisibleWidgets.find(pChild) == rVisibleWidgets.end())
- {
- rWasVisibleWidgets.emplace_back(pChild);
- pChild->Hide();
- }
- else if (isContainerWindow(pChild))
- {
- hideUnless(pChild, rVisibleWidgets, rWasVisibleWidgets);
- }
- }
- }
-}
-
void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton )
{
if (!m_pRefEdit)
@@ -523,153 +367,9 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
m_pRefEdit = pEdit;
m_pRefBtn = pButton;
- m_bOldDlgLayoutEnabled = isLayoutEnabled(m_pWindow);
- m_aOldEditSize = m_pRefEdit->GetSizePixel();
- m_nOldEditWidthReq = m_pRefEdit->get_width_request();
- m_pOldEditParent = m_pRefEdit->GetParent();
- m_bOldEditParentLayoutEnabled = isContainerWindow(m_pOldEditParent);
-
- //get rid of all the !mbOldDlgLayoutEnabled and
- //mbOldEditParentLayoutEnabled junk when we can after the last user of
- //this is widget-layout-ified
- if (!m_bOldEditParentLayoutEnabled)
- {
- // Save current state
- m_aOldDialogSize = m_pWindow->GetOutputSizePixel();
- m_aOldEditPos = m_pRefEdit->GetPosPixel();
- if (m_pRefBtn)
- m_aOldButtonPos = m_pRefBtn->GetPosPixel();
- }
-
- if (!m_bOldDlgLayoutEnabled)
- {
- m_pRefEdit->SetParent(m_pWindow);
- if(m_pRefBtn)
- m_pRefBtn->SetParent(m_pWindow);
- }
-
- // Save and adjust window title
- m_sOldDialogText = m_pWindow->GetText();
- if (vcl::Window *pLabel = m_pRefEdit->GetLabelWidgetForShrinkMode())
- {
- const OUString sLabel = pLabel->GetText();
- if (!sLabel.isEmpty())
- {
- const OUString sNewDialogText = m_sOldDialogText + ": " + comphelper::string::stripEnd(sLabel, ':');
- m_pWindow->SetText( MnemonicGenerator::EraseAllMnemonicChars( sNewDialogText ) );
- }
- }
-
- Dialog* pResizeDialog = nullptr;
-
- if (!m_bOldDlgLayoutEnabled)
- {
- for (vcl::Window* pChild = m_pWindow->GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
- {
- vcl::Window *pWin = pChild->GetWindow(GetWindowType::Client);
- if (pWin == static_cast<vcl::Window*>(m_pRefEdit) || pWin == static_cast<vcl::Window*>(m_pRefBtn))
- continue; // do nothing
- else if (pWin->IsVisible())
- {
- m_aHiddenWidgets.emplace_back(pChild);
- pChild->Hide();
- }
- }
- }
- else
- {
- //We want just pRefBtn and pRefEdit to be shown
- //mark widgets we want to be visible, starting with pRefEdit
- //and all its direct parents.
- winset aVisibleWidgets;
- pResizeDialog = m_pRefEdit->GetParentDialog();
- vcl::Window *pContentArea = pResizeDialog->get_content_area();
- for (vcl::Window *pCandidate = m_pRefEdit;
- pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible());
- pCandidate = pCandidate->GetWindow(GetWindowType::RealParent))
- {
- aVisibleWidgets.insert(pCandidate);
- }
- //same again with pRefBtn, except stop if there's a
- //shared parent in the existing widgets
- for (vcl::Window *pCandidate = m_pRefBtn;
- pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible());
- pCandidate = pCandidate->GetWindow(GetWindowType::RealParent))
- {
- if (aVisibleWidgets.insert(pCandidate).second)
- break;
- }
-
- //hide everything except the aVisibleWidgets
- hideUnless(pContentArea, aVisibleWidgets, m_aHiddenWidgets);
- }
-
- if (!m_bOldDlgLayoutEnabled)
- {
- // move and adapt edit field
- Size aNewDlgSize(m_aOldDialogSize.Width(), m_aOldEditSize.Height());
- Size aNewEditSize(aNewDlgSize);
- long nOffset = 0;
- if (m_pRefBtn)
- {
- aNewEditSize.AdjustWidth( -(m_pRefBtn->GetSizePixel().Width()) );
- aNewEditSize.AdjustWidth( -(m_aOldButtonPos.X() - (m_aOldEditPos.X()+m_aOldEditSize.Width())) );
-
- long nHeight = m_pRefBtn->GetSizePixel().Height();
- if ( nHeight > m_aOldEditSize.Height() )
- {
- aNewDlgSize.setHeight( nHeight );
- nOffset = (nHeight-m_aOldEditSize.Height()) / 2;
- }
- aNewEditSize.AdjustWidth( -nOffset );
- }
- m_pRefEdit->SetPosSizePixel(Point(nOffset, nOffset), aNewEditSize);
-
- // set button position
- if( m_pRefBtn )
- m_pRefBtn->SetPosPixel( Point( m_aOldDialogSize.Width() - m_pRefBtn->GetSizePixel().Width(), 0 ) );
-
- // shrink window
- m_pWindow->SetOutputSizePixel(aNewDlgSize);
- }
-
- // set button image
- if( m_pRefBtn )
- m_pRefBtn->SetEndImage();
-
- if (!m_pAccel)
- {
- m_pAccel.reset( new Accelerator );
- m_pAccel->InsertItem( 1, vcl::KeyCode( KEY_RETURN ) );
- m_pAccel->InsertItem( 2, vcl::KeyCode( KEY_ESCAPE ) );
- m_pAccel->SetSelectHdl( LINK( this, ScFormulaReferenceHelper, AccelSelectHdl ) );
- }
- Application::InsertAccel( m_pAccel.get() );
- m_bAccInserted = true;
-
- if (m_bOldDlgLayoutEnabled)
- {
- m_pRefEdit->set_width_request(m_aOldEditSize.Width());
- m_nOldBorderWidth = pResizeDialog->get_border_width();
- pResizeDialog->set_border_width(0);
- if (vcl::Window *pActionArea = pResizeDialog->get_action_area())
- pActionArea->Hide();
- pResizeDialog->setOptimalLayoutSize();
- }
- }
-}
-
-void ScFormulaReferenceHelper::RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton )
-{
- if (!m_pWeldRefEdit)
- {
- m_pWeldRefEdit = pEdit;
- m_pWeldRefBtn = pButton;
-
// Save and adjust window title
m_sOldDialogText = m_pDialog->get_title();
- if (weld::Label *pLabel = m_pWeldRefEdit->GetLabelWidgetForShrinkMode())
+ if (weld::Label *pLabel = m_pRefEdit->GetLabelWidgetForShrinkMode())
{
const OUString sLabel = pLabel->get_label();
if (!sLabel.isEmpty())
@@ -685,9 +385,9 @@ void ScFormulaReferenceHelper::RefInputStart( formula::WeldRefEdit* pEdit, formu
if (pButton)
pButton->SetEndImage();
- m_pWeldRefEdit->SetActivateHdl(LINK(this, ScFormulaReferenceHelper, ActivateHdl));
- if (m_pWeldRefBtn)
- m_pWeldRefBtn->SetActivateHdl(LINK(this, ScFormulaReferenceHelper, ActivateHdl));
+ m_pRefEdit->SetActivateHdl(LINK(this, ScFormulaReferenceHelper, ActivateHdl));
+ if (m_pRefBtn)
+ m_pRefBtn->SetActivateHdl(LINK(this, ScFormulaReferenceHelper, ActivateHdl));
}
}
@@ -711,26 +411,6 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula
}
}
-void ScFormulaReferenceHelper::ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton )
-{
- if( pEdit )
- {
- if( m_pWeldRefEdit == pEdit ) // is this the active ref edit field?
- {
- m_pWeldRefEdit->GrabFocus(); // before RefInputDone()
- m_pDlg->RefInputDone( true ); // finish ref input
- }
- else
- {
- m_pDlg->RefInputDone( true ); // another active ref edit?
- m_pDlg->RefInputStart( pEdit, pButton ); // start ref input
- // pRefEdit might differ from pEdit after RefInputStart() (i.e. ScFormulaDlg)
- if( m_pWeldRefEdit )
- m_pWeldRefEdit->GrabFocus();
- }
- }
-}
-
void ScFormulaReferenceHelper::DoClose( sal_uInt16 nId )
{
SfxApplication* pSfxApp = SfxGetpApp();
@@ -867,18 +547,6 @@ static void lcl_HideAllReferences()
}
}
-ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ):
- m_rWindow( &rWindow ),
- m_pController( nullptr ),
- m_bInRefMode( false ),
- m_aHelper(this,pB),
- m_pMyBindings( pB )
-{
- m_aHelper.SetWindow(m_rWindow.get());
-
- if( bBindRef ) EnterRefMode();
-}
-
ScRefHandler::ScRefHandler(SfxDialogController& rController, SfxBindings* pB, bool bBindRef)
: m_pController(&rController)
, m_bInRefMode(false)
@@ -947,7 +615,6 @@ ScRefHandler::~ScRefHandler()
void ScRefHandler::disposeRefHandler()
{
- m_rWindow.clear();
m_pController = nullptr;
LeaveRefMode();
m_aHelper.dispose();
@@ -1013,9 +680,7 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be
bool ScRefHandler::IsRefInputMode() const
{
- if (m_pController)
- return m_pController->getDialog()->get_visible();
- return m_rWindow->IsVisible(); // references can only be input to visible windows
+ return m_pController->getDialog()->get_visible();
}
bool ScRefHandler::DoClose( sal_uInt16 nId )
@@ -1054,21 +719,11 @@ void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p
m_aHelper.RefInputStart( pEdit, pButton );
}
-void ScRefHandler::RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton )
-{
- m_aHelper.RefInputStart( pEdit, pButton );
-}
-
void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton )
{
m_aHelper.ToggleCollapsed( pEdit, pButton );
}
-void ScRefHandler::ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton )
-{
- m_aHelper.ToggleCollapsed( pEdit, pButton );
-}
-
bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, const ScDocument* pDoc )
{
return m_aHelper.ParseWithNames( rRanges, rStr, pDoc );
@@ -1089,11 +744,6 @@ void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit )
m_aHelper.ReleaseFocus( pEdit );
}
-void ScRefHandler::ReleaseFocus( formula::WeldRefEdit* pEdit )
-{
- m_aHelper.ReleaseFocus( pEdit );
-}
-
void ScRefHandler::RefInputDone( bool bForced )
{
m_aHelper.RefInputDone( bForced );
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 6de7b6941cdc..23a5fe9c4495 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -67,12 +67,12 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
, bDlgLostFocus(false)
, m_pEdActive(nullptr)
, m_xLbRange(m_xBuilder->weld_tree_view("range"))
- , m_xEdAssign(new formula::WeldRefEdit(m_xBuilder->weld_entry("edassign")))
- , m_xRbAssign(new formula::WeldRefButton(m_xBuilder->weld_button("rbassign")))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("edassign")))
+ , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("rbassign")))
, m_xBtnColHead(m_xBuilder->weld_radio_button("colhead"))
, m_xBtnRowHead(m_xBuilder->weld_radio_button("rowhead"))
- , m_xEdAssign2(new formula::WeldRefEdit(m_xBuilder->weld_entry("edassign2")))
- , m_xRbAssign2(new formula::WeldRefButton(m_xBuilder->weld_button("rbassign2")))
+ , m_xEdAssign2(new formula::RefEdit(m_xBuilder->weld_entry("edassign2")))
+ , m_xRbAssign2(new formula::RefButton(m_xBuilder->weld_button("rbassign2")))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
, m_xBtnAdd(m_xBuilder->weld_button("add"))
@@ -108,11 +108,11 @@ void ScColRowNameRangesDlg::Init()
m_xBtnRowHead->connect_clicked ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
m_xEdAssign2->SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
- Link<formula::WeldRefEdit&,void> aEditLink = LINK( this, ScColRowNameRangesDlg, GetEditFocusHdl );
+ Link<formula::RefEdit&,void> aEditLink = LINK( this, ScColRowNameRangesDlg, GetEditFocusHdl );
m_xEdAssign->SetGetFocusHdl( aEditLink );
m_xEdAssign2->SetGetFocusHdl( aEditLink );
- Link<formula::WeldRefButton&,void> aButtonLink = LINK( this, ScColRowNameRangesDlg, GetButtonFocusHdl );
+ Link<formula::RefButton&,void> aButtonLink = LINK( this, ScColRowNameRangesDlg, GetButtonFocusHdl );
m_xRbAssign->SetGetFocusHdl( aButtonLink );
m_xRbAssign2->SetGetFocusHdl( aButtonLink );
@@ -691,7 +691,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, weld::TreeView&, void)
}
// handler called when the label range has changed
-IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl, formula::RefEdit&, void)
{
OUString aNewArea( m_xEdAssign->GetText() );
bool bValid = false;
@@ -724,7 +724,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl, formula::WeldRefEdit
}
// handler called when the data range has changed
-IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, formula::RefEdit&, void)
{
OUString aNewData( m_xEdAssign2->GetText() );
if ( !aNewData.isEmpty() )
@@ -780,7 +780,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl, weld::Button&, void)
}
}
-IMPL_LINK( ScColRowNameRangesDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void )
+IMPL_LINK( ScColRowNameRangesDlg, GetEditFocusHdl, formula::RefEdit&, rCtrl, void )
{
if (&rCtrl == m_xEdAssign.get())
m_pEdActive = m_xEdAssign.get();
@@ -793,7 +793,7 @@ IMPL_LINK( ScColRowNameRangesDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl,
m_pEdActive->SelectAll();
}
-IMPL_LINK( ScColRowNameRangesDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void )
+IMPL_LINK( ScColRowNameRangesDlg, GetButtonFocusHdl, formula::RefButton&, rCtrl, void )
{
if (&rCtrl == m_xRbAssign.get())
m_pEdActive = m_xEdAssign.get();
@@ -806,12 +806,12 @@ IMPL_LINK( ScColRowNameRangesDlg, GetButtonFocusHdl, formula::WeldRefButton&, rC
m_pEdActive->SelectAll();
}
-IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseEditFocusHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseEditFocusHdl, formula::RefEdit&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseButtonFocusHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseButtonFocusHdl, formula::RefButton&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index b75201ce8f63..3976f18dd008 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -37,8 +37,8 @@ ScHighlightChgDlg::ScHighlightChgDlg(SfxBindings* pB, SfxChildWindow* pCW, weld:
, m_xCbAccept(m_xBuilder->weld_check_button("showaccepted"))
, m_xCbReject(m_xBuilder->weld_check_button("showrejected"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
- , m_xEdAssign(new formula::WeldRefEdit(m_xBuilder->weld_entry("range")))
- , m_xRbAssign(new formula::WeldRefButton(m_xBuilder->weld_button("rangeref")))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("range")))
+ , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("rangeref")))
, m_xBox(m_xBuilder->weld_container("box"))
, m_xFilterCtr(new SvxTPFilter(m_xBox.get()))
{
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 16d2799ef104..a5380399c49e 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -103,7 +103,7 @@ IMPL_LINK(ScSolverSuccessDialog, ClickHdl, weld::Button&, rBtn, void)
}
ScCursorRefEdit::ScCursorRefEdit(std::unique_ptr<weld::Entry> xControl)
- : formula::WeldRefEdit(std::move(xControl))
+ : formula::RefEdit(std::move(xControl))
{
xEntry->connect_key_press(Link<const KeyEvent&, bool>()); //acknowledge we first remove the old one
xEntry->connect_key_press(LINK(this, ScCursorRefEdit, KeyInputHdl));
@@ -128,7 +128,7 @@ IMPL_LINK(ScCursorRefEdit, KeyInputHdl, const KeyEvent&, rKEvt, bool)
maCursorDownLink.Call( *this );
return true;
}
- return formula::WeldRefEdit::KeyInput(rKEvt);
+ return formula::RefEdit::KeyInput(rKEvt);
}
ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue,
@@ -163,42 +163,42 @@ ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo
, nScrollPos(0)
, mpEdActive(nullptr)
, m_xFtObjectiveCell(m_xBuilder->weld_label("targetlabel"))
- , m_xEdObjectiveCell(new formula::WeldRefEdit(m_xBuilder->weld_entry("targetedit")))
- , m_xRBObjectiveCell(new formula::WeldRefButton(m_xBuilder->weld_button("targetbutton")))
+ , m_xEdObjectiveCell(new formula::RefEdit(m_xBuilder->weld_entry("targetedit")))
+ , m_xRBObjectiveCell(new formula::RefButton(m_xBuilder->weld_button("targetbutton")))
, m_xRbMax(m_xBuilder->weld_radio_button("max"))
, m_xRbMin(m_xBuilder->weld_radio_button("min"))
, m_xRbValue(m_xBuilder->weld_radio_button("value"))
- , m_xEdTargetValue(new formula::WeldRefEdit(m_xBuilder->weld_entry("valueedit")))
- , m_xRBTargetValue(new formula::WeldRefButton(m_xBuilder->weld_button("valuebutton")))
+ , m_xEdTargetValue(new formula::RefEdit(m_xBuilder->weld_entry("valueedit")))
+ , m_xRBTargetValue(new formula::RefButton(m_xBuilder->weld_button("valuebutton")))
, m_xFtVariableCells(m_xBuilder->weld_label("changelabel"))
- , m_xEdVariableCells(new formula::WeldRefEdit(m_xBuilder->weld_entry("changeedit")))
- , m_xRBVariableCells(new formula::WeldRefButton(m_xBuilder->weld_button("changebutton")))
+ , m_xEdVariableCells(new formula::RefEdit(m_xBuilder->weld_entry("changeedit")))
+ , m_xRBVariableCells(new formula::RefButton(m_xBuilder->weld_button("changebutton")))
, m_xFtCellRef(m_xBuilder->weld_label("cellreflabel"))
, m_xEdLeft1(new ScCursorRefEdit(m_xBuilder->weld_entry("ref1edit")))
- , m_xRBLeft1(new formula::WeldRefButton(m_xBuilder->weld_button("ref1button")))
+ , m_xRBLeft1(new formula::RefButton(m_xBuilder->weld_button("ref1button")))
, m_xFtOperator(m_xBuilder->weld_label("oplabel"))
, m_xLbOp1(m_xBuilder->weld_combo_box("op1list"))
, m_xFtConstraint(m_xBuilder->weld_label("constraintlabel"))
, m_xEdRight1(new ScCursorRefEdit(m_xBuilder->weld_entry("val1edit")))
- , m_xRBRight1(new formula::WeldRefButton(m_xBuilder->weld_button("val1button")))
+ , m_xRBRight1(new formula::RefButton(m_xBuilder->weld_button("val1button")))
, m_xBtnDel1(m_xBuilder->weld_button("del1"))
, m_xEdLeft2(new ScCursorRefEdit(m_xBuilder->weld_entry("ref2edit")))
- , m_xRBLeft2(new formula::WeldRefButton(m_xBuilder->weld_button("ref2button")))
+ , m_xRBLeft2(new formula::RefButton(m_xBuilder->weld_button("ref2button")))
, m_xLbOp2(m_xBuilder->weld_combo_box("op2list"))
, m_xEdRight2(new ScCursorRefEdit(m_xBuilder->weld_entry("val2edit")))
- , m_xRBRight2(new formula::WeldRefButton(m_xBuilder->weld_button("val2button")))
+ , m_xRBRight2(new formula::RefButton(m_xBuilder->weld_button("val2button")))
, m_xBtnDel2(m_xBuilder->weld_button("del2"))
, m_xEdLeft3(new ScCursorRefEdit(m_xBuilder->weld_entry("ref3edit")))
- , m_xRBLeft3(new formula::WeldRefButton(m_xBuilder->weld_button("ref3button")))
+ , m_xRBLeft3(new formula::RefButton(m_xBuilder->weld_button("ref3button")))
, m_xLbOp3(m_xBuilder->weld_combo_box("op3list"))
, m_xEdRight3(new ScCursorRefEdit(m_xBuilder->weld_entry("val3edit")))
- , m_xRBRight3(new formula::WeldRefButton(m_xBuilder->weld_button("val3button")))
+ , m_xRBRight3(new formula::RefButton(m_xBuilder->weld_button("val3button")))
, m_xBtnDel3(m_xBuilder->weld_button("del3"))
, m_xEdLeft4(new ScCursorRefEdit(m_xBuilder->weld_entry("ref4edit")))
- , m_xRBLeft4(new formula::WeldRefButton(m_xBuilder->weld_button("ref4button")))
+ , m_xRBLeft4(new formula::RefButton(m_xBuilder->weld_button("ref4button")))
, m_xLbOp4(m_xBuilder->weld_combo_box("op4list"))
, m_xEdRight4(new ScCursorRefEdit(m_xBuilder->weld_entry("val4edit")))
- , m_xRBRight4(new formula::WeldRefButton(m_xBuilder->weld_button("val4button")))
+ , m_xRBRight4(new formula::RefButton(m_xBuilder->weld_button("val4button")))
, m_xBtnDel4(m_xBuilder->weld_button("del4"))
, m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar"))
, m_xBtnOpt(m_xBuilder->weld_button("options"))
@@ -276,8 +276,8 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
m_xBtnCancel->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
m_xBtnSolve->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
- Link<formula::WeldRefEdit&,void> aEditLink = LINK( this, ScOptSolverDlg, GetEditFocusHdl );
- Link<formula::WeldRefButton&,void> aButtonLink = LINK( this, ScOptSolverDlg, GetButtonFocusHdl );
+ Link<formula::RefEdit&,void> aEditLink = LINK( this, ScOptSolverDlg, GetEditFocusHdl );
+ Link<formula::RefButton&,void> aButtonLink = LINK( this, ScOptSolverDlg, GetButtonFocusHdl );
m_xEdObjectiveCell->SetGetFocusHdl( aEditLink );
m_xRBObjectiveCell->SetGetFocusHdl( aButtonLink );
m_xEdTargetValue->SetGetFocusHdl( aEditLink );
@@ -313,7 +313,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
Link<ScCursorRefEdit&,void> aCursorUp = LINK( this, ScOptSolverDlg, CursorUpHdl );
Link<ScCursorRefEdit&,void> aCursorDown = LINK( this, ScOptSolverDlg, CursorDownHdl );
- Link<formula::WeldRefEdit&,void> aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl );
+ Link<formula::RefEdit&,void> aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl );
for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
{
mpLeftEdit[nRow]->SetCursorLinks( aCursorUp, aCursorDown );
@@ -544,9 +544,9 @@ IMPL_LINK(ScOptSolverDlg, BtnHdl, weld::Button&, rBtn, void)
}
}
-IMPL_LINK( ScOptSolverDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void )
+IMPL_LINK( ScOptSolverDlg, GetEditFocusHdl, formula::RefEdit&, rCtrl, void )
{
- formula::WeldRefEdit* pEdit = nullptr;
+ formula::RefEdit* pEdit = nullptr;
mpEdActive = nullptr;
if( &rCtrl == m_xEdObjectiveCell.get() )
@@ -567,9 +567,9 @@ IMPL_LINK( ScOptSolverDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void )
pEdit->SelectAll();
}
-IMPL_LINK( ScOptSolverDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void )
+IMPL_LINK( ScOptSolverDlg, GetButtonFocusHdl, formula::RefButton&, rCtrl, void )
{
- formula::WeldRefEdit* pEdit = nullptr;
+ formula::RefEdit* pEdit = nullptr;
mpEdActive = nullptr;
if( &rCtrl == m_xRBObjectiveCell.get() )
@@ -605,12 +605,12 @@ IMPL_LINK(ScOptSolverDlg, GetFocusHdl, weld::Widget&, rCtrl, void)
}
}
-IMPL_LINK_NOARG(ScOptSolverDlg, LoseEditFocusHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScOptSolverDlg, LoseEditFocusHdl, formula::RefEdit&, void)
{
mbDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG(ScOptSolverDlg, LoseButtonFocusHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScOptSolverDlg, LoseButtonFocusHdl, formula::RefButton&, void)
{
mbDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
@@ -641,7 +641,7 @@ IMPL_LINK(ScOptSolverDlg, DelBtnHdl, weld::Button&, rBtn, void)
}
}
-IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl, formula::RefEdit&, void)
{
// modify handler for the target edit:
// select "Value of" if something is input into the edit
@@ -649,7 +649,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl, formula::WeldRefEdit&, void)
m_xRbValue->set_active(true);
}
-IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl, formula::RefEdit&, void)
{
// modify handler for the condition edits, just to enable/disable "delete" buttons
ReadConditions();
@@ -687,7 +687,7 @@ IMPL_LINK( ScOptSolverDlg, CursorUpHdl, ScCursorRefEdit&, rEdit, void )
}
else
{
- formula::WeldRefEdit* pFocus = nullptr;
+ formula::RefEdit* pFocus = nullptr;
for ( sal_uInt16 nRow = 1; nRow < EDIT_ROW_COUNT; ++nRow ) // second row or below: move focus
{
if ( &rEdit == mpLeftEdit[nRow] )
@@ -716,7 +716,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void )
}
else
{
- formula::WeldRefEdit* pFocus = nullptr;
+ formula::RefEdit* pFocus = nullptr;
for ( sal_uInt16 nRow = 0; nRow+1 < EDIT_ROW_COUNT; ++nRow ) // before last row: move focus
{
if ( &rEdit == mpLeftEdit[nRow] )
@@ -732,7 +732,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void )
}
}
-void ScOptSolverDlg::ShowError( bool bCondition, formula::WeldRefEdit* pFocus )
+void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus )
{
OUString aMessage = bCondition ? maConditionError : maInputError;
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(),
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index c1d230314133..51511e815210 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -28,8 +28,8 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo
, bSingleCell(false)
, bMultiSelection(false)
, m_xFtAssign(m_xBuilder->weld_label("area"))
- , m_xEdAssign(new formula::WeldRefEdit(m_xBuilder->weld_entry("assign")))
- , m_xRbAssign(new formula::WeldRefButton(m_xBuilder->weld_button("assignref")))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("assign")))
+ , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("assignref")))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
{
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 55cfb6626dc0..551e781cbf8a 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -58,12 +58,12 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pP
, errMsgInvalidVal(ScResId(STR_INVALIDVAL))
, m_pEdActive(nullptr)
, m_xFtFormulaCell(m_xBuilder->weld_label("formulatext"))
- , m_xEdFormulaCell(new formula::WeldRefEdit(m_xBuilder->weld_entry("formulaedit")))
- , m_xRBFormulaCell(new formula::WeldRefButton(m_xBuilder->weld_button("formulabutton")))
+ , m_xEdFormulaCell(new formula::RefEdit(m_xBuilder->weld_entry("formulaedit")))
+ , m_xRBFormulaCell(new formula::RefButton(m_xBuilder->weld_button("formulabutton")))
, m_xEdTargetVal(m_xBuilder->weld_entry("target"))
, m_xFtVariableCell(m_xBuilder->weld_label("vartext"))
- , m_xEdVariableCell(new formula::WeldRefEdit(m_xBuilder->weld_entry("varedit")))
- , m_xRBVariableCell(new formula::WeldRefButton(m_xBuilder->weld_button("varbutton")))
+ , m_xEdVariableCell(new formula::RefEdit(m_xBuilder->weld_entry("varedit")))
+ , m_xRBVariableCell(new formula::RefButton(m_xBuilder->weld_button("varbutton")))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
{
@@ -83,11 +83,11 @@ void ScSolverDlg::Init()
m_xBtnOk->connect_clicked( LINK( this, ScSolverDlg, BtnHdl ) );
m_xBtnCancel->connect_clicked( LINK( this, ScSolverDlg, BtnHdl ) );
- Link<formula::WeldRefEdit&,void> aEditLink = LINK( this, ScSolverDlg, GetEditFocusHdl );
+ Link<formula::RefEdit&,void> aEditLink = LINK( this, ScSolverDlg, GetEditFocusHdl );
m_xEdFormulaCell->SetGetFocusHdl( aEditLink );
m_xEdVariableCell->SetGetFocusHdl( aEditLink );
- Link<formula::WeldRefButton&,void> aButtonLink = LINK( this, ScSolverDlg, GetButtonFocusHdl );
+ Link<formula::RefButton&,void> aButtonLink = LINK( this, ScSolverDlg, GetButtonFocusHdl );
m_xRBFormulaCell->SetGetFocusHdl( aButtonLink );
m_xRBVariableCell->SetGetFocusHdl( aButtonLink );
@@ -255,7 +255,7 @@ IMPL_LINK(ScSolverDlg, BtnHdl, weld::Button&, rBtn, void)
}
}
-IMPL_LINK(ScSolverDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void)
+IMPL_LINK(ScSolverDlg, GetEditFocusHdl, formula::RefEdit&, rCtrl, void)
{
if (&rCtrl == m_xEdFormulaCell.get())
m_pEdActive = m_xEdFormulaCell.get();
@@ -272,7 +272,7 @@ IMPL_LINK_NOARG(ScSolverDlg, GetFocusHdl, weld::Widget&, void)
m_xEdTargetVal->select_region(0, -1);
}
-IMPL_LINK(ScSolverDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void)
+IMPL_LINK(ScSolverDlg, GetButtonFocusHdl, formula::RefButton&, rCtrl, void)
{
if (&rCtrl == m_xRBFormulaCell.get())
m_pEdActive = m_xEdFormulaCell.get();
@@ -283,12 +283,12 @@ IMPL_LINK(ScSolverDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void)
m_pEdActive->SelectAll();
}
-IMPL_LINK_NOARG(ScSolverDlg, LoseEditFocusHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScSolverDlg, LoseEditFocusHdl, formula::RefEdit&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG(ScSolverDlg, LoseButtonFocusHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScSolverDlg, LoseButtonFocusHdl, formula::RefButton&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 740ee4611718..43a6b0497f44 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -49,14 +49,14 @@ ScTabOpDlg::ScTabOpDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pPare
, errMsgNoRowFormula(ScResId(STR_NOROWFORMULA))
, m_pEdActive(nullptr)
, m_xFtFormulaRange(m_xBuilder->weld_label("formulasft"))
- , m_xEdFormulaRange(new formula::WeldRefEdit(m_xBuilder->weld_entry("formulas")))
- , m_xRBFormulaRange(new formula::WeldRefButton(m_xBuilder->weld_button("formulasref")))
+ , m_xEdFormulaRange(new formula::RefEdit(m_xBuilder->weld_entry("formulas")))
+ , m_xRBFormulaRange(new formula::RefButton(m_xBuilder->weld_button("formulasref")))
, m_xFtRowCell(m_xBuilder->weld_label("rowft"))
- , m_xEdRowCell(new formula::WeldRefEdit(m_xBuilder->weld_entry("row")))
- , m_xRBRowCell(new formula::WeldRefButton(m_xBuilder->weld_button("rowref")))
+ , m_xEdRowCell(new formula::RefEdit(m_xBuilder->weld_entry("row")))
+ , m_xRBRowCell(new formula::RefButton(m_xBuilder->weld_button("rowref")))
, m_xFtColCell(m_xBuilder->weld_label("colft"))
- , m_xEdColCell(new formula::WeldRefEdit(m_xBuilder->weld_entry("col")))
- , m_xRBColCell(new formula::WeldRefButton(m_xBuilder->weld_button("colref")))
+ , m_xEdColCell(new formula::RefEdit(m_xBuilder->weld_entry("col")))
+ , m_xRBColCell(new formula::RefButton(m_xBuilder->weld_button("colref")))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
{
@@ -81,12 +81,12 @@ void ScTabOpDlg::Init()
m_xBtnOk->connect_clicked( LINK( this, ScTabOpDlg, BtnHdl ) );
m_xBtnCancel->connect_clicked( LINK( this, ScTabOpDlg, BtnHdl ) );
- Link<formula::WeldRefEdit&,void> aEditLink = LINK( this, ScTabOpDlg, GetEditFocusHdl );
+ Link<formula::RefEdit&,void> aEditLink = LINK( this, ScTabOpDlg, GetEditFocusHdl );
m_xEdFormulaRange->SetGetFocusHdl( aEditLink );
m_xEdRowCell->SetGetFocusHdl( aEditLink );
m_xEdColCell->SetGetFocusHdl( aEditLink );
- Link<formula::WeldRefButton&,void> aButtonLink = LINK( this, ScTabOpDlg, GetButtonFocusHdl );
+ Link<formula::RefButton&,void> aButtonLink = LINK( this, ScTabOpDlg, GetButtonFocusHdl );
m_xRBFormulaRange->SetGetFocusHdl( aButtonLink );
m_xRBRowCell->SetGetFocusHdl( aButtonLink );
m_xRBColCell->SetGetFocusHdl( aButtonLink );
@@ -162,7 +162,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
void ScTabOpDlg::RaiseError( ScTabOpErr eError )
{
const OUString* pMsg = &errMsgNoFormula;
- formula::WeldRefEdit* pEd = m_xEdFormulaRange.get();
+ formula::RefEdit* pEd = m_xEdFormulaRange.get();
switch ( eError )
{
@@ -303,7 +303,7 @@ IMPL_LINK(ScTabOpDlg, BtnHdl, weld::Button&, rBtn, void)
response(RET_CANCEL);
}
-IMPL_LINK( ScTabOpDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void )
+IMPL_LINK( ScTabOpDlg, GetEditFocusHdl, formula::RefEdit&, rCtrl, void )
{
if (&rCtrl == m_xEdFormulaRange.get())
m_pEdActive = m_xEdFormulaRange.get();
@@ -318,7 +318,7 @@ IMPL_LINK( ScTabOpDlg, GetEditFocusHdl, formula::WeldRefEdit&, rCtrl, void )
m_pEdActive->SelectAll();
}
-IMPL_LINK( ScTabOpDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void )
+IMPL_LINK( ScTabOpDlg, GetButtonFocusHdl, formula::RefButton&, rCtrl, void )
{
if (&rCtrl == m_xRBFormulaRange.get())
m_pEdActive = m_xEdFormulaRange.get();
@@ -333,12 +333,12 @@ IMPL_LINK( ScTabOpDlg, GetButtonFocusHdl, formula::WeldRefButton&, rCtrl, void )
m_pEdActive->SelectAll();
}
-IMPL_LINK_NOARG(ScTabOpDlg, LoseEditFocusHdl, formula::WeldRefEdit&, void)
+IMPL_LINK_NOARG(ScTabOpDlg, LoseEditFocusHdl, formula::RefEdit&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG(ScTabOpDlg, LoseButtonFocusHdl, formula::WeldRefButton&, void)
+IMPL_LINK_NOARG(ScTabOpDlg, LoseButtonFocusHdl, formula::RefButton&, void)
{
bDlgLostFocus = !m_xDialog->has_toplevel_focus();
}
generated by cgit (git 2.34.1) at 2025-02-09 08:56:47 +0000