diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index d537109c8846..7c6b99249438 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -494,7 +494,7 @@ IMPL_LINK_NOARG(MacroChooser, BasicSelectHdl, weld::ItemView&, void) CheckButtons(); } -IMPL_LINK_NOARG(MacroChooser, EditModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(MacroChooser, EditModifyHdl, weld::TextWidget&, void) { // select the module in which the macro is put at "new", // if BasicManager or Lib is selecting diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index b90be18dc24d..b4badb07bfc1 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -60,7 +60,7 @@ private: DECL_LINK(MacroSelectHdl, weld::ItemView&, void); DECL_LINK(MacroDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(BasicSelectHdl, weld::ItemView&, void); - DECL_LINK(EditModifyHdl, weld::Entry&, void); + DECL_LINK(EditModifyHdl, weld::TextWidget&, void); DECL_LINK(ContextMenuHdl, const CommandEvent&, bool); DECL_LINK(ButtonHdl, weld::Button&, void); diff --git a/basctl/source/basicide/objectbrowsersearch.cxx b/basctl/source/basicide/objectbrowsersearch.cxx index 6efb2df034da..5d735eff4b3f 100644 --- a/basctl/source/basicide/objectbrowsersearch.cxx +++ b/basctl/source/basicide/objectbrowsersearch.cxx @@ -42,7 +42,7 @@ void ObjectBrowserSearch::Initialize() } } -IMPL_STATIC_LINK(basctl::ObjectBrowserSearch, OnFilterChanged, weld::Entry&, /*rBox*/, void) +IMPL_STATIC_LINK(basctl::ObjectBrowserSearch, OnFilterChanged, weld::TextWidget&, /*rBox*/, void) { // STUB } diff --git a/basctl/source/inc/objectbrowsersearch.hxx b/basctl/source/inc/objectbrowsersearch.hxx index e8d64e443dc9..2d2e6f14f7df 100644 --- a/basctl/source/inc/objectbrowsersearch.hxx +++ b/basctl/source/inc/objectbrowsersearch.hxx @@ -27,7 +27,7 @@ public: private: // Event handlers for the UI widgets - DECL_STATIC_LINK(ObjectBrowserSearch, OnFilterChanged, weld::Entry&, void); + DECL_STATIC_LINK(ObjectBrowserSearch, OnFilterChanged, weld::TextWidget&, void); DECL_STATIC_LINK(ObjectBrowserSearch, OnClearSearchClicked, weld::Button&, void); DECL_STATIC_LINK(ObjectBrowserSearch, DebounceTimerHandler, Timer*, void); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index d04094b10480..f7f04f29ee51 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -109,7 +109,7 @@ public: void SetGetFocusHdl(const Link& rLink) { m_aFocusInHdl = rLink; } private: - DECL_LINK(NameEdited, weld::Entry&, void); + DECL_LINK(NameEdited, weld::TextWidget&, void); DECL_LINK(NameFocusIn, weld::Widget&, void); DECL_LINK(MousePressHdl, const MouseEvent&, bool); @@ -133,7 +133,7 @@ SeriesHeaderEdit::SeriesHeaderEdit(std::unique_ptr xControl, sal_In m_xControl->set_buildable_name(m_xControl->get_buildable_name() + OUString::number(nHeader)); } -IMPL_LINK_NOARG(SeriesHeaderEdit, NameEdited, weld::Entry&, void) +IMPL_LINK_NOARG(SeriesHeaderEdit, NameEdited, weld::TextWidget&, void) { m_aModifyHdl.Call(*this); } diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 910a0b54482c..bff00279ba28 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -455,7 +455,7 @@ IMPL_LINK(ErrorBarResources, ChooseRange, weld::Button&, rButton, void) aUIString, *this ); } -IMPL_LINK( ErrorBarResources, RangeChanged, weld::Entry&, rEdit, void ) +IMPL_LINK(ErrorBarResources, RangeChanged, weld::TextWidget&, rEdit, void) { if( &rEdit == m_xEdRangePositive.get() ) { @@ -467,7 +467,7 @@ IMPL_LINK( ErrorBarResources, RangeChanged, weld::Entry&, rEdit, void ) m_bRangeNegUnique = true; } - isRangeFieldContentValid( rEdit ); + isRangeFieldContentValid(dynamic_cast(rEdit)); } void ErrorBarResources::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 04ecb9073419..3e4ab0dd2719 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -49,7 +49,7 @@ TitleResources::TitleResources(weld::Builder& rBuilder, bool bShowSecondaryAxesT TitleResources::~TitleResources() {} -void TitleResources::connect_changed(const Link& rLink) +void TitleResources::connect_changed(const Link& rLink) { m_xEd_Main->connect_changed(rLink); m_xEd_Sub->connect_changed(rLink); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 8fd9939fdd0d..2206e89c7f1f 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -661,10 +661,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, weld::Button&, void) } } -IMPL_LINK(DataSourceTabPage, RangeModifiedHdl, weld::Entry&, rEdit, void) +IMPL_LINK(DataSourceTabPage, RangeModifiedHdl, weld::TextWidget&, rEdit, void) { // note: isValid sets the color of the edit field - if( isRangeFieldContentValid( rEdit )) + if (isRangeFieldContentValid(dynamic_cast(rEdit))) { setDirty(); updateModelFromControl( &rEdit ); @@ -723,7 +723,7 @@ void DataSourceTabPage::disposingRangeSelection() m_rDialogModel.getRangeSelectionHelper()->stopRangeListening( false ); } -bool DataSourceTabPage::updateModelFromControl(const weld::Entry* pField) +bool DataSourceTabPage::updateModelFromControl(const weld::TextWidget* pField) { if (!m_bIsDirty) return true; diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 0d308d1abe3d..0ecb3dffd2bc 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -83,7 +83,7 @@ private: DECL_LINK( CategoriesRangeButtonClickedHdl, weld::Button&, void ); DECL_LINK( AddButtonClickedHdl, weld::Button&, void ); DECL_LINK( RemoveButtonClickedHdl, weld::Button&, void ); - DECL_LINK( RangeModifiedHdl, weld::Entry&, void ); + DECL_LINK(RangeModifiedHdl, weld::TextWidget&, void); DECL_LINK( UpButtonClickedHdl, weld::Button&, void ); DECL_LINK( DownButtonClickedHdl, weld::Button&, void ); @@ -102,7 +102,7 @@ private: if the text from the field is a valid format to the internal data was valid */ - bool updateModelFromControl(const weld::Entry* pField = nullptr); + bool updateModelFromControl(const weld::TextWidget* pField = nullptr); /** @return , if the edit field contains a valid range entry. If no XCellRangesAccess can be obtained, is returned. diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index f7dc2ba6a303..7ea707974073 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -301,7 +301,7 @@ bool RangeChooserTabPage::isValid() return bIsValid; } -IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, weld::TextWidget&, void) { setDirty(); isValid(); @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::Toggleable ControlChangedHdl(*m_xED_Range); } -IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl, weld::TextWidget&, void) { setDirty(); if( isValid()) diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 99fcd363e36e..8e724f7ae611 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -67,10 +67,10 @@ private: void setDirty(); DECL_LINK( ChooseRangeHdl, weld::Button&, void ); - DECL_LINK( ControlChangedHdl, weld::Entry&, void ); + DECL_LINK(ControlChangedHdl, weld::TextWidget&, void); DECL_LINK( ControlChangedCheckBoxHdl, weld::Toggleable&, void ); DECL_LINK( ControlChangedRadioHdl, weld::Toggleable&, void ); - DECL_LINK( ControlEditedHdl, weld::Entry&, void ); + DECL_LINK(ControlEditedHdl, weld::TextWidget&, void); sal_Int32 m_nChangingControlCalls; bool m_bIsDirty; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index f43fca973622..4e4efcfe2c0c 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -137,7 +137,7 @@ IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, weld::Toggleable&, v ChangeHdl(nullptr); } -IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeEditHdl, weld::Entry&, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeEditHdl, weld::TextWidget&, void) { ChangeHdl(nullptr); } diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 2b594747847d..e9ab2cfa77eb 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -51,7 +52,7 @@ public: private: void commitToModel(); DECL_LINK( ChangeHdl, LinkParamNone*, void ); - DECL_LINK( ChangeEditHdl, weld::Entry&, void ); + DECL_LINK(ChangeEditHdl, weld::TextWidget&, void); DECL_LINK( ChangeCheckBoxHdl, weld::Toggleable&, void ); std::unique_ptr< TitleResources > m_xTitleResources; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 4fcd21226261..b52631dc4544 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -25,19 +25,23 @@ #include #include -namespace weld { class Builder; } -namespace weld { class Button; } -namespace weld { class CheckButton; } -namespace weld { class ComboBox; } -namespace weld { class DialogController; } -namespace weld { class Entry; } -namespace weld { class Frame; } -namespace weld { class Image; } -namespace weld { class Label; } -namespace weld { class MetricSpinButton; } -namespace weld { class RadioButton; } -namespace weld { class Toggleable; } -namespace weld { class Widget; } +namespace weld +{ +class Builder; +class Button; +class CheckButton; +class ComboBox; +class DialogController; +class Entry; +class Frame; +class Image; +class Label; +class MetricSpinButton; +class RadioButton; +class TextWidget; +class Toggleable; +class Widget; +} namespace chart { @@ -130,7 +134,7 @@ private: DECL_LINK( PosValueChanged, weld::MetricSpinButton&, void ); DECL_LINK( IndicatorChanged, weld::Toggleable&, void ); DECL_LINK( ChooseRange, weld::Button&, void ); - DECL_LINK( RangeChanged, weld::Entry&, void ); + DECL_LINK(RangeChanged, weld::TextWidget&, void); void UpdateControlStates(); void isRangeFieldContentValid(weld::Entry& rEdit); diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx index a7a2eba57277..094059a5cb44 100644 --- a/chart2/source/controller/inc/res_Titles.hxx +++ b/chart2/source/controller/inc/res_Titles.hxx @@ -24,14 +24,9 @@ template class Link; namespace weld { class Builder; -} -namespace weld -{ class Entry; -} -namespace weld -{ class Label; +class TextWidget; } namespace chart @@ -45,7 +40,7 @@ public: void writeToResources(const TitleDialogData& rInput); void readFromResources(TitleDialogData& rOutput); - void connect_changed(const Link& rLink); + void connect_changed(const Link& rLink); bool get_value_changed_from_saved() const; void save_value(); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 6a7ff5df12e2..b36d720e8382 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -396,7 +396,7 @@ void ChartElementsPanel::Initialize() mxLBLegendPosition->connect_changed(LINK(this, ChartElementsPanel, LegendPosHdl)); - Link aEditLink = LINK(this, ChartElementsPanel, EditHdl); + Link aEditLink = LINK(this, ChartElementsPanel, EditHdl); mxEditTitle->connect_changed(aEditLink); mxEditSubtitle->connect_changed(aEditLink); } @@ -625,7 +625,7 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, weld::Toggleable&, rCheckBox, void) updateData(); } -IMPL_LINK(ChartElementsPanel, EditHdl, weld::Entry&, rEdit, void) +IMPL_LINK(ChartElementsPanel, EditHdl, weld::TextWidget&, rEdit, void) { // title or subtitle? TitleHelper::eTitleType aTitleType = TitleHelper::MAIN_TITLE; diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 79a5814e810f..d15a15ad9459 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -111,7 +111,7 @@ private: void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); - DECL_LINK(EditHdl, weld::Entry&, void); + DECL_LINK(EditHdl, weld::TextWidget&, void); DECL_LINK(LegendPosHdl, weld::ComboBox&, void); }; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 1eebec779d97..0afdfca1327c 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1254,7 +1254,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ImplUpdateDataHdl, Timer*, void) SelectHdl(m_xGroupLBox->get_widget()); } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SearchUpdateHdl, weld::TextWidget&, void) { m_aUpdateDataTimer.Start(); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 54148910968b..08e0da1be2d9 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1696,7 +1696,7 @@ IMPL_LINK_NOARG(SvxConfigPage, ImplUpdateDataHdl, Timer*, void) SelectFunctionHdl(m_xFunctions->get_widget()); } -IMPL_LINK_NOARG(SvxConfigPage, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxConfigPage, SearchUpdateHdl, weld::TextWidget&, void) { m_aUpdateDataTimer.Start(); } @@ -1857,7 +1857,7 @@ SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog() { } -IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl, weld::TextWidget&, void) { // if the Edit control is empty do not change the name if (m_xMenuNameEdit->get_text().isEmpty()) diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index d6ba045dd57f..78ad37b48249 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -719,7 +719,7 @@ bool AdditionsItem::getExtensionFile(OUString& sExtensionFile) IMPL_LINK_NOARG(AdditionsDialog, ImplUpdateDataHdl, Timer*, void) { RefreshUI(); } -IMPL_LINK_NOARG(AdditionsDialog, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(AdditionsDialog, SearchUpdateHdl, weld::TextWidget&, void) { m_aSearchDataTimer.Start(); } diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 1b04dcef9d27..531b1e9632a8 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -171,7 +171,10 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&, void) ValidateFields(); } -IMPL_LINK_NOARG(SignSignatureLineDialog, entryChanged, weld::Entry&, void) { ValidateFields(); } +IMPL_LINK_NOARG(SignSignatureLineDialog, entryChanged, weld::TextWidget&, void) +{ + ValidateFields(); +} void SignSignatureLineDialog::ValidateFields() { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d7410748dbea..e5fe8eac192a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -553,7 +553,7 @@ static int GetCodePointCount(std::u16string_view sText) return nCount; } -IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified, weld::Entry&, void) +IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified, weld::TextWidget&, void) { m_xFind->set_sensitive(m_xWordInput->get_value_changed_from_saved()); @@ -963,7 +963,7 @@ IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl, weld::TextWidget&, void) { OUString aName(comphelper::string::stripEnd(m_xDictNameED->get_text(), ' ')); @@ -1212,22 +1212,22 @@ IMPL_LINK_NOARG(HangulHanjaEditDictDialog, OriginalModifyHdl, weld::ComboBox&, v UpdateButtonStates(); } -IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl1, weld::Entry&, rEdit, void) +IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl1, weld::TextWidget&, rEdit, void) { EditModify(&rEdit, 0); } -IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl2, weld::Entry&, rEdit, void) +IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl2, weld::TextWidget&, rEdit, void) { EditModify(&rEdit, 1); } -IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl3, weld::Entry&, rEdit, void) +IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl3, weld::TextWidget&, rEdit, void) { EditModify(&rEdit, 2); } -IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl4, weld::Entry&, rEdit, void) +IMPL_LINK(HangulHanjaEditDictDialog, EditModifyHdl4, weld::TextWidget&, rEdit, void) { EditModify(&rEdit, 3); } @@ -1410,7 +1410,7 @@ void HangulHanjaEditDictDialog::SetEditText(SuggestionEdit& rEdit, sal_uInt16 nE rEdit.set_text(aStr); } -void HangulHanjaEditDictDialog::EditModify(const weld::Entry* pEdit, sal_uInt8 _nEntryOffset) +void HangulHanjaEditDictDialog::EditModify(const weld::TextWidget* pEdit, sal_uInt8 _nEntryOffset) { m_bModifiedSuggestions = true; diff --git a/cui/source/dialogs/hyperlinkdoctabpage.cxx b/cui/source/dialogs/hyperlinkdoctabpage.cxx index a878298e8577..43a714f64ac3 100644 --- a/cui/source/dialogs/hyperlinkdoctabpage.cxx +++ b/cui/source/dialogs/hyperlinkdoctabpage.cxx @@ -231,7 +231,7 @@ IMPL_LINK_NOARG(HyperlinkDocTabPage, ModifiedPathHdl_Impl, weld::ComboBox&, void m_xFtFullURL->set_label(maStrURL); } -IMPL_LINK_NOARG(HyperlinkDocTabPage, ModifiedTargetHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(HyperlinkDocTabPage, ModifiedTargetHdl_Impl, weld::TextWidget&, void) { maStrURL = GetCurrentURL(); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index a3720b6d7a0c..961114f71f4f 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -95,8 +95,9 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, weld::Button&, void) } } -IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void) +IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::TextWidget&, rTextWidget, void) { + weld::Entry& rEntry = dynamic_cast(rTextWidget); auto aPasswordText = rEntry.get_text(); weld::Label* pIndicator = nullptr; diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 7d7ad82d7a21..43e9d5e163a0 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -43,7 +43,7 @@ IMPL_LINK_NOARG( SvxThesaurusDialog, ModifyTimer_Hdl, Timer *, void ) m_aModifyIdle.Stop(); } -IMPL_LINK_NOARG(SvxThesaurusDialog, ReplaceEditHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxThesaurusDialog, ReplaceEditHdl_Impl, weld::TextWidget&, void) { m_xReplaceBtn->set_sensitive(!m_xReplaceEdit->get_text().isEmpty()); } diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index b87ddb262212..ab139d31dca7 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -67,7 +67,7 @@ private: Timer m_aSearchDataTimer; DECL_LINK(GearHdl, const OUString&, void); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_LINK(SearchUpdateHdl, weld::TextWidget&, void); DECL_LINK(ImplUpdateDataHdl, Timer*, void); DECL_LINK(FocusOut_Impl, weld::Widget&, void); DECL_LINK(CloseButtonHdl, weld::Button&, void); diff --git a/cui/source/inc/SignSignatureLineDialog.hxx b/cui/source/inc/SignSignatureLineDialog.hxx index 57657740e1a2..85cf43d73d25 100644 --- a/cui/source/inc/SignSignatureLineDialog.hxx +++ b/cui/source/inc/SignSignatureLineDialog.hxx @@ -52,7 +52,7 @@ private: DECL_LINK(clearImage, weld::Button&, void); DECL_LINK(loadImage, weld::Button&, void); DECL_LINK(chooseCertificate, weld::Button&, void); - DECL_LINK(entryChanged, weld::Entry&, void); + DECL_LINK(entryChanged, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index e35614fca289..0387742431d2 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -111,7 +111,7 @@ private: DECL_LINK(ChangeHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); DECL_LINK(SelectHdl, weld::ItemView&, void); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_LINK(SearchUpdateHdl, weld::TextWidget&, void); DECL_LINK(Save, weld::Button&, void); DECL_LINK(Load, weld::Button&, void); DECL_LINK(Default, weld::Button&, void); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 94ee5f0d8e2f..02afd50d64ae 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -198,7 +198,7 @@ private: DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); DECL_LINK(EntrySizeAllocHdl, const Size&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); bool NewDelHdl(const weld::Widget*); void RefillReplaceBox( bool bFromReset, @@ -254,7 +254,7 @@ private: DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); DECL_LINK(SelectHdl, weld::ItemView&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); bool NewDelHdl(const weld::Widget*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 342b7336936b..175613fb5a01 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -387,7 +387,7 @@ private: bool bInitialised; SaveInData* pCurrentSaveInData; - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_LINK(SearchUpdateHdl, weld::TextWidget&, void); protected: @@ -549,7 +549,7 @@ class SvxMainMenuOrganizerDialog : public weld::GenericDialogController void UpdateButtonStates(); DECL_LINK(MoveHdl, weld::Button&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(SelectHdl, weld::ItemView&, void); public: diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index bbd293048f1c..b55b696cab0e 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -62,7 +62,7 @@ private: OUString msCurrentSigningKey; OUString msCurrentEncryptionKey; - DECL_LINK( ModifyHdl_Impl, weld::Entry&, void ); + DECL_LINK(ModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK( ChooseKeyButtonHdl, weld::Button&, void ); DECL_LINK( RemoveKeyButtonHdl, weld::Button&, void ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 797e102c77f1..8012d7ecb79a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -163,7 +163,7 @@ public: private: DECL_LINK(OnOption, weld::Button&, void); - DECL_LINK(OnSuggestionModified, weld::Entry&, void); + DECL_LINK(OnSuggestionModified, weld::TextWidget&, void); DECL_LINK(OnSuggestionSelected, SuggestionDisplay&, void); DECL_LINK(OnConversionDirectionClicked, weld::Toggleable&, void); DECL_LINK(ClickByCharacterHdl, weld::Toggleable&, void); @@ -212,7 +212,7 @@ private: std::unique_ptr m_xDictNameED; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: HangulHanjaNewDictDialog(weld::Window* pParent); @@ -243,7 +243,7 @@ public: void grab_focus() { m_xEntry->grab_focus(); } void set_text(const OUString& rText) { m_xEntry->set_text(rText); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xEntry->connect_changed(rLink); } @@ -276,10 +276,10 @@ private: DECL_LINK(OriginalModifyHdl, weld::ComboBox&, void); DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); - DECL_LINK(EditModifyHdl1, weld::Entry&, void); - DECL_LINK(EditModifyHdl2, weld::Entry&, void); - DECL_LINK(EditModifyHdl3, weld::Entry&, void); - DECL_LINK(EditModifyHdl4, weld::Entry&, void); + DECL_LINK(EditModifyHdl1, weld::TextWidget&, void); + DECL_LINK(EditModifyHdl2, weld::TextWidget&, void); + DECL_LINK(EditModifyHdl3, weld::TextWidget&, void); + DECL_LINK(EditModifyHdl4, weld::TextWidget&, void); DECL_LINK(BookLBSelectHdl, weld::ComboBox&, void); DECL_LINK(NewPBPushHdl, weld::Button&, void); @@ -291,7 +291,7 @@ private: void UpdateButtonStates(); void SetEditText(SuggestionEdit& rEdit, sal_uInt16 nEntryNum); - void EditModify(const weld::Entry* pEdit, sal_uInt8 nEntryOffset); + void EditModify(const weld::TextWidget* pEdit, sal_uInt8 nEntryOffset); bool DeleteEntryFromDictionary( const css::uno::Reference& xDict); diff --git a/cui/source/inc/hyperlinkdoctabpage.hxx b/cui/source/inc/hyperlinkdoctabpage.hxx index dcb5486206d9..62d47fa9e3f5 100644 --- a/cui/source/inc/hyperlinkdoctabpage.hxx +++ b/cui/source/inc/hyperlinkdoctabpage.hxx @@ -29,7 +29,7 @@ private: DECL_LINK(ClickFileopenHdl_Impl, weld::Button&, void); DECL_LINK(ClickTargetHdl_Impl, weld::Button&, void); DECL_LINK(ModifiedPathHdl_Impl, weld::ComboBox&, void); - DECL_LINK(ModifiedTargetHdl_Impl, weld::Entry&, void); + DECL_LINK(ModifiedTargetHdl_Impl, weld::TextWidget&, void); DECL_LINK(LostFocusPathHdl_Impl, weld::Widget&, void); DECL_LINK(TimeoutHdl_Impl, Timer*, void); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 83038dbdf298..6d5296455934 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -145,10 +145,10 @@ private: DECL_LINK(SelFormatClickHdl_Impl, weld::Toggleable&, void); void SelFormatHdl_Impl(weld::Widget*); DECL_LINK(ClickHdl_Impl, weld::Button&, void); - DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(EditModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(OptEditHdl_Impl, weld::SpinButton&, void); DECL_LINK(OptClickHdl_Impl, weld::Toggleable&, void); - void EditHdl_Impl(const weld::Entry*); + void EditHdl_Impl(const weld::TextWidget*); void OptHdl_Impl(const weld::Widget*); // set and get currency, taking into account if the legacy diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index fe0fca8f1d0a..65fc9364d9f1 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -295,7 +295,7 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); DECL_LINK(CharFmtHdl_Impl, weld::ComboBox&, void); - DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(EditModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(SpinModifyHdl_Impl, weld::SpinButton&, void); DECL_LINK(AllLevelHdl_Impl, weld::SpinButton&, void); DECL_LINK(IsLegalHdl_Impl, weld::Toggleable&, void); @@ -304,7 +304,7 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK(BulColorHdl_Impl, ColorListBox&, void); DECL_LINK(BulRelSizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(PreviewInvalidateHdl_Impl, Timer*, void); - void EditModifyHdl_Impl(const weld::Entry*); + void EditModifyHdl_Impl(const weld::TextWidget*); public: SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 32fca8cd9417..0a242e0d147b 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -47,7 +47,7 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(LanguageHdl, weld::ComboBox&, void); DECL_LINK(ChangeStandardHdl, weld::Toggleable&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index ad43f02fd16b..3f61d6cb7434 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -51,7 +51,7 @@ private: css::uno::Reference m_xNewDic; DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(ModifyHdl_Impl, weld::TextWidget&, void); public: SvxNewDictionaryDialog(weld::Window* pParent); @@ -95,7 +95,7 @@ private: DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(EntrySizeAllocHdl, const Size&, void); bool NewDelHdl(const weld::Widget*); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 99ffa4b1514f..cfaa6357252c 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -67,7 +67,7 @@ class PasswordToOpenModifyDialog : public SfxDialogController DECL_LINK(OkBtnClickHdl, weld::Button&, void); DECL_LINK(ReadonlyOnOffHdl, weld::Toggleable&, void); - DECL_LINK(ChangeHdl, weld::Entry&, void); + DECL_LINK(ChangeHdl, weld::TextWidget&, void); DECL_LINK(ShowHdl, weld::Toggleable&, void); PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a88bce0cd16d..a11644619f97 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -64,7 +64,7 @@ public: DECL_LINK(AlternativesSelectHdl_Impl, weld::ItemView&, void); DECL_LINK(AlternativesDoubleClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK( SelectFirstHdl_Impl, void*, void ); - DECL_LINK( ReplaceEditHdl_Impl, weld::Entry&, void ); + DECL_LINK(ReplaceEditHdl_Impl, weld::TextWidget&, void); DECL_LINK( ModifyTimer_Hdl, Timer *, void ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index cf11eaf8b459..9bee0d9d0d2f 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -195,7 +195,7 @@ private: DECL_LINK(BackHdl_Impl, weld::Button&, void); DECL_LINK(ApplyHdl_Impl, weld::Button&, void); DECL_LINK(HelpHdl_Impl, weld::Widget&, bool); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_LINK(SearchUpdateHdl, weld::TextWidget&, void); DECL_LINK(ImplUpdateDataHdl, Timer*, void); DECL_LINK(FocusOut_Impl, weld::Widget&, void); void ResetCurrentPageFromConfig(); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index f43bb48b6c66..b76a0e41f4fe 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -234,7 +234,7 @@ namespace svx validate(); } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnEntryModified, weld::Entry&, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnEntryModified, weld::TextWidget&, void) { validate(); } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index dff172e1dc37..2f952253c990 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -57,7 +57,7 @@ namespace svx void getLink( OUString& _rName, OUString& _rURL ) const; private: - DECL_LINK( OnEntryModified, weld::Entry&, void ); + DECL_LINK(OnEntryModified, weld::TextWidget&, void); DECL_LINK( OnComboBoxModified, weld::ComboBox&, void ); DECL_LINK( OnBrowseFile, weld::Button&, void ); DECL_LINK( OnOk, weld::Button&, void ); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index b8d8de5356d3..f014fcbb38f8 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -128,7 +128,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage(weld::Container* pPage, weld::DialogContr LanguageHdl(*m_xLanguageLB->get_widget()); m_xLanguageLB->connect_changed(LINK(this, SvxAsianLayoutPage, LanguageHdl)); m_xStandardCB->connect_toggled(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl)); - Link aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl)); + Link aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl)); m_xStartED->connect_changed(aLk); m_xEndED->connect_changed(aLk); @@ -374,7 +374,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, weld::Toggleable&, rBox, void) ModifyHdl(*m_xStartED); } -IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, weld::TextWidget&, rEdit, void) { LanguageType eSelectLanguage = m_xLanguageLB->get_active_id(); Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 8c8b21e68927..1094267582c0 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -204,7 +204,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl, weld::TextWidget&, void) { m_xOKBtn->set_sensitive(!m_xNameEdit->get_text().isEmpty()); } @@ -684,7 +684,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(const weld::Widget* pBtn) return true; } -IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::Entry&, rEdt, void) +IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::TextWidget&, rEdt, void) { OUString rEntry = rEdt.get_text(); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3a7456c5cd1e..68374507c289 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1517,7 +1517,7 @@ IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl, weld::ComboBox&, void) m_xDatePatternsED->set_message_type(weld::EntryMessageType::Normal); } -IMPL_LINK_NOARG(OfaLanguagesTabPage, DatePatternsHdl, weld::Entry&, void) +IMPL_LINK_NOARG(OfaLanguagesTabPage, DatePatternsHdl, weld::TextWidget&, void) { OUString aPatterns(m_xDatePatternsED->get_text()); bool bModified = false; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index b3aba2032fca..9b9a84cac304 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -178,7 +178,7 @@ class OfaLanguagesTabPage : public SfxTabPage std::unique_ptr m_xUseInputLanguageImg; DECL_LINK(LocaleSettingHdl, weld::ComboBox&, void); - DECL_LINK(DatePatternsHdl, weld::Entry&, void); + DECL_LINK(DatePatternsHdl, weld::TextWidget&, void); bool validateDatePatterns( bool& rbModified, OUString& rPatterns ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 3091cb596d45..c21e1d4279b8 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -392,7 +392,7 @@ IMPL_LINK(SvxGeneralTabPage, RemoveKeyButtonHdl, weld::Button&, rButton, void) void SvxGeneralTabPage::SetLinks () { // link for updating the initials - Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl ); + Link aLink = LINK(this, SvxGeneralTabPage, ModifyHdl_Impl); Row& rNameRow = *vRows[nNameRow]; for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i) vFields[i]->xEdit->connect_changed(aLink); @@ -466,7 +466,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) // ModifyHdl_Impl() // This handler updates the initials (short name) // when one of the name fields was updated. -IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, weld::Entry&, rEdit, void ) +IMPL_LINK(SvxGeneralTabPage, ModifyHdl_Impl, weld::TextWidget&, rEdit, void) { // short name field and row Field& rShortName = *vFields[nShortNameField]; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 92b2c590eef8..f92f918ef014 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -83,7 +83,7 @@ bool isValidPort(OUString const & value) { } -IMPL_LINK(SvxProxyTabPage, PortChangedHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxProxyTabPage, PortChangedHdl, weld::TextWidget&, rEdit, void) { if (!isValidPort(rEdit.get_text())) { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 40a73f738508..2f1ea04ae102 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -67,7 +67,7 @@ private: void ReadConfigDefaults_Impl(); void RestoreConfigDefaults_Impl(); - DECL_LINK(PortChangedHdl, weld::Entry&, void); + DECL_LINK(PortChangedHdl, weld::TextWidget&, void); DECL_STATIC_LINK(SvxProxyTabPage, NumberOnlyTextFilterHdl, OUString&, bool); DECL_STATIC_LINK(SvxProxyTabPage, NoSpaceTextFilterHdl, OUString&, bool); DECL_LINK(ProxyHdl_Impl, weld::ComboBox&, void); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 0fa81a127419..aefd3b64061c 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -669,7 +669,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg() { } -IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl, weld::TextWidget&, void) { OUString sParam = comphelper::string::strip(m_xParameterEdit->get_text(), ' '); m_xAssignBtn->set_sensitive(!sParam.isEmpty()); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index a282acd1bd73..483d598e1de7 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -129,7 +129,7 @@ private: std::unique_ptr m_xRemoveBtn; std::unique_ptr m_xEditBtn; - DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(ModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(ActivateHdl_Impl, weld::Entry&, bool); DECL_LINK(AssignHdl_Impl, weld::Button&, void); DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index aec84eb83bbc..fbc9cadfaee3 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -774,7 +774,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, FocusOut_Impl, weld::Widget&, void) } } -IMPL_LINK_NOARG(OfaTreeOptionsDialog, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, SearchUpdateHdl, weld::TextWidget&, void) { m_aUpdateDataTimer.Start(); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 9ca0c75c26ed..afc4b4678143 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1122,7 +1122,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(const weld::Widget* pBtn) return true; } -IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, weld::Entry&, rEdt, void) +IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, weld::TextWidget&, rEdt, void) { std::unique_ptr xFirstSel = m_xReplaceTLB->get_selected(); bool bFirstSelIterSet = bool(xFirstSel); @@ -1540,7 +1540,7 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, weld::ItemView&, rBox, void) } } -IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, weld::Entry&, rEdt, void) +IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, weld::TextWidget&, rEdt, void) { const OUString sEntry = rEdt.get_text(); bool bEntryLen = !sEntry.isEmpty(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9682dc66a6c9..8783d0aeffdb 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1432,12 +1432,12 @@ bool SvxNumberFormatTabPage::Click_Impl(const weld::Button& rIB) #* #************************************************************************/ -IMPL_LINK(SvxNumberFormatTabPage, EditModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxNumberFormatTabPage, EditModifyHdl_Impl, weld::TextWidget&, rEdit, void) { EditHdl_Impl(&rEdit); } -void SvxNumberFormatTabPage::EditHdl_Impl(const weld::Entry* pEdFormat) +void SvxNumberFormatTabPage::EditHdl_Impl(const weld::TextWidget* pEdFormat) { sal_uInt32 nCurKey = NUMKEY_UNDEFINED; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8d0a122377f0..dcc1380203d4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2264,7 +2264,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, weld::ComboBox&, void) SetModified(false); }; -IMPL_LINK(SvxNumOptionsTabPage, EditModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxNumOptionsTabPage, EditModifyHdl_Impl, weld::TextWidget&, rEdit, void) { EditModifyHdl_Impl(&rEdit); } @@ -2274,7 +2274,7 @@ IMPL_LINK(SvxNumOptionsTabPage, SpinModifyHdl_Impl, weld::SpinButton&, rSpinButt EditModifyHdl_Impl(&rSpinButton); } -void SvxNumOptionsTabPage::EditModifyHdl_Impl(const weld::Entry* pEdit) +void SvxNumOptionsTabPage::EditModifyHdl_Impl(const weld::TextWidget* pEdit) { bool bPrefixSuffix = (pEdit == m_xPrefixED.get())|| (pEdit == m_xSuffixED.get()); bool bStart = pEdit == m_xStartED.get(); diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index bdd2df56540b..ca5ea6c8932a 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -63,7 +63,7 @@ namespace dbaui namespace { - void checkName(OSQLNameChecker& rChecker, weld::Entry& rEntry) + void checkName(OSQLNameChecker& rChecker, weld::TextWidget& rEntry) { OUString sCorrected; if (rChecker.checkString(rEntry.get_text(), sCorrected)) @@ -79,13 +79,13 @@ namespace dbaui } } - IMPL_LINK(OSQLNameEditControl, ModifyHdl, weld::Entry&, rEntry, void) + IMPL_LINK(OSQLNameEditControl, ModifyHdl, weld::TextWidget&, rEntry, void) { checkName(*this, rEntry); m_ChainChangedHdl.Call(rEntry); } - IMPL_LINK(OSQLNameEntry, ModifyHdl, weld::Entry&, rEntry, void) + IMPL_LINK(OSQLNameEntry, ModifyHdl, weld::TextWidget&, rEntry, void) { checkName(*this, rEntry); } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index d9e604922678..f3acf11a8359 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -259,7 +259,7 @@ namespace dbaui m_xTestConnection->set_sensitive(bEnableTestConnection); return true; } - IMPL_LINK(OConnectionTabPage, OnEditModified, weld::Entry&, rEdit, void) + IMPL_LINK(OConnectionTabPage, OnEditModified, weld::TextWidget&, rEdit, void) { if (&rEdit == m_xJavaDriver.get()) m_xTestJavaDriver->set_sensitive( !o3tl::trim(m_xJavaDriver->get_text()).empty() ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 19e76946254a..344ef67bfa1c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -48,7 +48,7 @@ namespace dbaui // called when the test connection button was clicked DECL_LINK(OnTestJavaClickHdl, weld::Button&, void); - DECL_LINK(OnEditModified, weld::Entry&, void); + DECL_LINK(OnEditModified, weld::TextWidget&, void); public: OConnectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 77ea1c39bd29..9ecc523ba6e2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -133,7 +133,7 @@ namespace dbaui return !m_xConnectionURL->get_visible() || !m_xConnectionURL->GetTextNoPrefix().isEmpty(); } - IMPL_LINK_NOARG(OConnectionTabPageSetup, OnEditModified, weld::Entry&, void) + IMPL_LINK_NOARG(OConnectionTabPageSetup, OnEditModified, weld::TextWidget&, void) { SetRoadmapStateValue(checkTestConnection()); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 7b79d3116baf..0f92905869f4 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -37,7 +37,7 @@ namespace dbaui std::unique_ptr m_xHeaderText; // called when the test connection button was clicked - DECL_LINK(OnEditModified, weld::Entry&, void); + DECL_LINK(OnEditModified, weld::TextWidget&, void); public: OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 213bee12efac..1acc9843c695 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -727,7 +727,7 @@ using namespace ::com::sun::star; aMsg.run(); } - IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, weld::Entry&, rEdit, void) + IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, weld::TextWidget&, rEdit, void) { if (&rEdit == m_xETDriverClass.get()) m_xPBTestJavaDriver->set_sensitive(!m_xETDriverClass->get_text().isEmpty()); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index bf5b5a5a01cd..23620fa95e5b 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -199,7 +199,7 @@ namespace dbaui virtual void fillWindows(std::vector< std::unique_ptr >& _rControlList) override; DECL_LINK(OnTestJavaClickHdl, weld::Button&, void); - DECL_LINK(OnEditModified, weld::Entry&, void); + DECL_LINK(OnEditModified, weld::TextWidget&, void); std::unique_ptr m_xFTDriverClass; std::unique_ptr m_xETDriverClass; std::unique_ptr m_xPBTestJavaDriver; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 320282914b8e..a122ef47890b 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -123,7 +123,7 @@ namespace dbaui m_xContainer->show(); } - IMPL_LINK_NOARG(OTextConnectionHelper, OnEditModified, weld::Entry&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnEditModified, weld::TextWidget&, void) { m_aGetExtensionHandler.Call(this); } diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 2d699d4a3080..4cc8fd54ef75 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -71,7 +71,7 @@ namespace dbaui std::unique_ptr m_xCharSet; DECL_LINK(OnSetExtensionHdl, weld::Toggleable&, void); - DECL_LINK(OnEditModified, weld::Entry&, void); + DECL_LINK(OnEditModified, weld::TextWidget&, void); OUString GetSeparator(const weld::ComboBox& rBox, std::u16string_view rList); void SetSeparator(weld::ComboBox& rBox, std::u16string_view rList, const OUString& rVal); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 28bf22bb719c..4eab70ecf4ce 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -65,7 +65,7 @@ class OPasswordDialog : public weld::GenericDialogController std::unique_ptr m_xOKBtn; DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(ModifiedHdl, weld::Entry&, void); + DECL_LINK(ModifiedHdl, weld::TextWidget&, void); public: OPasswordDialog(weld::Window* pParent, std::u16string_view rUserName); @@ -110,7 +110,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, weld::Button&, void) } } -IMPL_LINK(OPasswordDialog, ModifiedHdl, weld::Entry&, rEdit, void) +IMPL_LINK(OPasswordDialog, ModifiedHdl, weld::TextWidget&, rEdit, void) { m_xOKBtn->set_sensitive(!rEdit.get_text().isEmpty()); } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index cc98d6cf96ae..1efcbae0b2db 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -81,7 +81,7 @@ namespace dbaui m_xNamedPipe->set_sensitive(m_xNamedPipeRadio->get_active()); } - IMPL_LINK(MySQLNativeSettings, EditModifyHdl, weld::Entry&, rEdit, void) + IMPL_LINK(MySQLNativeSettings, EditModifyHdl, weld::TextWidget&, rEdit, void) { m_aControlModificationLink.Call(&rEdit); } diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index c83e62b3aaf7..a881452dcbf6 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -51,7 +51,7 @@ namespace dbaui Link m_aControlModificationLink; DECL_LINK(RadioToggleHdl, weld::Toggleable&, void); DECL_LINK(SpinModifyHdl, weld::SpinButton&, void); - DECL_LINK(EditModifyHdl, weld::Entry&, void); + DECL_LINK(EditModifyHdl, weld::TextWidget&, void); public: MySQLNativeSettings(weld::Widget* pParent, const Link& rControlModificationLink); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index c09f79036f07..f517cac8241a 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -105,7 +105,7 @@ namespace dbaui callModifiedHdl(&rCtrl); } - IMPL_LINK(OGenericAdministrationPage, OnControlEntryModifyHdl, weld::Entry&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlEntryModifyHdl, weld::TextWidget&, rCtrl, void) { callModifiedHdl(&rCtrl); } diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index f0748adb2238..9c8f0d6126ee 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -230,7 +230,7 @@ namespace dbaui is modified. The implementation just calls callModifiedHdl. */ DECL_LINK(OnControlModified, weld::Widget*, void); - DECL_LINK(OnControlEntryModifyHdl, weld::Entry&, void); + DECL_LINK(OnControlEntryModifyHdl, weld::TextWidget&, void); DECL_LINK(OnControlSpinButtonModifyHdl, weld::SpinButton&, void); DECL_LINK(OnControlModifiedButtonClick, weld::Toggleable&, void); DECL_LINK(OnTestConnectionButtonClickHdl, weld::Button&, void); diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 064d19eeb8da..8390956d5769 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(OSaveAsDlg, ButtonClickHdl, weld::Button&, void) m_xTitle->grab_focus(); } -IMPL_LINK_NOARG(OSaveAsDlg, EditModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(OSaveAsDlg, EditModifyHdl, weld::TextWidget&, void) { m_xPB_OK->set_sensitive(!m_xTitle->get_text().isEmpty()); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 7fe57988a388..410bb391dda5 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -320,7 +320,7 @@ IMPL_LINK_NOARG(OParameterDialog, OnVisitedTimeout, Timer*, void) } } -IMPL_LINK_NOARG(OParameterDialog, OnValueModified, weld::Entry&, void) +IMPL_LINK_NOARG(OParameterDialog, OnValueModified, weld::TextWidget&, void) { // mark the currently selected entry as dirty OSL_ENSURE(o3tl::make_unsigned(m_nCurrentlySelected) < m_aVisitedParams.size(), diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 233fcdd76d5c..7bb4d5fcf423 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -58,15 +58,15 @@ namespace dbaui m_xWidget->connect_changed(LINK(this, OSQLNameEditControl, ModifyHdl)); } - virtual void connect_changed(const Link& rLink) override + virtual void connect_changed(const Link& rLink) override { m_ChainChangedHdl = rLink; } private: - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); - Link m_ChainChangedHdl; + Link m_ChainChangedHdl; }; class OWidgetBase @@ -100,7 +100,7 @@ namespace dbaui private: std::unique_ptr m_xEntry; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: OSQLNameEntry(std::unique_ptr xEntry, const OUString& _rAllowedChars, diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 6df6db932427..cf6e076b57fa 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -44,7 +44,10 @@ public: public: bool get_visible() const { return m_xEntry->get_visible(); } - void connect_changed(const Link& rLink) { m_xEntry->connect_changed(rLink); } + void connect_changed(const Link& rLink) + { + m_xEntry->connect_changed(rLink); + } void set_help_id(const OUString& rName) { m_xEntry->set_help_id(rName); } void hide() { diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 1657fc462542..f44164949d2e 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -94,7 +94,7 @@ namespace dbaui OUString getSchema() const; private: DECL_LINK(ButtonClickHdl, weld::Button&, void); - DECL_LINK(EditModifyHdl, weld::Entry&, void); + DECL_LINK(EditModifyHdl, weld::TextWidget&, void); void implInitOnlyTitle(const OUString& _rLabel); void implInit(); diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 995844bbfafc..0e3aeac5a045 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -90,7 +90,7 @@ private: void Construct(); DECL_LINK(OnVisitedTimeout, Timer*, void); - DECL_LINK(OnValueModified, weld::Entry&, void); + DECL_LINK(OnValueModified, weld::TextWidget&, void); DECL_LINK(OnEntryListBoxSelected, weld::ItemView&, void); DECL_LINK(OnButtonClicked, weld::Button&, void); DECL_LINK(OnValueLoseFocusHdl, weld::Widget&, void); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 161f95e76d82..22d75ad715ad 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -728,10 +728,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, weld::Toggleable&, void) updateList(); } -IMPL_LINK_NOARG(ExtMgrDialog, HandleSearch, weld::Entry&, void) -{ - updateList(); -} +IMPL_LINK_NOARG(ExtMgrDialog, HandleSearch, weld::TextWidget&, void) { updateList(); } IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, weld::Button&, void) { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 684b6f54c569..98bc9e0f6f00 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -129,7 +129,7 @@ class ExtMgrDialog : public DialogHelper DECL_LINK( HandleCancelBtn, weld::Button&, void ); DECL_LINK( HandleCloseBtn, weld::Button&, void ); DECL_LINK( HandleExtTypeCbx, weld::Toggleable&, void ); - DECL_LINK( HandleSearch, weld::Entry&, void ); + DECL_LINK(HandleSearch, weld::TextWidget&, void); DECL_LINK( TimeOutHdl, Timer *, void ); DECL_LINK( startProgress, void *, void ); diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 2821222e31d5..3568bef27c5f 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -192,10 +192,7 @@ namespace abp m_xDuplicateNameError->set_visible(!bValidName && !bEmptyName); } - IMPL_LINK_NOARG( FinalPage, OnEntryNameModified, weld::Entry&, void ) - { - implCheckName(); - } + IMPL_LINK_NOARG(FinalPage, OnEntryNameModified, weld::TextWidget&, void) { implCheckName(); } IMPL_LINK_NOARG( FinalPage, OnComboNameModified, weld::ComboBox&, void ) { diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 823982735566..922e63456c3e 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -65,7 +65,7 @@ namespace abp // OImportPage overridables virtual bool canAdvance() const override; - DECL_LINK(OnEntryNameModified, weld::Entry&, void); + DECL_LINK(OnEntryNameModified, weld::TextWidget&, void); DECL_LINK(OnComboNameModified, weld::ComboBox&, void); DECL_LINK(OnRegister, weld::Toggleable&, void); DECL_LINK(OnEmbed, weld::Toggleable&, void); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index bd28e08c50c9..9daaaba2157b 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -263,7 +263,7 @@ namespace dbp implCheckMoveButtons(); } - IMPL_LINK_NOARG( ORadioSelectionPage, OnNameModified, weld::Entry&, void ) + IMPL_LINK_NOARG(ORadioSelectionPage, OnNameModified, weld::TextWidget&, void) { implCheckMoveButtons(); } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index ad11134ccac9..49f2410f14ff 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -100,7 +100,7 @@ namespace dbp DECL_LINK( OnMoveEntry, weld::Button&, void ); DECL_LINK(OnEntrySelected, weld::ItemView&, void); - DECL_LINK( OnNameModified, weld::Entry&, void ); + DECL_LINK(OnNameModified, weld::TextWidget&, void); void implCheckMoveButtons(); }; diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 5fcca3a9aed6..1b0afd9e6e66 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -61,7 +61,7 @@ void CommonBehaviourControlHelper::notifyModifiedValue() void CommonBehaviourControlHelper::editChanged() { setModified(); } -IMPL_LINK_NOARG(CommonBehaviourControlHelper, EditModifiedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(CommonBehaviourControlHelper, EditModifiedHdl, weld::TextWidget&, void) { editChanged(); } diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index c46dc9a64dd0..92d8888c73a1 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -89,7 +89,7 @@ public: /// may be used by derived classes, they forward the event to the PropCtrListener DECL_LINK(ModifiedHdl, weld::ComboBox&, void); DECL_LINK(ColorModifiedHdl, ColorListBox&, void); - DECL_LINK(EditModifiedHdl, weld::Entry&, void); + DECL_LINK(EditModifiedHdl, weld::TextWidget&, void); DECL_LINK(MetricModifiedHdl, weld::MetricSpinButton&, void); DECL_LINK(FormattedModifiedHdl, weld::FormattedSpinButton&, void); DECL_LINK(TimeModifiedHdl, weld::FormattedSpinButton&, void); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 66428ceb5f30..5ff402e405e2 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -66,7 +66,7 @@ namespace pcr { } - IMPL_LINK_NOARG(NewDataTypeDialog, OnNameModified, weld::Entry&, void) + IMPL_LINK_NOARG(NewDataTypeDialog, OnNameModified, weld::TextWidget&, void) { OUString sCurrentName = GetName(); bool bNameIsOK = ( !sCurrentName.isEmpty() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index e0714a98a013..e145bfa65f25 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -46,7 +46,7 @@ namespace pcr OUString GetName() const { return m_xName->get_text(); } private: - DECL_LINK(OnNameModified, weld::Entry&, void); + DECL_LINK(OnNameModified, weld::TextWidget&, void); }; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 379b484cb9ca..375cd24ded4f 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -781,7 +781,7 @@ namespace pcr m_xOk->connect_clicked(LINK(this, OMultilineEditControl, ButtonHandler)); } - IMPL_LINK_NOARG(OMultilineEditControl, TextViewModifiedHdl, weld::TextView&, void) + IMPL_LINK_NOARG(OMultilineEditControl, TextViewModifiedHdl, weld::TextWidget&, void) { // tdf#139070 during editing update the entry to look like how it will // look once editing is finished so that the default behaviour of vcl diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 618060bf0de6..702c974b14ff 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -378,7 +378,7 @@ namespace pcr GetStringListValue() const; DECL_LINK(ButtonHandler, weld::Button&, void); - DECL_LINK(TextViewModifiedHdl, weld::TextView&, void); + DECL_LINK(TextViewModifiedHdl, weld::TextWidget&, void); void CheckEntryTextViewMisMatch(); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index f5f91b14958f..758a008b2f38 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -751,7 +751,7 @@ IMPL_LINK_NOARG(SaneDlg, OptionsBoxSelectHdl, weld::ItemView&, void) } } -IMPL_LINK(SaneDlg, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SaneDlg, ModifyHdl, weld::TextWidget&, rEdit, void) { if( !mrSane.IsOpen() ) return; diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 9738e579cea0..450eccbde7d2 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -86,7 +86,7 @@ private: DECL_LINK( ClickBtnHdl, weld::Button&, void ); DECL_LINK( ToggleBtnHdl, weld::Toggleable&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); - DECL_LINK( ModifyHdl, weld::Entry&, void ); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK( MetricValueModifyHdl, weld::MetricSpinButton&, void ); DECL_LINK( ValueModifyHdl, weld::ComboBox&, void ); DECL_LINK( ReloadSaneOptionsHdl, Sane&, void ); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 017bf9aa27ae..11b1b927c272 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -119,7 +119,7 @@ public: DECL_LINK( FxHdl, ParaWin&, void ); DECL_LINK( MatrixHdl, weld::Toggleable&, void ); - DECL_LINK( FormulaHdl, weld::TextView&, void); + DECL_LINK(FormulaHdl, weld::TextWidget&, void); DECL_LINK( FormulaCursorHdl, weld::TextWidget&, void); DECL_LINK( BtnHdl, weld::Button&, void ); DECL_LINK( FavToggleHdl, weld::Button&, void ); @@ -1325,7 +1325,7 @@ IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaHdl, weld::TextView&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl, weld::TextWidget&, void) { FormEditData* pData = m_pHelper->getFormEditData(); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index c23d0e76b8d5..f78ce77aecf9 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(FuncPage, DblClkHdl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(FuncPage, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(FuncPage, ModifyHdl, weld::TextWidget&, void) { if (m_xLbCategory->get_active() == LRU_CATEGORY || m_xLbCategory->get_active() == FAVOURITES_CATEGORY) diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index ea6cd71e61b7..a2925241caac 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -75,7 +75,7 @@ private: DECL_LINK(SelTreeViewHdl, weld::ItemView&, void); DECL_LINK(DblClkHdl, const weld::TreeIter&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(SelHelpClickHdl, weld::Button&, void); DECL_LINK(SimilarityToggleHdl, weld::Toggleable&, void); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index fa602258dfb4..9b4fb3a55be0 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -345,7 +345,7 @@ OUString RefEdit::GetLabelTextForShrinkMode() return OUString(); } -IMPL_LINK_NOARG(RefEdit, Modify, weld::Entry&, void) +IMPL_LINK_NOARG(RefEdit, Modify, weld::TextWidget&, void) { maModifyHdl.Call(*this); if (mpAnyRefDlg) diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index e20878e43a8a..3cbb5f56653e 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -30,7 +30,7 @@ private: std::unique_ptr m_xOKBtn; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(NameHdl, weld::Entry&, void); + DECL_LINK(NameHdl, weld::TextWidget&, void); public: QueryFolderNameDialog(weld::Window* _pParent, const OUString& rTitle, diff --git a/fpicker/source/office/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx index 89a2d0b0c245..cff53c751278 100644 --- a/fpicker/source/office/autocmpledit.cxx +++ b/fpicker/source/office/autocmpledit.cxx @@ -27,7 +27,7 @@ IMPL_LINK(AutocompleteEdit, KeyInputHdl, const KeyEvent&, rKEvt, bool) return false; } -IMPL_LINK_NOARG(AutocompleteEdit, ChangedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(AutocompleteEdit, ChangedHdl, weld::TextWidget&, void) { m_aChangeHdl.Call(*m_xEntry); diff --git a/fpicker/source/office/autocmpledit.hxx b/fpicker/source/office/autocmpledit.hxx index f48bfef7afcf..c96582e45612 100644 --- a/fpicker/source/office/autocmpledit.hxx +++ b/fpicker/source/office/autocmpledit.hxx @@ -26,7 +26,7 @@ private: sal_uInt16 m_nLastCharCode; DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(ChangedHdl, weld::Entry&, void); + DECL_LINK(ChangedHdl, weld::TextWidget&, void); DECL_LINK(TryAutoComplete, Timer*, void); bool Match(std::u16string_view rText); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 77e14b4628ed..b008bc3a925b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2275,7 +2275,7 @@ IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl, weld::Entry&, void) +IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl, weld::TextWidget&, void) { // trim the strings OUString aName = comphelper::string::strip(m_xNameEdit->get_text(), ' '); diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index d672836596a3..c7e3a5dbc062 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -60,7 +60,7 @@ private: DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(FocusOutHdl, weld::Widget&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(ActivateHdl, weld::Entry&, bool); DECL_LINK(KeyInputHdl, const ::KeyEvent&, bool); }; @@ -102,7 +102,7 @@ void EditControl::dispose() InterimItemWindow::dispose(); } -IMPL_LINK_NOARG(EditControl, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(EditControl, ModifyHdl, weld::TextWidget&, void) { if (m_pEditToolbarController) m_pEditToolbarController->Modify(); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index fb06612618e5..059f8a4edcd8 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -66,7 +66,7 @@ public: DECL_LINK(ValueChangedHdl, weld::FormattedSpinButton&, void); DECL_LINK(FormatOutputHdl, double, std::optional); DECL_STATIC_LINK(SpinfieldControl, ParseInputHdl, const OUString&, Formatter::ParseResult); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(ActivateHdl, weld::Entry&, bool); DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(FocusOutHdl, weld::Widget&, void); @@ -130,7 +130,7 @@ IMPL_LINK_NOARG(SpinfieldControl, ValueChangedHdl, weld::FormattedSpinButton&, v m_pSpinfieldToolbarController->execute(0); } -IMPL_LINK_NOARG(SpinfieldControl, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SpinfieldControl, ModifyHdl, weld::TextWidget&, void) { if (m_pSpinfieldToolbarController) m_pSpinfieldToolbarController->Modify(); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 18767ee71f87..390ae2799c16 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -59,7 +59,7 @@ private: DECL_DLLPRIVATE_LINK(LoseFocusHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(AsyncFocusInHdl, void*, void); DECL_DLLPRIVATE_LINK(AsyncFocusOutHdl, void*, void); - DECL_DLLPRIVATE_LINK(Modify, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(Modify, weld::TextWidget&, void); void GetFocus(); void LoseFocus(); diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index b8ed75c3184c..69d7f759798d 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -95,7 +95,7 @@ private: DECL_DLLPRIVATE_LINK(OKHdl, weld::Button&, void); DECL_DLLPRIVATE_LINK(ShowHdl, weld::Toggleable&, void); DECL_DLLPRIVATE_LINK(InsertTextHdl, OUString&, bool); - DECL_DLLPRIVATE_LINK(EditModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(EditModifyHdl, weld::TextWidget&, void); void ModifyHdl(); void SetPasswdText(); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index c9f3b7a3d2fa..c97c855b6126 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -39,6 +39,7 @@ namespace weld class ComboBox; class Entry; class MenuButton; +class TextWidget; class TreeView; class Window; } @@ -88,7 +89,7 @@ protected: SAL_DLLPRIVATE void SearchUpdate(); - DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(GetFocusHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(LoseFocusHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void); @@ -155,7 +156,7 @@ private: std::unique_ptr mxOKButton; public: - DECL_LINK(NewCategoryEditHdl, weld::Entry&, void); + DECL_LINK(NewCategoryEditHdl, weld::TextWidget&, void); DECL_LINK(SelectCategoryHdl, weld::ItemView&, void); void SetCategoryLBEntries(std::vector names); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 7c9f01ed9b9a..13daeaf41e31 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -99,11 +99,11 @@ private: DECL_DLLPRIVATE_LINK(OKHdl, weld::Button&, void); DECL_DLLPRIVATE_LINK(DelHdl, weld::Button&, void); DECL_DLLPRIVATE_LINK(EditHdl, DetailsContainer*, void); - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); void SelectType(bool bSkipSeparator); DECL_DLLPRIVATE_LINK(SelectTypeHdl, weld::ComboBox&, void); - DECL_DLLPRIVATE_LINK(EditLabelHdl, weld::Entry&, void); - DECL_DLLPRIVATE_LINK(EditUsernameHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(EditLabelHdl, weld::TextWidget&, void); + DECL_DLLPRIVATE_LINK(EditUsernameHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/dlgname.hxx b/include/svtools/dlgname.hxx index 4f2eb40ce1d8..a46b957fd2c3 100644 --- a/include/svtools/dlgname.hxx +++ b/include/svtools/dlgname.hxx @@ -43,7 +43,7 @@ private: Link m_aCheckNameHdl; Link m_aCheckNameTooltipHdl; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: SvxNameDialog(weld::Window* pWindow, const OUString& rName, const OUString& rDesc, @@ -122,7 +122,7 @@ private: // callback link for name uniqueness Link aCheckNameHdl; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: // constructor diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 71fd5d7228bb..46c8b752ac2f 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -235,7 +235,7 @@ public: weld::Entry& get_widget() { return *m_pEntry; } - virtual void connect_changed(const Link& rLink) = 0; + virtual void connect_changed(const Link& rLink) = 0; virtual void connect_focus_in(const Link& rLink) = 0; virtual void connect_focus_out(const Link& rLink) = 0; virtual void connect_key_press(const Link& rLink) = 0; @@ -254,7 +254,7 @@ public: virtual void dispose() override; - virtual void connect_changed(const Link& rLink) override + virtual void connect_changed(const Link& rLink) override { m_xWidget->connect_changed(rLink); } @@ -283,7 +283,7 @@ class SVT_DLLPUBLIC EntryImplementation final : public IEditImplementation EditControlBase& m_rEdit; int m_nMaxTextLen; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: EntryImplementation(EditControlBase& rEdit) @@ -384,7 +384,7 @@ public: virtual void dispose() override; - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xWidget->connect_changed(rLink); } @@ -402,7 +402,7 @@ class SVT_DLLPUBLIC MultiLineEditImplementation final : public IEditImplementati MultiLineTextCell& m_rEdit; int m_nMaxTextLen; - DECL_LINK(ModifyHdl, weld::TextView&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: MultiLineEditImplementation(MultiLineTextCell& rEdit) @@ -688,7 +688,7 @@ public: virtual void dispose() override; - virtual void connect_changed(const Link& rLink) override; + virtual void connect_changed(const Link& rLink) override; virtual void connect_focus_in(const Link& rLink) override; virtual void connect_focus_out(const Link& rLink) override; virtual void connect_key_press(const Link& rLink) override; @@ -760,7 +760,7 @@ public: weld::PatternFormatter& get_formatter() { return *m_xEntryFormatter; } - virtual void connect_changed(const Link& rLink) override; + virtual void connect_changed(const Link& rLink) override; virtual void connect_focus_in(const Link& rLink) override; virtual void connect_focus_out(const Link& rLink) override; virtual void connect_key_press(const Link& rLink) override; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index a901ad590144..c733f0f9ea60 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -194,7 +194,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPFilter final : public SvxTPage DECL_DLLPRIVATE_LINK( SelDateHdl, weld::ComboBox&, void ); DECL_DLLPRIVATE_LINK( RowEnableHdl, weld::Toggleable&, void ); DECL_DLLPRIVATE_LINK( TimeHdl, weld::Button&, void ); - DECL_DLLPRIVATE_LINK( ModifyHdl, weld::Entry&, void ); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK( ModifyListBoxHdl, weld::ComboBox&, void ); DECL_DLLPRIVATE_LINK( ModifyDate, SvtCalendarBox&, void ); DECL_DLLPRIVATE_LINK( ModifyTime, weld::FormattedSpinButton&, void ); diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx index 5950c521e4ce..b56dd1f54cdd 100644 --- a/include/svx/cuicharmap.hxx +++ b/include/svx/cuicharmap.hxx @@ -121,12 +121,12 @@ private: DECL_DLLPRIVATE_LINK(ReturnKeypressOnCharHdl, SvxShowCharSet&, void); DECL_DLLPRIVATE_LINK(FavClickHdl, SvxShowCharSet&, void); DECL_DLLPRIVATE_LINK(SearchCharHighlightHdl, SvxShowCharSet&, void); - DECL_DLLPRIVATE_LINK(DecimalCodeChangeHdl, weld::Entry&, void); - DECL_DLLPRIVATE_LINK(HexCodeChangeHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(DecimalCodeChangeHdl, weld::TextWidget&, void); + DECL_DLLPRIVATE_LINK(HexCodeChangeHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(CharFocusHdl, const CharAndFont&, void); DECL_DLLPRIVATE_LINK(InsertClickHdl, weld::Button&, void); DECL_DLLPRIVATE_LINK(FavSelectHdl, weld::Button&, void); - DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(SearchFieldGetFocusHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(UpdateFavHdl, void*, void); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 5a31351a377a..aee9fadf0d1b 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -111,7 +111,7 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController DECL_DLLPRIVATE_LINK( MousePosHdl, GraphCtrl*, void ); DECL_DLLPRIVATE_LINK( GraphSizeHdl, GraphCtrl*, void ); DECL_DLLPRIVATE_LINK( URLModifyHdl, weld::ComboBox&, void ); - DECL_DLLPRIVATE_LINK( EntryModifyHdl, weld::Entry&, void ); + DECL_DLLPRIVATE_LINK(EntryModifyHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK( URLLoseFocusHdl, weld::Widget&, void ); DECL_DLLPRIVATE_LINK( UpdateHdl, Timer *, void ); DECL_DLLPRIVATE_LINK( StateHdl, GraphCtrl*, void ); diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 99005ad67369..544c000d85f7 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -41,7 +41,7 @@ private: std::unique_ptr m_xOKBtn; DECL_DLLPRIVATE_LINK(ButtonHdl, weld::Button&, void); - DECL_DLLPRIVATE_LINK(EditModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(EditModifyHdl, weld::TextWidget&, void); public: SvxPasswordDialog(weld::Window* pParent, bool bDisableOldPassword); diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index f0e7cb8b7262..2fb6fd2cdcbf 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -39,7 +39,7 @@ private: bool m_bNegativeEnabled; bool m_bFontRelativeMode; - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); public: SvxRelativeField(std::unique_ptr pControl); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index ca9d326ecd3c..b383783063c4 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -110,7 +110,7 @@ class SvxRubyDialog final : public SfxModelessDialogController DECL_LINK(PositionHdl_Impl, weld::ComboBox&, void); DECL_LINK(AdjustHdl_Impl, weld::ComboBox&, void); DECL_LINK(CharStyleHdl_Impl, weld::ComboBox&, void); - DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(EditModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(EditFocusHdl_Impl, weld::Widget&, void); DECL_LINK(KeyUpDownHdl_Impl, const KeyEvent&, bool); DECL_LINK(KeyUpDownTabHdl_Impl, const KeyEvent&, bool); diff --git a/include/vcl/hexcolorcontrol.hxx b/include/vcl/hexcolorcontrol.hxx index a303e6175d74..aa7509cd9027 100644 --- a/include/vcl/hexcolorcontrol.hxx +++ b/include/vcl/hexcolorcontrol.hxx @@ -41,7 +41,7 @@ private: ImplSVEvent* m_nAsyncModifyEvent; DECL_DLLPRIVATE_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool); - DECL_DLLPRIVATE_LINK(ImplProcessModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ImplProcessModifyHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(OnAsyncModifyHdl, void*, void); public: HexColorControl(std::unique_ptr pEdit); diff --git a/include/vcl/weld/Entry.hxx b/include/vcl/weld/Entry.hxx index b2bc6139fc05..9e387d501a09 100644 --- a/include/vcl/weld/Entry.hxx +++ b/include/vcl/weld/Entry.hxx @@ -20,7 +20,7 @@ namespace weld class VCL_DLLPUBLIC Entry : virtual public TextWidget { protected: - Link m_aChangeHdl; + Link m_aChangeHdl; Link m_aInsertTextHdl; Link m_aActivateHdl; @@ -39,7 +39,7 @@ public: virtual void set_overwrite_mode(bool bOn) = 0; virtual bool get_overwrite_mode() const = 0; - virtual void connect_changed(const Link& rLink) { m_aChangeHdl = rLink; } + virtual void connect_changed(const Link& rLink) { m_aChangeHdl = rLink; } void connect_insert_text(const Link& rLink) { m_aInsertTextHdl = rLink; } // callback returns true to indicated no further processing of activate wanted void connect_activate(const Link& rLink) { m_aActivateHdl = rLink; } diff --git a/include/vcl/weld/EntryFormatter.hxx b/include/vcl/weld/EntryFormatter.hxx index f674eefd9203..a8cec87b52d2 100644 --- a/include/vcl/weld/EntryFormatter.hxx +++ b/include/vcl/weld/EntryFormatter.hxx @@ -16,6 +16,7 @@ namespace weld { class Entry; class FormattedSpinButton; +class TextWidget; class Widget; class VCL_DLLPUBLIC EntryFormatter : public Formatter @@ -52,7 +53,7 @@ public: handled transparently by the FormattedSpinButton for the user and the handlers can be set on the FormattedSpinButton */ - void connect_changed(const Link& rLink) { m_aModifyHdl = rLink; } + void connect_changed(const Link& rLink) { m_aModifyHdl = rLink; } void connect_focus_out(const Link& rLink) { m_aFocusOutHdl = rLink; } SAL_DLLPRIVATE virtual ~EntryFormatter() override; @@ -60,10 +61,10 @@ public: private: weld::Entry& m_rEntry; weld::FormattedSpinButton* m_pSpinButton; - Link m_aModifyHdl; + Link m_aModifyHdl; Link m_aFocusOutHdl; SelectionOptions m_eOptions; - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void); SAL_DLLPRIVATE void Init(); diff --git a/include/vcl/weld/EntryTreeView.hxx b/include/vcl/weld/EntryTreeView.hxx index e7d3a948591a..7ad86e3f7665 100644 --- a/include/vcl/weld/EntryTreeView.hxx +++ b/include/vcl/weld/EntryTreeView.hxx @@ -24,7 +24,7 @@ class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBox { private: DECL_DLLPRIVATE_LINK(ClickHdl, weld::ItemView&, void); - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); protected: std::unique_ptr m_xEntry; diff --git a/include/vcl/weld/PatternFormatter.hxx b/include/vcl/weld/PatternFormatter.hxx index 6a91af2c8cb4..a575695d0223 100644 --- a/include/vcl/weld/PatternFormatter.hxx +++ b/include/vcl/weld/PatternFormatter.hxx @@ -30,7 +30,7 @@ public: and "key-press" of the Entry so users that want to add their own listeners to those must set them through this formatter and not directly on that entry. */ - void connect_changed(const Link& rLink) { m_aModifyHdl = rLink; } + void connect_changed(const Link& rLink) { m_aModifyHdl = rLink; } void connect_focus_out(const Link& rLink) { m_aFocusOutHdl = rLink; } void connect_focus_in(const Link& rLink) { m_aFocusInHdl = rLink; } void connect_key_press(const Link& rLink) { m_aKeyPressHdl = rLink; } @@ -39,7 +39,7 @@ public: private: weld::Entry& m_rEntry; - Link m_aModifyHdl; + Link m_aModifyHdl; Link m_aFocusInHdl; Link m_aFocusOutHdl; Link m_aKeyPressHdl; @@ -52,7 +52,7 @@ private: SAL_DLLPRIVATE void EntryGainFocus(); SAL_DLLPRIVATE void EntryLostFocus(); - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::TextWidget&, void); DECL_DLLPRIVATE_LINK(FocusInHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void); DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); diff --git a/include/vcl/weld/TextView.hxx b/include/vcl/weld/TextView.hxx index c0dfe34ea3bb..40667f164acd 100644 --- a/include/vcl/weld/TextView.hxx +++ b/include/vcl/weld/TextView.hxx @@ -19,7 +19,7 @@ namespace weld class VCL_DLLPUBLIC TextView : virtual public TextWidget { protected: - Link m_aChangeHdl; + Link m_aChangeHdl; Link m_aVValueChangeHdl; void signal_changed(); @@ -32,7 +32,7 @@ public: virtual void set_max_length(int nChars) = 0; int get_height_rows(int nRows) const; - void connect_changed(const Link& rLink) { m_aChangeHdl = rLink; } + void connect_changed(const Link& rLink) { m_aChangeHdl = rLink; } // returns true if pressing up would move the cursor // doesn't matter if that move is to a previous line or to the start of the diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index f67ec65b84ea..00537fba6a40 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1011,7 +1011,7 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, ComboChangedHdl, weld::ComboBox&, void) mxFieldChangedAction->execute(); } -IMPL_LINK_NOARG(ScCheckListMenuControl, EdModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ScCheckListMenuControl, EdModifyHdl, weld::TextWidget&, void) { maSearchEditTimer.Start(); } diff --git a/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx b/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx index 5f43d92d4d82..f28d9f25a1e5 100644 --- a/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx +++ b/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx @@ -593,7 +593,7 @@ IMPL_LINK_NOARG(ScPivotCalcFieldDlg, CalcFieldNameSelected, weld::ComboBox&, voi } } -IMPL_LINK_NOARG(ScPivotCalcFieldDlg, CalcEntryChanged, weld::TextView&, void) +IMPL_LINK_NOARG(ScPivotCalcFieldDlg, CalcEntryChanged, weld::TextWidget&, void) { OUString aName = mxCalcNames->get_active_text(); OUString aCalc = mxCalculation->get_text().trim(); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 90fe34f444d9..86412196d164 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -813,7 +813,7 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorComboBoxHdl, weld::ComboBox&, rCtrl, void SeparatorHdl(&rCtrl); } -IMPL_LINK( ScImportAsciiDlg, SeparatorEditHdl, weld::Entry&, rEdit, void ) +IMPL_LINK(ScImportAsciiDlg, SeparatorEditHdl, weld::TextWidget&, rEdit, void) { SeparatorHdl(&rEdit); } diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 6144f4eb00aa..8b2edc540e92 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -451,7 +451,7 @@ void ScFunctionWin::DoEnter(bool bDoubleOrEnter) #* #************************************************************************/ -IMPL_LINK_NOARG(ScFunctionWin, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ScFunctionWin, ModifyHdl, weld::TextWidget&, void) { if (xCatBox->get_active() == LRU_CATEGORY || xCatBox->get_active() == FAVOURITES_CATEGORY) { diff --git a/sc/source/ui/inc/PivotCalcFieldDialog.hxx b/sc/source/ui/inc/PivotCalcFieldDialog.hxx index 444a0bc79245..e403f4113c30 100644 --- a/sc/source/ui/inc/PivotCalcFieldDialog.hxx +++ b/sc/source/ui/inc/PivotCalcFieldDialog.hxx @@ -90,7 +90,7 @@ private: DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(FieldListSelected, weld::ItemView&, void); DECL_LINK(CalcFieldNameSelected, weld::ComboBox&, void); - DECL_LINK(CalcEntryChanged, weld::TextView&, void); + DECL_LINK(CalcEntryChanged, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 34175321ebe9..47aabd3e4581 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -274,7 +274,7 @@ private: DECL_LINK(SearchEditTimeoutHdl, Timer*, void); DECL_LINK(ComboChangedHdl, weld::ComboBox&, void); - DECL_LINK(EdModifyHdl, weld::Entry&, void); + DECL_LINK(EdModifyHdl, weld::TextWidget&, void); DECL_LINK(EdActivateHdl, weld::Entry&, bool); DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index a8d3b0172683..c2e8d16bb674 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK(Impl_CloseHdl, weld::Button&, void); DECL_LINK(Impl_ScrollHdl, weld::ScrolledWindow&, void); - DECL_LINK(Impl_DataModifyHdl, weld::Entry&, void); + DECL_LINK(Impl_DataModifyHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dataproviderdlg.hxx b/sc/source/ui/inc/dataproviderdlg.hxx index e0c401fde9b4..18ff958ec7b3 100644 --- a/sc/source/ui/inc/dataproviderdlg.hxx +++ b/sc/source/ui/inc/dataproviderdlg.hxx @@ -68,8 +68,8 @@ private: DECL_LINK(TransformationListHdl, weld::Button&, void); DECL_LINK(ProviderSelectHdl, weld::ComboBox&, void); DECL_LINK(TransformationSelectHdl, weld::ComboBox&, void); - DECL_LINK(IDEditHdl, weld::Entry&, void); - DECL_LINK(URLEditHdl, weld::Entry&, void); + DECL_LINK(IDEditHdl, weld::TextWidget&, void); + DECL_LINK(URLEditHdl, weld::TextWidget&, void); DECL_LINK(ApplyBtnHdl, weld::Button&, void); DECL_LINK(BrowseBtnHdl, weld::Button&, void); diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index 74fa89175002..bee921b3c6ab 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -49,7 +49,7 @@ class DataStreamDlg : public weld::GenericDialogController std::unique_ptr m_xVclFrameMove; DECL_LINK(UpdateClickHdl, weld::Toggleable&, void); - DECL_LINK(UpdateHdl, weld::Entry&, void); + DECL_LINK(UpdateHdl, weld::TextWidget&, void); DECL_LINK(UpdateComboBoxHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index c86f4d5c43fd..d0787e2e31f8 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -86,7 +86,7 @@ private: DECL_LINK( SetSimilarityToggleHdl, weld::Toggleable&, void ); DECL_LINK( SelComboHdl, weld::ComboBox&, void ); DECL_LINK(SelTreeHdl, weld::ItemView&, void); - DECL_LINK( ModifyHdl, weld::Entry&, void ); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK( KeyInputHdl, const KeyEvent&, bool); public: diff --git a/sc/source/ui/inc/gototabdlg.hxx b/sc/source/ui/inc/gototabdlg.hxx index 22b914140bba..7c878b204b73 100644 --- a/sc/source/ui/inc/gototabdlg.hxx +++ b/sc/source/ui/inc/gototabdlg.hxx @@ -27,7 +27,7 @@ private: std::unique_ptr m_xLb; DECL_LINK(DblClkHdl, const weld::TreeIter&, bool); - DECL_LINK(FindNameHdl, weld::Entry&, void); + DECL_LINK(FindNameHdl, weld::TextWidget&, void); public: ScGoToTabDlg(weld::Window* pParent); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index eec90d5eb481..bfcd5ec4bfd4 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -86,7 +86,7 @@ private: DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(SelHdl, weld::ComboBox&, void); DECL_LINK(CheckBtnHdl, weld::Toggleable&, void); - DECL_LINK(CheckNameHdl, weld::Entry&, void); + DECL_LINK(CheckNameHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 7eb19e0c6c74..4adeafe5bdd8 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -71,7 +71,7 @@ private: DECL_LINK(CancelBtnHdl, weld::Button&, void); DECL_LINK(AddBtnHdl, weld::Button&, void); - DECL_LINK(NameModifyHdl, weld::Entry&, void); + DECL_LINK(NameModifyHdl, weld::TextWidget&, void); DECL_LINK(AssignGetFocusHdl, formula::RefEdit&, void); DECL_LINK(EdModifyCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(RefEdModifyHdl, formula::RefEdit&, void); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 5312f2561b04..2e97a8d2dfa7 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -101,7 +101,7 @@ private: DECL_LINK(CancelBtnHdl, weld::Button&, void); DECL_LINK(AddBtnHdl, weld::Button&, void); DECL_LINK(RemoveBtnHdl, weld::Button&, void); - DECL_LINK(EdModifyHdl, weld::Entry&, void); + DECL_LINK(EdModifyHdl, weld::TextWidget&, void); DECL_LINK(RefEdModifyHdl, formula::RefEdit&, void); DECL_LINK(EdModifyCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(AssignGetFocusHdl, formula::RefEdit&, void); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 5703316d6f13..db87b3a7adeb 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -77,7 +77,7 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); - DECL_LINK(PasswordModifyHdl, weld::Entry&, void); + DECL_LINK(PasswordModifyHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 915230953839..4f4016517671 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -131,7 +131,7 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(RadioBtnHdl, weld::Toggleable&, void); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); - DECL_LINK(PasswordModifyHdl, weld::Entry&, void); + DECL_LINK(PasswordModifyHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 8ec0f325cc72..453f14235547 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -123,7 +123,7 @@ private: DECL_LINK( CharSetHdl, weld::ComboBox&, void ); DECL_LINK( FirstRowHdl, weld::SpinButton&, void ); DECL_LINK( RbSepFixHdl, weld::Toggleable&, void ); - DECL_LINK( SeparatorEditHdl, weld::Entry&, void ); + DECL_LINK(SeparatorEditHdl, weld::TextWidget&, void); DECL_LINK( SeparatorClickHdl, weld::Toggleable&, void ); DECL_LINK( OtherOptionsClickHdl, weld::Toggleable&, void ); DECL_LINK( SeparatorComboBoxHdl, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 0c5141577368..e86b3570db75 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -32,8 +32,8 @@ private: void CheckPrefix(); void OnFocusPrefixInput(); - DECL_LINK( NumModifiedHdl, weld::Entry&, void ); - DECL_LINK( PrefixModifiedHdl, weld::Entry&, void ); + DECL_LINK(NumModifiedHdl, weld::TextWidget&, void); + DECL_LINK(PrefixModifiedHdl, weld::TextWidget&, void); DECL_LINK( PrefixEditOnFocusHdl, weld::Widget&, void ); private: diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 2f82aa45d141..51447fb8b870 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -46,7 +46,7 @@ public: private: void ResetSeparators(); - void OnFocusSeparatorInput(weld::Entry* pEdit); + void OnFocusSeparatorInput(weld::TextWidget* pEdit); void UpdateCustomCalcRadioButtons(bool bDefault); void LaunchCustomCalcSettings(); @@ -57,7 +57,7 @@ private: DECL_LINK(SepInsertTextHdl, OUString&, bool); DECL_LINK(ColSepInsertTextHdl, OUString&, bool); DECL_LINK(RowSepInsertTextHdl, OUString&, bool); - DECL_LINK(SepModifyHdl, weld::Entry&, void); + DECL_LINK(SepModifyHdl, weld::TextWidget&, void); DECL_LINK(SepEditOnFocusHdl, weld::Widget&, void); private: diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index acc8a1384a17..25a1e0ea8802 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -87,7 +87,7 @@ private: // Handler: DECL_LINK(LbSelectHdl, weld::ItemView&, void); DECL_LINK( BtnClickHdl, weld::Button&, void ); - DECL_LINK( EdEntriesModHdl, weld::TextView&, void); + DECL_LINK(EdEntriesModHdl, weld::TextWidget&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 88c8eecd239f..7f0e30df3b08 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -219,7 +219,7 @@ void ScDataFormDlg::FillCtrls() m_xSlider->vadjustment_set_value(m_nCurrentRow - m_nStartRow - 1); } -IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(ScDataFormDlg, Impl_DataModifyHdl, weld::TextWidget&, rEdit, void) { if (rEdit.get_value_changed_from_saved()) m_xBtnRestore->set_sensitive(true); diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index 68ad4e27c890..075e834ac759 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -885,15 +885,9 @@ IMPL_LINK_NOARG(ScDataProviderDlg, ProviderSelectHdl, weld::ComboBox&, void) isValid(); } -IMPL_LINK_NOARG(ScDataProviderDlg, IDEditHdl, weld::Entry&, void) -{ - isValid(); -} +IMPL_LINK_NOARG(ScDataProviderDlg, IDEditHdl, weld::TextWidget&, void) { isValid(); } -IMPL_LINK_NOARG(ScDataProviderDlg, URLEditHdl, weld::Entry&, void) -{ - isValid(); -} +IMPL_LINK_NOARG(ScDataProviderDlg, URLEditHdl, weld::TextWidget&, void) { isValid(); } IMPL_LINK_NOARG(ScDataProviderDlg, ApplyBtnHdl, weld::Button&, void) { diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 84980468c4ce..83caeade762f 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -66,7 +66,7 @@ IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::Toggleable&, void) { Update IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBox&, void) { UpdateEnable(); } -IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl, weld::Entry&, void) { UpdateEnable(); } +IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl, weld::TextWidget&, void) { UpdateEnable(); } void DataStreamDlg::UpdateEnable() { diff --git a/sc/source/ui/miscdlgs/gototabdlg.cxx b/sc/source/ui/miscdlgs/gototabdlg.cxx index 51dd1089ac43..da4c04f15e2b 100644 --- a/sc/source/ui/miscdlgs/gototabdlg.cxx +++ b/sc/source/ui/miscdlgs/gototabdlg.cxx @@ -59,7 +59,7 @@ IMPL_LINK_NOARG(ScGoToTabDlg, DblClkHdl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(ScGoToTabDlg, FindNameHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ScGoToTabDlg, FindNameHdl, weld::TextWidget&, void) { const OUString aMask = m_xEnNameMask->get_text(); m_xLb->clear(); diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b100cc8fc6ae..05351dae5b8e 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -327,7 +327,7 @@ IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBox&, void) ResetRenameInput(); } -IMPL_LINK_NOARG(ScMoveTableDlg, CheckNameHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ScMoveTableDlg, CheckNameHdl, weld::TextWidget&, void) { mbEverEdited = true; CheckNewTabName(); diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 290113449187..ce8043778c59 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -110,7 +110,7 @@ void ScTableProtectionDlg::Init() m_xBtnOk->connect_clicked(LINK(this, ScTableProtectionDlg, OKHdl)); - Link aLink = LINK(this, ScTableProtectionDlg, PasswordModifyHdl); + Link aLink = LINK(this, ScTableProtectionDlg, PasswordModifyHdl); m_xPassword1Edit->connect_changed(aLink); m_xPassword2Edit->connect_changed(aLink); @@ -157,7 +157,7 @@ IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(ScTableProtectionDlg, PasswordModifyHdl, weld::Entry&, rEntry, void) +IMPL_LINK(ScTableProtectionDlg, PasswordModifyHdl, weld::TextWidget&, rEntry, void) { OUString aPass1 = m_xPassword1Edit->get_text(); if (&rEntry == m_xPassword1Edit.get()) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 6860589e072a..6ae097cf696f 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -294,7 +294,7 @@ void ScRetypePassInputDlg::Init() m_xBtnRetypePassword->connect_toggled(LINK(this, ScRetypePassInputDlg, RadioBtnHdl)); m_xBtnRemovePassword->connect_toggled(LINK(this, ScRetypePassInputDlg, RadioBtnHdl)); m_xBtnMatchOldPass->connect_toggled(LINK(this, ScRetypePassInputDlg, CheckBoxHdl)); - Link aLink2 = LINK(this, ScRetypePassInputDlg, PasswordModifyHdl); + Link aLink2 = LINK(this, ScRetypePassInputDlg, PasswordModifyHdl); m_xPassword1Edit->connect_changed(aLink2); m_xPassword2Edit->connect_changed(aLink2); @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, weld::Toggleable&, void) CheckPasswordInput(); } -IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl, weld::TextWidget&, void) { CheckPasswordInput(); } diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 09ed2ebf5304..1d2ea8c9e08c 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -345,10 +345,7 @@ IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl, weld::Button&, void) AddPushed(); }; -IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl, weld::Entry&, void) -{ - IsNameValid(); -} +IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl, weld::TextWidget&, void) { IsNameValid(); } IMPL_LINK_NOARG(ScNameDefDlg, AssignGetFocusHdl, formula::RefEdit&, void) { diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index b7326b9c41e3..c11d65cc6e49 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -511,10 +511,7 @@ IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, weld::Toggleable&, void) NameModified(); } -IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl, weld::Entry&, void) -{ - NameModified(); -} +IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl, weld::TextWidget&, void) { NameModified(); } IMPL_LINK_NOARG(ScNameDlg, RefEdModifyHdl, formula::RefEdit&, void) { diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 8d877d8cecf0..5aced25ff812 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -154,15 +154,9 @@ void ScTpDefaultsOptions::OnFocusPrefixInput() maOldPrefixValue = m_xEdSheetPrefix->get_text(); } -IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl, weld::Entry&, void) -{ - CheckNumSheets(); -} +IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl, weld::TextWidget&, void) { CheckNumSheets(); } -IMPL_LINK_NOARG(ScTpDefaultsOptions, PrefixModifiedHdl, weld::Entry&, void) -{ - CheckPrefix(); -} +IMPL_LINK_NOARG(ScTpDefaultsOptions, PrefixModifiedHdl, weld::TextWidget&, void) { CheckPrefix(); } IMPL_LINK_NOARG(ScTpDefaultsOptions, PrefixEditOnFocusHdl, weld::Widget&, void) { diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 65e459a788e4..80560d29df2f 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -66,7 +66,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogContr mxEdSepArrayCol->connect_insert_text(LINK( this, ScTpFormulaOptions, ColSepInsertTextHdl )); mxEdSepArrayRow->connect_insert_text(LINK( this, ScTpFormulaOptions, RowSepInsertTextHdl )); - Link aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl ); + Link aLink = LINK(this, ScTpFormulaOptions, SepModifyHdl); mxEdSepFuncArg->connect_changed(aLink); mxEdSepArrayCol->connect_changed(aLink); mxEdSepArrayRow->connect_changed(aLink); @@ -96,7 +96,7 @@ void ScTpFormulaOptions::ResetSeparators() mxEdSepArrayRow->set_text(aArrayRow); } -void ScTpFormulaOptions::OnFocusSeparatorInput(weld::Entry* pEdit) +void ScTpFormulaOptions::OnFocusSeparatorInput(weld::TextWidget* pEdit) { if (!pEdit) return; @@ -247,7 +247,7 @@ IMPL_LINK(ScTpFormulaOptions, ColSepInsertTextHdl, OUString&, rTest, bool) return true; } -IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, weld::Entry&, rEdit, void ) +IMPL_LINK(ScTpFormulaOptions, SepModifyHdl, weld::TextWidget&, rEdit, void) { OnFocusSeparatorInput(&rEdit); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 7b314981b4ce..ead3f6bc953e 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -685,7 +685,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, weld::Button&, rBtn, void ) } } -IMPL_LINK_NOARG(ScTpUserLists, EdEntriesModHdl, weld::TextView&, void) +IMPL_LINK_NOARG(ScTpUserLists, EdEntriesModHdl, weld::TextWidget&, void) { if ( mxBtnCopy->get_sensitive() ) { diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index fd2d1d368295..34a2f713f2b5 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -1152,7 +1152,7 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg, ResetHdl_Impl, weld::Button&, void) Reset(&rFirstStateSet); } -IMPL_LINK(SvxBulletAndPositionDlg, EditModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxBulletAndPositionDlg, EditModifyHdl_Impl, weld::TextWidget&, rEdit, void) { EditModifyHdl_Impl(&rEdit); } @@ -1259,7 +1259,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, RelativeHdl_Impl, weld::Toggleable&, rBox, vo bLastRelative = bOn; } -void SvxBulletAndPositionDlg::EditModifyHdl_Impl(const weld::Entry* pEdit) +void SvxBulletAndPositionDlg::EditModifyHdl_Impl(const weld::TextWidget* pEdit) { bool bPrefixOrSuffix = (pEdit == m_xPrefixED.get()) || (pEdit == m_xSuffixED.get()); bool bStart = pEdit == m_xStartED.get(); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index c2258fceb2fc..33887366eafb 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -333,7 +333,7 @@ IMPL_LINK(SdDefineCustomShowDlg, ClickButtonHdl4, weld::ItemView&, rListBox, voi ClickButtonHdl2(&rListBox); } -IMPL_LINK( SdDefineCustomShowDlg, ClickButtonEditHdl, weld::Entry&, rEdit, void ) +IMPL_LINK(SdDefineCustomShowDlg, ClickButtonEditHdl, weld::TextWidget&, rEdit, void) { ClickButtonHdl2(&rEdit); } diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 7d801cfe2f13..34a3271875a5 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -137,7 +137,7 @@ class SvxBulletAndPositionDlg final : public weld::GenericDialogController DECL_LINK(BulletHdl_Impl, weld::Button&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); - DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(EditModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(SpinModifyHdl_Impl, weld::SpinButton&, void); DECL_LINK(BulColorHdl_Impl, ColorListBox&, void); DECL_LINK(BulRelSizeHdl_Impl, weld::MetricSpinButton&, void); @@ -149,7 +149,7 @@ class SvxBulletAndPositionDlg final : public weld::GenericDialogController DECL_LINK(SelectRightAlignmentHdl_Impl, weld::Toggleable&, void); DECL_LINK(ApplyToMasterHdl_Impl, weld::Toggleable&, void); DECL_LINK(ResetHdl_Impl, weld::Button&, void); - void EditModifyHdl_Impl(const weld::Entry*); + void EditModifyHdl_Impl(const weld::TextWidget*); void InitPosAndSpaceMode(); void SetAlignmentHdl_Impl(SvxAdjust); diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 3b204c0e1f24..6113243c0eeb 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -75,7 +75,7 @@ private: void CheckCustomShow(); DECL_LINK( ClickButtonHdl, weld::Button&, void ); - DECL_LINK( ClickButtonEditHdl, weld::Entry&, void ); + DECL_LINK(ClickButtonEditHdl, weld::TextWidget&, void); DECL_LINK(ClickButtonHdl3, weld::ItemView&, void); DECL_LINK(ClickButtonHdl4, weld::ItemView&, void); DECL_LINK( OKHdl, weld::Button&, void ); diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx b/sfx2/inc/commandpopup/CommandPopup.hxx index f14482414c73..b08cb0c8cbb1 100644 --- a/sfx2/inc/commandpopup/CommandPopup.hxx +++ b/sfx2/inc/commandpopup/CommandPopup.hxx @@ -93,7 +93,7 @@ private: DECL_LINK(QueryTooltip, const weld::TreeIter&, OUString); DECL_LINK(RowActivated, const weld::TreeIter&, bool); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(TreeViewKeyPress, const KeyEvent&, bool); void DispatchSelectedCommand(); diff --git a/sfx2/inc/inputdlg.hxx b/sfx2/inc/inputdlg.hxx index d197fa8ab87b..0cc127b55a8c 100644 --- a/sfx2/inc/inputdlg.hxx +++ b/sfx2/inc/inputdlg.hxx @@ -23,7 +23,7 @@ private: std::unique_ptr m_xHelp; std::unique_ptr m_xOk; std::function mCheckEntry; - DECL_LINK(EntryChangedHdl, weld::Entry&, void); + DECL_LINK(EntryChangedHdl, weld::TextWidget&, void); public: InputDialog(weld::Widget* pParent, const OUString& rLabelText); diff --git a/sfx2/inc/saveastemplatedlg.hxx b/sfx2/inc/saveastemplatedlg.hxx index 32f9631965b2..124bf7736261 100644 --- a/sfx2/inc/saveastemplatedlg.hxx +++ b/sfx2/inc/saveastemplatedlg.hxx @@ -41,7 +41,7 @@ private: public: DECL_LINK(OkClickHdl, weld::Button&, void); - DECL_LINK(TemplateNameEditHdl, weld::Entry&, void); + DECL_LINK(TemplateNameEditHdl, weld::TextWidget&, void); DECL_LINK(SelectCategoryHdl, weld::ItemView&, void); void initialize(); diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index a727140015d5..155e09e96c58 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -57,7 +57,8 @@ class SvDDELinkEditDialog : public weld::GenericDialogController std::unique_ptr m_xEdDdeItem; std::unique_ptr m_xOKButton; - DECL_LINK(EditHdl_Impl, weld::Entry&, void); + DECL_LINK(EditHdl_Impl, weld::TextWidget&, void); + public: SvDDELinkEditDialog(weld::Window* pParent, SvBaseLink const*); OUString GetCmd() const; @@ -93,7 +94,7 @@ OUString SvDDELinkEditDialog::GetCmd() const return sRet; } -IMPL_LINK_NOARG( SvDDELinkEditDialog, EditHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SvDDELinkEditDialog, EditHdl_Impl, weld::TextWidget&, void) { m_xOKButton->set_sensitive(!m_xEdDdeApp->get_text().isEmpty() && !m_xEdDdeTopic->get_text().isEmpty() && diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 585cbc42f1cf..7203c70e8b2e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -467,7 +467,7 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, TreeChangeHdl, weld::ItemView&, void) m_xIndexEntry->set_text(m_xIndexList->get_selected_text()); } -IMPL_LINK_NOARG(IndexTabPage_Impl, EntryChangeHdl, weld::Entry&, void) +IMPL_LINK_NOARG(IndexTabPage_Impl, EntryChangeHdl, weld::TextWidget&, void) { switch (nLastCharCode) { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index bdfcb5f64368..e679b9bf2952 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -120,7 +120,7 @@ private: DECL_LINK(AutoCompleteHdl, Timer*, void); DECL_LINK(TimeoutHdl, Timer*, void); DECL_LINK(TreeChangeHdl, weld::ItemView&, void); - DECL_LINK(EntryChangeHdl, weld::Entry&, void); + DECL_LINK(EntryChangeHdl, weld::TextWidget&, void); DECL_LINK(ActivateHdl, weld::Entry&, bool); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); diff --git a/sfx2/source/commandpopup/CommandPopup.cxx b/sfx2/source/commandpopup/CommandPopup.cxx index 7e56c42e0c25..4b858f02d3ef 100644 --- a/sfx2/source/commandpopup/CommandPopup.cxx +++ b/sfx2/source/commandpopup/CommandPopup.cxx @@ -259,7 +259,7 @@ IMPL_LINK(CommandListBox, TreeViewKeyPress, const KeyEvent&, rKeyEvent, bool) return false; } -IMPL_LINK_NOARG(CommandListBox, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(CommandListBox, ModifyHdl, weld::TextWidget&, void) { mpCommandTreeView->clear(); maCommandList.clear(); diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index 04f8d144a4a4..fd1053de103c 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -58,7 +58,7 @@ void InputDialog::setCheckEntry(const std::function& rFunc) m_xEntry->connect_changed(LINK(this, InputDialog, EntryChangedHdl)); } -IMPL_LINK_NOARG(InputDialog, EntryChangedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(InputDialog, EntryChangedHdl, weld::TextWidget&, void) { if (mCheckEntry(m_xEntry->get_text())) SetEntryMessageType(weld::EntryMessageType::Normal); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 78d8743f6084..f291be05777f 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -31,10 +31,7 @@ #include -IMPL_LINK_NOARG(SfxPasswordDialog, EditModifyHdl, weld::Entry&, void) -{ - ModifyHdl(); -} +IMPL_LINK_NOARG(SfxPasswordDialog, EditModifyHdl, weld::TextWidget&, void) { ModifyHdl(); } void SfxPasswordDialog::ModifyHdl() { @@ -252,7 +249,7 @@ SfxPasswordDialog::SfxPasswordDialog(weld::Widget* pParent, const OUString* pGro , moPasswordPolicy(officecfg::Office::Common:: Security::Scripting::PasswordPolicy::get()) , mbAsciiOnly(false) { - Link aLink = LINK(this, SfxPasswordDialog, EditModifyHdl); + Link aLink = LINK(this, SfxPasswordDialog, EditModifyHdl); m_xPassword1ED->connect_changed(aLink); m_xPassword2ED->connect_changed(aLink); Link aLink2 = LINK(this, SfxPasswordDialog, InsertTextHdl); diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index b693e03a7246..c5f76211b4c1 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -85,7 +85,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, weld::Button&, void) } } -IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, weld::TextWidget&, void) { msTemplateName = comphelper::string::strip(m_xTemplateNameEdit->get_text(), ' '); SelectCategoryHdl(*m_xLBCategory); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 97ef5dab4779..c0a7b7e863b3 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -777,7 +777,7 @@ IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, updateMenuItems(); } -IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, weld::TextWidget&, void) { m_aUpdateDataTimer.Start(); } @@ -1242,7 +1242,7 @@ SfxTemplateCategoryDialog::~SfxTemplateCategoryDialog() { } -IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, weld::TextWidget&, void) { OUString sParam = comphelper::string::strip(mxNewCategoryEdit->get_text(), ' '); mxLBCategory->set_sensitive(sParam.isEmpty()); diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 9f97df92c563..dfc2e158be82 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -522,7 +522,7 @@ class MatrixCreatorDialog final : public weld::GenericDialogController DECL_LINK(ButtonOkHdl, weld::Button&, void); DECL_LINK(ButtonCancelHdl, weld::Button&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); OUString mOldName; DECL_LINK(SpinButtonModifyHdl, weld::SpinButton&, void); DECL_LINK(RadioButtonModifyHdl, weld::Toggleable&, void); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 29f001aa05e6..a53081c75f0b 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2411,8 +2411,7 @@ IMPL_LINK_NOARG(MatrixCreatorDialog, ButtonCancelHdl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } - -IMPL_LINK(MatrixCreatorDialog, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(MatrixCreatorDialog, ModifyHdl, weld::TextWidget&, rEdit, void) { OUString newName = rEdit.get_text(); if (newName.isEmpty()) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 8a2409c76c06..d54482764ceb 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -333,7 +333,7 @@ namespace svt return convertLineEnd(rEntry.get_text().copy(nStartPos, nEndPos - nStartPos), eSeparator); } - IMPL_LINK_NOARG(MultiLineEditImplementation, ModifyHdl, weld::TextView&, void) + IMPL_LINK_NOARG(MultiLineEditImplementation, ModifyHdl, weld::TextWidget&, void) { CallModifyHdls(); } @@ -346,7 +346,7 @@ namespace svt m_pEditImplementation->SetModifyHdl( LINK(this, EditCellController, ModifyHdl) ); } - IMPL_LINK_NOARG(EntryImplementation, ModifyHdl, weld::Entry&, void) + IMPL_LINK_NOARG(EntryImplementation, ModifyHdl, weld::TextWidget&, void) { CallModifyHdls(); } @@ -466,7 +466,7 @@ namespace svt InitEditControlBase(m_bSpinVariant ? m_xSpinButton.get() : m_xEntry.get()); } - void FormattedControlBase::connect_changed(const Link& rLink) + void FormattedControlBase::connect_changed(const Link& rLink) { get_formatter().connect_changed(rLink); } @@ -625,7 +625,7 @@ namespace svt InitEditControlBase(m_xWidget.get()); } - void PatternControl::connect_changed(const Link& rLink) + void PatternControl::connect_changed(const Link& rLink) { m_xEntryFormatter->connect_changed(rLink); } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index a9d389591e29..3ff053957a26 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -312,18 +312,15 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditHdl, DetailsContainer*, void ) m_xBTOk->set_sensitive( !sName.isEmpty( ) && !sUrl.isEmpty( ) ); } -IMPL_LINK_NOARG( PlaceEditDialog, ModifyHdl, weld::Entry&, void ) -{ - EditHdl(nullptr); -} +IMPL_LINK_NOARG(PlaceEditDialog, ModifyHdl, weld::TextWidget&, void) { EditHdl(nullptr); } -IMPL_LINK_NOARG( PlaceEditDialog, EditLabelHdl, weld::Entry&, void ) +IMPL_LINK_NOARG(PlaceEditDialog, EditLabelHdl, weld::TextWidget&, void) { m_bLabelChanged = true; EditHdl(nullptr); } -IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, weld::Entry&, void ) +IMPL_LINK_NOARG(PlaceEditDialog, EditUsernameHdl, weld::TextWidget&, void) { for ( auto& rxDetailsContainer : m_aDetailsContainers ) { diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 826c56d7673a..2d6879d93b59 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -79,10 +79,7 @@ void DetailsContainer::notifyChange( ) m_aChangeHdl.Call( this ); } -IMPL_LINK_NOARG( DetailsContainer, ValueChangeHdl, weld::Entry&, void ) -{ - notifyChange( ); -} +IMPL_LINK_NOARG(DetailsContainer, ValueChangeHdl, weld::TextWidget&, void) { notifyChange(); } HostDetailsContainer::HostDetailsContainer(PlaceEditDialog* pDialog, sal_uInt16 nPort, OUString sScheme) : DetailsContainer( pDialog ), diff --git a/svtools/source/dialogs/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx index 9a0fb44aac4e..ce2827168afb 100644 --- a/svtools/source/dialogs/ServerDetailsControls.hxx +++ b/svtools/source/dialogs/ServerDetailsControls.hxx @@ -58,7 +58,7 @@ class DetailsContainer protected: void notifyChange( ); - DECL_LINK(ValueChangeHdl, weld::Entry&, void); + DECL_LINK(ValueChangeHdl, weld::TextWidget&, void); DECL_STATIC_LINK(DetailsContainer, FormatPortHdl, sal_Int64, OUString); }; diff --git a/svtools/source/dialogs/dlgname.cxx b/svtools/source/dialogs/dlgname.cxx index 7845cc372bdd..8db47acd496d 100644 --- a/svtools/source/dialogs/dlgname.cxx +++ b/svtools/source/dialogs/dlgname.cxx @@ -45,7 +45,7 @@ SvxNameDialog::SvxNameDialog(weld::Window* pParent, const OUString& rName, const set_title(rTitle); } -IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::TextWidget&, void) { // Do not allow empty names, unless custom CheckNameHdl is specified bool bEnable; @@ -107,7 +107,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(weld::Window* pParent, const OUString& m_xEdtName->connect_changed(LINK(this, SvxObjectNameDialog, ModifyHdl)); } -IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, weld::TextWidget&, void) { if (aCheckNameHdl.IsSet()) { diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index d354521a5cbe..19fe0f7963bc 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -525,7 +525,7 @@ SvxTPFilter::SvxTPFilter(weld::Container* pParent) m_xTfDate->connect_value_changed(a3Link); m_xTfDate2->connect_value_changed(a3Link); - Link a4Link=LINK( this, SvxTPFilter, ModifyHdl); + Link a4Link = LINK(this, SvxTPFilter, ModifyHdl); m_xEdRange->connect_changed(a4Link); m_xEdComment->connect_changed(a4Link); m_xLbAction->connect_changed(LINK( this, SvxTPFilter, ModifyListBoxHdl)); @@ -860,10 +860,7 @@ IMPL_LINK(SvxTPFilter, TimeHdl, weld::Button&, rIB, void) m_bModified=true; } -IMPL_LINK_NOARG(SvxTPFilter, ModifyHdl, weld::Entry&, void) -{ - m_bModified=true; -} +IMPL_LINK_NOARG(SvxTPFilter, ModifyHdl, weld::TextWidget&, void) { m_bModified = true; } IMPL_LINK_NOARG(SvxTPFilter, ModifyListBoxHdl, weld::ComboBox&, void) { diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx index ed2c5806eaed..b7581374fa38 100644 --- a/svx/source/dialog/cuicharmap.cxx +++ b/svx/source/dialog/cuicharmap.cxx @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchFieldGetFocusHdl, weld::Widget&, void) m_xOKBtn->set_sensitive(false); } -IMPL_LINK_NOARG(SvxCharacterMap, SearchUpdateHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxCharacterMap, SearchUpdateHdl, weld::TextWidget&, void) { if (!m_xSearchText->get_text().isEmpty()) { @@ -733,12 +733,12 @@ void SvxCharacterMap::selectCharByCode(Radix radix) } } -IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, weld::TextWidget&, void) { selectCharByCode(Radix::decimal); } -IMPL_LINK_NOARG(SvxCharacterMap, HexCodeChangeHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxCharacterMap, HexCodeChangeHdl, weld::TextWidget&, void) { selectCharByCode(Radix::hexadecimal); } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index efd2b88cbb36..67d77910b4ca 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -604,10 +604,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl, weld::ComboBox&, void) URLModify(); } -IMPL_LINK_NOARG(SvxIMapDlg, EntryModifyHdl, weld::Entry&, void) -{ - URLModify(); -} +IMPL_LINK_NOARG(SvxIMapDlg, EntryModifyHdl, weld::TextWidget&, void) { URLModify(); } IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl, weld::Widget&, void) { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index e6d7175cf372..31d8681c04c4 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -56,7 +56,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, weld::TextWidget&, void) { if (!m_xOKBtn->get_sensitive()) m_xOKBtn->set_sensitive(true); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index f8ac1843621b..52be2088c3ba 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -33,7 +33,7 @@ SvxRelativeField::SvxRelativeField(std::unique_ptr pCont rSpinButton.connect_changed(LINK(this, SvxRelativeField, ModifyHdl)); } -IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::TextWidget&, void) { if (m_bRelativeMode) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 68b5ae06850a..ed390677797a 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -485,7 +485,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind Link aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl)); m_xScrolledWindow->connect_vadjustment_value_changed(aScrLk); - Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); + Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); Link aFocusLk(LINK(this, SvxRubyDialog, EditFocusHdl_Impl)); Link aKeyUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownHdl_Impl)); Link aKeyTabUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownTabHdl_Impl)); @@ -873,7 +873,7 @@ IMPL_LINK(SvxRubyDialog, EditFocusHdl_Impl, weld::Widget&, rEdit, void) m_xPreviewWin->Invalidate(); } -IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, weld::TextWidget&, rEdit, void) { EditFocusHdl_Impl(rEdit); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index fa4ad8e20eb1..13d9368e2ca8 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2638,7 +2638,7 @@ namespace svxform m_xDialog->response(RET_OK); } - IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl, weld::TextView&, void) + IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl, weld::TextWidget&, void) { m_aResultIdle.Start(); } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 7338112b8491..763bb875a571 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -1535,7 +1535,7 @@ void GalleryBrowser::FillThemeEntries() } maFoundThemeEntries.assign(maAllThemeEntries.begin(), maAllThemeEntries.end()); } -IMPL_LINK(GalleryBrowser, SearchHdl, weld::Entry&, searchEdit, void) +IMPL_LINK(GalleryBrowser, SearchHdl, weld::TextWidget&, searchEdit, void) { OUString search = searchEdit.get_text().trim(); OUString curThemeName; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index ffc4fcdac9b0..155d9f463d5b 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -425,7 +425,7 @@ namespace svxform std::unique_ptr m_xEditNamespacesBtn; std::unique_ptr m_xOKBtn; - DECL_LINK(ModifyHdl, weld::TextView&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(ResultHdl, Timer *, void); DECL_LINK(EditHdl, weld::Button&, void); DECL_LINK(OKHdl, weld::Button&, void); diff --git a/svx/source/inc/galbrws1.hxx b/svx/source/inc/galbrws1.hxx index 9c5ef0f08171..d75240346ba6 100644 --- a/svx/source/inc/galbrws1.hxx +++ b/svx/source/inc/galbrws1.hxx @@ -171,7 +171,7 @@ private: DECL_LINK(DragBeginHdl, bool&, bool); DECL_LINK(VisRowsScrolledHdl, weld::TreeView&, void); DECL_LINK(SizeAllocHdl, const Size&, void); - DECL_LINK(SearchHdl, weld::Entry&, void); + DECL_LINK(SearchHdl, weld::TextWidget&, void); static GalleryBrowserMode meInitMode; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index cd88e17d72b8..78f5346281dd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -457,7 +457,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsListBoxHdl, weld::ComboBox&, updateButtons(); } -IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl, weld::Entry&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl, weld::TextWidget&, void) { updateButtons(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 58abe7aea459..9edf2abc8a94 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -122,7 +122,7 @@ public: private: DECL_LINK( DirectionHdl, weld::Toggleable&, void ); - DECL_LINK( EditFieldsHdl, weld::Entry&, void ); + DECL_LINK(EditFieldsHdl, weld::TextWidget&, void); DECL_LINK( EditFieldsListBoxHdl, weld::ComboBox&, void ); DECL_LINK(MappingSelectHdl, weld::ItemView&, void); DECL_LINK( AddHdl, weld::Button&, void ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index e18cea8d4d77..73680506c4ad 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, weld::Toggleable&, void) m_bModified = true; } -void SwDropCapsPage::ModifyEntry(const weld::Entry& rEdit) +void SwDropCapsPage::ModifyEntry(const weld::TextWidget& rEdit) { OUString sPreview; @@ -686,10 +686,7 @@ void SwDropCapsPage::ModifyEntry(const weld::Entry& rEdit) m_bModified = true; } -IMPL_LINK(SwDropCapsPage, ModifyHdl, weld::Entry&, rEdit, void) -{ - ModifyEntry(rEdit); -} +IMPL_LINK(SwDropCapsPage, ModifyHdl, weld::TextWidget&, rEdit, void) { ModifyEntry(rEdit); } IMPL_LINK(SwDropCapsPage, ValueChangedHdl, weld::SpinButton&, rEdit, void) { diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index bb260c510205..dfb20549dd05 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -1020,7 +1020,7 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle m_xEdDelim->set_text(sDelim); m_xCategoryBox->connect_changed(LINK(this, SwCaptionOptPage, ModifyComboHdl)); - Link aLk = LINK(this, SwCaptionOptPage, ModifyEntryHdl); + Link aLk = LINK(this, SwCaptionOptPage, ModifyEntryHdl); m_xNumberingSeparatorED->connect_changed(aLk); m_xTextEdit->connect_changed(aLk); @@ -1397,10 +1397,7 @@ void SwCaptionOptPage::ModifyHdl() InvalidatePreview(); } -IMPL_LINK_NOARG(SwCaptionOptPage, ModifyEntryHdl, weld::Entry&, void) -{ - ModifyHdl(); -} +IMPL_LINK_NOARG(SwCaptionOptPage, ModifyEntryHdl, weld::TextWidget&, void) { ModifyHdl(); } IMPL_LINK_NOARG(SwCaptionOptPage, ModifyComboHdl, weld::ComboBox&, void) { diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index c9de6882dc1f..3a76235b439a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -93,7 +93,7 @@ class SwAddressControl_Impl std::vector> m_aLines; DECL_LINK(GotFocusHdl_Impl, weld::Widget&, void); - DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(EditModifyHdl_Impl, weld::TextWidget&, void); void MakeVisible(const tools::Rectangle& aRect); @@ -128,7 +128,8 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) } Link aFocusLink = LINK(this, SwAddressControl_Impl, GotFocusHdl_Impl); - Link aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl); + Link aEditModifyLink + = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl); sal_Int32 nLines = 0; for (const auto& rHeader : m_pData->aDBColumnHeaders) { @@ -196,7 +197,7 @@ void SwAddressControl_Impl::MakeVisible(const tools::Rectangle & rRect) } // copy data changes into database -IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, weld::TextWidget&, rEdit, void) { //get the data element number of the current set sal_Int32 nIndex = m_aEditLines[&rEdit]; @@ -485,7 +486,7 @@ IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, weld::Button&, rButton, v } } -IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl, weld::TextWidget&, void) { m_xSetNoNF->set_text(m_xSetNoED->get_text()); DBNumCursor(); @@ -584,7 +585,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl, weld::Button&, void) m_pParent->Find(m_xFindED->get_text(), nColumn); } -IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl, weld::TextWidget&, void) { m_xFindPB->set_sensitive(!m_xFindED->get_text().isEmpty()); } diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 53f91cc75b5e..667ed76b489a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -68,7 +68,7 @@ class SwCreateAddressListDialog : public SfxDialogController DECL_LINK(CustomizeHdl_Impl, weld::Button&, void); DECL_LINK(OkHdl_Impl, weld::Button&, void); DECL_LINK(DBCursorHdl_Impl, weld::Button&, void); - DECL_LINK(DBNumCursorHdl_Impl, weld::Entry&, void); + DECL_LINK(DBNumCursorHdl_Impl, weld::TextWidget&, void); DECL_LINK(RefreshNum_Impl, weld::Widget&, void); void DBNumCursor(); @@ -93,7 +93,7 @@ class SwFindEntryDialog : public weld::GenericDialogController std::unique_ptr m_xCancel; DECL_LINK(FindHdl_Impl, weld::Button&, void); - DECL_LINK(FindEnableHdl_Impl, weld::Entry&, void); + DECL_LINK(FindEnableHdl_Impl, weld::TextWidget&, void); DECL_LINK(CloseHdl_Impl, weld::Button&, void); public: diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index cc40ba754e2d..ed4e631f5e0e 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -171,7 +171,7 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog( ModifyHdl_Impl(*m_xFieldNameED); } -IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, weld::Entry&, rEdit, void) +IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, weld::TextWidget&, rEdit, void) { OUString sEntry = rEdit.get_text(); bool bFound = sEntry.isEmpty(); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 96bbeeb16bb4..42fbd94a16df 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -57,7 +57,8 @@ class SwAddRenameEntryDialog : public SfxDialogController std::unique_ptr m_xFieldNameED; std::unique_ptr m_xOK; - DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(ModifyHdl_Impl, weld::TextWidget&, void); + protected: SwAddRenameEntryDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const std::vector< OUString >& rCSVHeader); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 90d27b18b174..686963e742bf 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -155,7 +155,8 @@ namespace { class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { - DECL_LINK( ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); + public: SwSaveWarningBox_Impl(weld::Window* pParent, const OUString& rFileName); @@ -168,7 +169,8 @@ public: class SwSendQueryBox_Impl : public SwMessageAndEditDialog { bool m_bIsEmptyAllowed; - DECL_LINK( ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); + public: SwSendQueryBox_Impl(weld::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); @@ -207,7 +209,7 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(weld::Window* pParent, const OUStri ModifyHdl(*m_xEdit); } -IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwSaveWarningBox_Impl, ModifyHdl, weld::TextWidget&, rEdit, void) { m_xOKPB->set_sensitive(!rEdit.get_text().isEmpty()); } @@ -221,7 +223,7 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OUString& ModifyHdl(*m_xEdit); } -IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwSendQueryBox_Impl, ModifyHdl, weld::TextWidget&, rEdit, void) { m_xOKPB->set_sensitive(m_bIsEmptyAllowed || !rEdit.get_text().isEmpty()); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 80397203bb7c..1f424ff34a3d 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1129,7 +1129,7 @@ IMPL_LINK(SwEditRegionDlg, FileNameComboBoxHdl, weld::ComboBox&, rEdit, void) } // Applying of the filename or the linked region -IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::TextWidget&, rEdit, void) { int nStartPos, nEndPos; rEdit.get_selection_bounds(nStartPos, nEndPos); @@ -1283,7 +1283,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangePasswdHdl, weld::Button&, void) // the current region name is being added to the TreeListBox immediately during // editing, with empty string no Ok() -IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl, weld::TextWidget&, void) { if(!CheckPasswd()) return; @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl, weld::Entry&, void) } } -IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, weld::Entry&, rEdit, void ) +IMPL_LINK(SwEditRegionDlg, ConditionEditHdl, weld::TextWidget&, rEdit, void) { int nStartPos, nEndPos; rEdit.get_selection_bounds(nStartPos, nEndPos); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 44f12e62eacf..417c6304e07e 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -582,10 +582,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyComboHdl, weld::ComboBox&, void) Modify(); } -IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyEntryHdl, weld::Entry&, void) -{ - Modify(); -} +IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyEntryHdl, weld::TextWidget&, void) { Modify(); } bool SwSaveLabelDlg::GetLabel(SwLabItem& rItem) { diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 89847c96c4ae..513fe1ab50a1 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -123,7 +123,7 @@ class SwSaveLabelDlg : public weld::GenericDialogController std::unique_ptr m_xOKPB; DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(ModifyEntryHdl, weld::Entry&, void); + DECL_LINK(ModifyEntryHdl, weld::TextWidget&, void); DECL_LINK(ModifyComboHdl, weld::ComboBox&, void); void Modify(); diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx index ccff3464f4c3..597677cbd95b 100644 --- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx @@ -64,7 +64,10 @@ IMPL_LINK(DropDownFormFieldDialog, KeyPressedHdl, const KeyEvent&, rEvent, bool) return false; } -IMPL_LINK_NOARG(DropDownFormFieldDialog, EntryChangedHdl, weld::Entry&, void) { UpdateButtons(); } +IMPL_LINK_NOARG(DropDownFormFieldDialog, EntryChangedHdl, weld::TextWidget&, void) +{ + UpdateButtons(); +} IMPL_LINK(DropDownFormFieldDialog, ButtonPushedHdl, weld::Button&, rButton, void) { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index b11168e82e84..dcb6bf978533 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -502,10 +502,7 @@ IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl, weld::Button&, void) } // Modify -IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, weld::Entry&, void) -{ - CheckInsert(); -} +IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, weld::TextWidget&, void) { CheckInsert(); } void SwFieldDBPage::FillUserData() { diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index fef726d7214e..9e05cec37a85 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -52,7 +52,7 @@ class SwFieldDBPage : public SwFieldPage DECL_LINK(TypeListBoxHdl, weld::ItemView&, void); DECL_LINK( NumSelectHdl, weld::ComboBox&, void ); DECL_LINK(TreeSelectHdl, weld::ItemView&, void); - DECL_LINK( ModifyHdl, weld::Entry&, void ); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK( AddDBHdl, weld::Button&, void ); void TypeHdl(const weld::ItemView*); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 63d4fe3c2a85..241d17d460d6 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -134,7 +134,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) m_xListUpPB->connect_clicked(aListModifyLk); m_xListDownPB->connect_clicked(aListModifyLk); m_xListItemED->connect_activate(LINK(this, SwFieldFuncPage, ListModifyReturnActionHdl)); - Link aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl); + Link aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl); m_xListItemED->connect_changed(aListEnableLk); m_xListItemsLB->connect_selection_changed(LINK(this, SwFieldFuncPage, ListEnableListBoxHdl)); @@ -462,7 +462,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, weld::ItemView&, void) ListEnableHdl(*m_xListItemED); } -IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, weld::TextWidget&, void) { //enable "Add" button when text is in the Edit that's not already member of the box m_xListAddPB->set_sensitive(!m_xListItemED->get_text().isEmpty() && @@ -606,7 +606,7 @@ void SwFieldFuncPage::FillUserData() SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); } -IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, weld::TextWidget&, void) { const sal_Int32 nLen = m_xNameED->get_text().getLength(); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index a0e93a2f3295..e69729b7bb80 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -62,10 +62,10 @@ class SwFieldFuncPage : public SwFieldPage DECL_LINK(TypeHdl, weld::ItemView&, void); DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(InsertMacroHdl, const weld::TreeIter&, bool ); - DECL_LINK( ModifyHdl, weld::Entry&, void ); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK( ListModifyReturnActionHdl, weld::Entry&, bool ); DECL_LINK( ListModifyButtonHdl, weld::Button&, void ); - DECL_LINK( ListEnableHdl, weld::Entry&, void ); + DECL_LINK(ListEnableHdl, weld::TextWidget&, void); DECL_LINK(ListEnableListBoxHdl, weld::ItemView&, void); void ListModifyHdl(const weld::Widget*); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index b8aefc64b850..269a9f173b3e 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -139,7 +139,7 @@ SwFieldRefPage::~SwFieldRefPage() { } -IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl_Impl, weld::TextWidget&, void) { UpdateSubType(comphelper::string::strip(m_xFilterED->get_text(), ' ')); // tdf#135938 - refresh cross-reference name after filter selection has changed @@ -1003,7 +1003,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) } // Modify -IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, weld::TextWidget&, void) { OUString aName(m_xNameED->get_text()); const bool bEmptyName = aName.isEmpty(); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index b37c45eda18a..a9b0674b3777 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -67,8 +67,8 @@ class SwFieldRefPage : public SwFieldPage DECL_LINK(TypeHdl, weld::ItemView&, void); DECL_LINK(SubTypeListBoxHdl, weld::ItemView&, void); DECL_LINK(SubTypeTreeListBoxHdl, weld::ItemView&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); - DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); + DECL_LINK(ModifyHdl_Impl, weld::TextWidget&, void); DECL_LINK(FormatHdl, weld::ItemView&, void); void SubTypeHdl(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 31fbb8c7a1f3..c331824f9e50 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -841,12 +841,12 @@ void SwFieldVarPage::FillFormatLB(SwFieldTypesEnum nTypeId) } // Modify -IMPL_LINK_NOARG(SwFieldVarPage, ModifyValueHdl, weld::TextView&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ModifyValueHdl, weld::TextWidget&, void) { ModifyHdl(*m_xNameED); // apply/insert/delete status update } -IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, weld::TextWidget&, void) { OUString sValue(m_xValueED->get_text()); bool bHasValue = !sValue.isEmpty(); @@ -1134,7 +1134,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, weld::ComboBox&, void) SeparatorHdl(*m_xSeparatorED); } -IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, weld::TextWidget&, void) { bool bEnable = !m_xSeparatorED->get_text().isEmpty() || m_xChapterLevelLB->get_active() == 0; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index addaf1bc8695..41748e1a6642 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -59,11 +59,11 @@ class SwFieldVarPage : public SwFieldPage DECL_LINK(TypeHdl, weld::ItemView&, void); DECL_LINK(SubTypeListBoxHdl, weld::ItemView&, void); - DECL_LINK( ModifyHdl, weld::Entry&, void ); - DECL_LINK( ModifyValueHdl, weld::TextView&, void ); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); + DECL_LINK(ModifyValueHdl, weld::TextWidget&, void); DECL_LINK( TBClickHdl, weld::Button&, void ); DECL_LINK( ChapterHdl, weld::ComboBox&, void ); - DECL_LINK( SeparatorHdl, weld::Entry&, void ); + DECL_LINK(SeparatorHdl, weld::TextWidget&, void); DECL_LINK(SubTypeInsertHdl, const weld::TreeIter&, bool); void SubTypeHdl(const weld::ItemView*); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index bdfa1f0cb83f..7d77ad1b26c6 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -126,7 +126,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV) } m_xCategoryBox->connect_changed(LINK(this, SwCaptionDialog, ModifyComboHdl)); - Link aLk = LINK(this, SwCaptionDialog, ModifyEntryHdl); + Link aLk = LINK(this, SwCaptionDialog, ModifyEntryHdl); m_xTextEdit->connect_changed(aLk); m_xNumberingSeparatorED->connect_changed(aLk); m_xSepEdit->connect_changed(aLk); @@ -353,10 +353,7 @@ void SwCaptionDialog::ModifyHdl() DrawSample(); } -IMPL_LINK_NOARG(SwCaptionDialog, ModifyEntryHdl, weld::Entry&, void) -{ - ModifyHdl(); -} +IMPL_LINK_NOARG(SwCaptionDialog, ModifyEntryHdl, weld::TextWidget&, void) { ModifyHdl(); } IMPL_LINK_NOARG(SwCaptionDialog, ModifyComboHdl, weld::ComboBox&, void) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 0cb0696b9b9d..0baf35ca874c 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -3277,7 +3277,7 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) return bRet; } -IMPL_LINK_NOARG(SwFrameAddPage, EditModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwFrameAddPage, EditModifyHdl, weld::TextWidget&, void) { bool bEnable = !m_xNameED->get_text().isEmpty(); m_xAltNameED->set_sensitive(bEnable); diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 0143e8ee9af7..738c12e97365 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -112,7 +112,7 @@ class SwInsertBookmarkDlg final : public SfxDialogController std::unique_ptr m_xBookmarksBox; std::unique_ptr m_xForbiddenChars; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(InsertHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); DECL_LINK(EditTextHdl, weld::Button&, void); diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index 3d2097df4ae9..6eab27d0d2cc 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -20,6 +20,7 @@ #include #include +#include template class ConditionEdit; @@ -101,7 +102,10 @@ public: void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } - void connect_changed(const Link& rLink) { m_xControl->connect_changed(rLink); } + void connect_changed(const Link& rLink) + { + m_xControl->connect_changed(rLink); + } void replace_selection(const OUString& rText) { m_xControl->replace_selection(rText); } void hide() { m_xControl->hide(); } T& get_widget() { return *m_xControl; } diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index f75427189e44..0f17c12e7161 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -95,8 +95,8 @@ class SwEditRegionDlg final : public SfxDialogController DECL_LINK(GetFirstEntryHdl, weld::ItemView&, void); DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(NameEditHdl, weld::Entry&, void); - DECL_LINK(ConditionEditHdl, weld::Entry&, void); + DECL_LINK(NameEditHdl, weld::TextWidget&, void); + DECL_LINK(ConditionEditHdl, weld::TextWidget&, void); void ChangePasswd(bool bChange); DECL_LINK(TogglePasswdHdl, weld::Toggleable&, void); @@ -110,7 +110,7 @@ class SwEditRegionDlg final : public SfxDialogController DECL_LINK(FileSearchHdl, weld::Button&, void); DECL_LINK(OptionsHdl, weld::Button&, void); DECL_LINK(FileNameComboBoxHdl, weld::ComboBox&, void); - DECL_LINK(FileNameEntryHdl, weld::Entry&, void); + DECL_LINK(FileNameEntryHdl, weld::TextWidget&, void); DECL_LINK(DDEHdl, weld::Toggleable&, void); DECL_LINK(DlgClosedHdl, sfx2::FileDialogHelper*, void); DECL_LINK(SubRegionEventHdl, weld::ComboBox&, void); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 34ba8d246db2..4a1914080d0a 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1394,10 +1394,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyListBoxHdl, weld::ComboBox&, void) ModifyHdl(); } -IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyEntryHdl, weld::Entry&, void) -{ - ModifyHdl(); -} +IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyEntryHdl, weld::TextWidget&, void) { ModifyHdl(); } IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifySpinHdl, weld::SpinButton&, void) { @@ -1549,7 +1546,8 @@ class SwTOXEdit : public SwTOXWidget SwTokenWindow* m_pParent; std::unique_ptr m_xEntry; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); + public: SwTOXEdit(SwTokenWindow* pTokenWin, const SwFormToken& rToken) : m_xBuilder(Application::CreateBuilder(&pTokenWin->get_child_container(), @@ -1652,10 +1650,7 @@ public: void AdjustSize(); }; -IMPL_LINK_NOARG(SwTOXEdit, ModifyHdl, weld::Entry&, void) -{ - m_aModifiedLink.Call(*this); -} +IMPL_LINK_NOARG(SwTOXEdit, ModifyHdl, weld::TextWidget&, void) { m_aModifiedLink.Call(*this); } IMPL_LINK(SwTOXEdit, KeyInputHdl, const KeyEvent&, rKEvt, bool) { diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 65abd5e6caa2..52887ccfe6d6 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -658,7 +658,7 @@ class SwNewUserIdxDlg : public weld::GenericDialogController std::unique_ptr m_xOKPB; std::unique_ptr m_xNameED; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: explicit SwNewUserIdxDlg(SwIndexMarkPane* pPane, weld::Window* pParent) @@ -676,7 +676,7 @@ public: } -IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwNewUserIdxDlg, ModifyHdl, weld::TextWidget&, rEdit, void) { m_xOKPB->set_sensitive(!rEdit.get_text().isEmpty() && !m_pDlg->IsTOXType(rEdit.get_text())); } @@ -732,7 +732,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, ResetHdl, weld::Button&, void) UpdateDialog(); } -IMPL_LINK_NOARG(SwIndexMarkPane, GenericEntryModifiedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwIndexMarkPane, GenericEntryModifiedHdl, weld::TextWidget&, void) { SetModified(true); } @@ -749,7 +749,7 @@ IMPL_LINK(SwIndexMarkPane, ModifyListBoxHdl, weld::ComboBox&, rBox, void) ModifyHdl(rBox); } -IMPL_LINK(SwIndexMarkPane, ModifyEditHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwIndexMarkPane, ModifyEditHdl, weld::TextWidget&, rEdit, void) { SetModified(true); ModifyHdl(rEdit); @@ -999,7 +999,7 @@ void SwIndexMarkPane::UpdateDialog() } // Remind whether the edit boxes for Phonetic reading are changed manually -IMPL_LINK(SwIndexMarkPane, PhoneticEDModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwIndexMarkPane, PhoneticEDModifyHdl, weld::TextWidget&, rEdit, void) { SetModified(true); if (m_xPhoneticED0.get() == &rEdit) @@ -1152,7 +1152,7 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController { std::vector> m_aBuilders; - Link m_aShortNameCheckLink; + Link m_aShortNameCheckLink; SwWrtShell& m_rWrtSh; @@ -1176,7 +1176,7 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController weld::Entry* m_pTargetURLField; DECL_LINK(IdentifierHdl, weld::ComboBox&, void); - DECL_LINK(ShortNameHdl, weld::Entry&, void); + DECL_LINK(ShortNameHdl, weld::TextWidget&, void); DECL_LINK(EnableHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); DECL_LINK(PageNumHdl, weld::Toggleable&, void); @@ -1193,8 +1193,10 @@ public: OUString GetEntryText(ToxAuthorityField eField) const; - void SetCheckNameHdl(const Link& rLink) {m_aShortNameCheckLink = rLink;} - + void SetCheckNameHdl(const Link& rLink) + { + m_aShortNameCheckLink = rLink; + } }; struct TextInfo @@ -1528,9 +1530,9 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::Toggleable&, void) CompEntryHdl(*m_xEntryLB); } -IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, weld::TextWidget&, rEdit, void) { - Link aAllowed = LINK(this, SwAuthorMarkPane, IsEditAllowedHdl); + Link aAllowed = LINK(this, SwAuthorMarkPane, IsEditAllowedHdl); bool bResult = aAllowed.Call(rEdit); m_xActionBT->set_sensitive(bResult); if(bResult) @@ -1541,7 +1543,7 @@ IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, weld::Entry&, rEdit, void) } }; -IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, weld::Entry&, rEdit, bool) +IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, weld::TextWidget&, rEdit, bool) { OUString sEntry = rEdit.get_text(); bool bAllowed = false; @@ -1563,7 +1565,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, weld::Entry&, rEdit, bool) return bAllowed; } -IMPL_LINK(SwAuthorMarkPane, IsEditAllowedHdl, weld::Entry&, rEdit, bool) +IMPL_LINK(SwAuthorMarkPane, IsEditAllowedHdl, weld::TextWidget&, rEdit, bool) { OUString sEntry = rEdit.get_text(); bool bAllowed = false; @@ -1919,7 +1921,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBox&, rBox, void) SetFields(sFields, false); } -IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, weld::TextWidget&, rEdit, void) { if (m_aShortNameCheckLink.IsSet()) { diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 870075b0f7c8..6e78e24ff4b6 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; const char BookmarkTable::s_cSeparator(';'); // callback to modify EditBox -IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::TextWidget&, void) { ValidateBookmarks(); m_xBookmarksBox->unselect_all(); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 89b31f0039b1..22f0e36da251 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -334,7 +334,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyListBoxHdl, weld::ComboBox&, void) ModifyHdl(*m_xNameED); } -IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, weld::TextWidget&, void) { const OUString sEntry(m_xNameED->get_text()); bool bEnableNew = true; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 8cd691750505..c681aaf9044f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -124,7 +124,7 @@ class SwNewGlosNameDlg : public weld::GenericDialogController std::unique_ptr m_xOldShort; protected: - DECL_LINK(Modify, weld::Entry&, void); + DECL_LINK(Modify, weld::TextWidget&, void); DECL_LINK(Rename, weld::Button&, void); DECL_LINK(TextFilterHdl, OUString&, bool); @@ -486,7 +486,7 @@ std::unique_ptr SwGlossaryDlg::DoesBlockExist(std::u16string_vie return nullptr; } -IMPL_LINK(SwGlossaryDlg, NameModify, weld::Entry&, rEdit, void) +IMPL_LINK(SwGlossaryDlg, NameModify, weld::TextWidget&, rEdit, void) { const OUString aName(m_xNameED->get_text()); bool bNameED = &rEdit == m_xNameED.get(); @@ -933,7 +933,7 @@ void SwGlossaryDlg::Init() } // KeyInput for ShortName - Edits without Spaces -IMPL_LINK( SwNewGlosNameDlg, Modify, weld::Entry&, rBox, void ) +IMPL_LINK(SwNewGlosNameDlg, Modify, weld::TextWidget&, rBox, void) { OUString aName(m_xNewName->get_text()); SwGlossaryDlg* pDlg = m_pParent; diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 3a2156fccfdd..c687f9bbee6e 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -70,7 +70,7 @@ void SwInsFootNoteDlg::Apply() bFootnote = m_xFootnoteBtn->get_active(); } -IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, weld::TextWidget&, void) { m_xNumberCharBtn->set_active(true); m_xOkBtn->set_sensitive( !m_xNumberCharEdit->get_text().isEmpty() ); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index ed41091cf758..9948bf5dcea7 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, weld::Button&, void) } // modify -IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, weld::TextWidget&, void) { bool bEnable = m_xNumberingOnCB->get_active() && !m_xDivisorED->get_text().isEmpty(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 6685e261c6b2..24ae297444f7 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -64,7 +64,7 @@ class SwNumNamesDlg : public weld::GenericDialogController std::unique_ptr m_xFormBox; std::unique_ptr m_xOKBtn; - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); @@ -106,7 +106,7 @@ void SwNumNamesDlg::SetUserNames(const OUString* pList[]) } // unlock OK-Button when text is in Edit -IMPL_LINK(SwNumNamesDlg, ModifyHdl, weld::Entry&, rBox, void) +IMPL_LINK(SwNumNamesDlg, ModifyHdl, weld::TextWidget&, rBox, void) { m_xOKBtn->set_sensitive(!rBox.get_text().isEmpty()); } @@ -653,7 +653,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, weld::ComboBox&, void) SetModified(); } -IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify, weld::Entry&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify, weld::TextWidget&, void) { sal_uInt16 nMask = 1; for (sal_uInt16 i = 0; i < MAXLEVEL; i++) diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index c91833813df8..b9561c92ebc4 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK( SwInsTableDlg, ModifyName, weld::Entry&, rEdit, void ) +IMPL_LINK(SwInsTableDlg, ModifyName, weld::TextWidget&, rEdit, void) { OUString sTableName = rEdit.get_text(); m_xInsertBtn->set_sensitive(m_pShell->GetTableStyle(UIName(sTableName)) == nullptr); @@ -181,7 +181,7 @@ IMPL_LINK( SwInsTableDlg, ModifyName, weld::Entry&, rEdit, void ) // used weld::Entry's notification; specifically, we have to call spin buttons' get_text() instead // of get_value(), because the latter is not guaranteed to return an up-to-date value at this point // (depends on vcl plugin used). -IMPL_LINK( SwInsTableDlg, ModifyRowCol, weld::Entry&, rEdit, void ) +IMPL_LINK(SwInsTableDlg, ModifyRowCol, weld::TextWidget&, rEdit, void) { sal_Int64 nRow = m_xRowSpinButton->get_text().toInt64(); sal_Int64 nCol = m_xColSpinButton->get_text().toInt64(); diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index f0e5dcabca9f..b40bd0441eff 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -67,7 +67,7 @@ IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, weld::TextWidget&, rEdit, void) { OUString sTmp(rEdit.get_text()); diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx index 02ad1a190734..1c5549766680 100644 --- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx @@ -39,7 +39,7 @@ private: DECL_LINK(ListChangedHdl, weld::ItemView&, void); DECL_LINK(KeyPressedHdl, const KeyEvent&, bool); - DECL_LINK(EntryChangedHdl, weld::Entry&, void); + DECL_LINK(EntryChangedHdl, weld::TextWidget&, void); DECL_LINK(ButtonPushedHdl, weld::Button&, void); void InitControls(); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 3b6105fd28c2..efc1fd38f8c0 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -61,7 +61,7 @@ class SwCaptionDialog final : public SfxDialogController std::unique_ptr m_xPreview; DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void); - DECL_LINK(ModifyEntryHdl, weld::Entry&, void); + DECL_LINK(ModifyEntryHdl, weld::TextWidget&, void); DECL_LINK(ModifyComboHdl, weld::ComboBox&, void); DECL_LINK(OptionHdl, weld::Button&, void); DECL_LINK(CaptionHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index c41b2e4b2012..85d43e471ce3 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -140,12 +140,12 @@ friend class SwDropCapsPict; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); - void ModifyEntry(const weld::Entry& rEdit); + void ModifyEntry(const weld::TextWidget& rEdit); DECL_LINK(ClickHdl, weld::Toggleable&, void); DECL_LINK(MetricValueChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ValueChangedHdl, weld::SpinButton&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(WholeWordHdl, weld::Toggleable&, void); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 3c4d20911b84..1a4257d51f38 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -323,7 +323,7 @@ class SwFrameAddPage final : public SfxTabPage std::unique_ptr m_xTextFlowFT; std::unique_ptr m_xTextFlowLB; - DECL_LINK(EditModifyHdl, weld::Entry&, void); + DECL_LINK(EditModifyHdl, weld::TextWidget&, void); DECL_LINK(DecorativeHdl, weld::Toggleable&, void); DECL_LINK(ChainModifyHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 388ed5a4f79e..f2348c4a1e21 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -63,7 +63,7 @@ class SwGlossaryGroupDlg final : public SfxDialogController DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(NewHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void); DECL_LINK(RenameHdl, weld::Button&, void); DECL_STATIC_LINK(SwGlossaryGroupDlg, EditInsertTextHdl, OUString&, bool); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index bffacbc485a5..8850889be342 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -86,7 +86,7 @@ class SwGlossaryDlg final : public SfxDialogController void ShowPreview(); void SelectGroup(); - DECL_LINK( NameModify, weld::Entry&, void ); + DECL_LINK(NameModify, weld::TextWidget&, void); DECL_LINK(NameDoubleClick, const weld::TreeIter&, bool); DECL_LINK(GrpSelect, weld::ItemView&, void); DECL_LINK( MenuHdl, const OUString&, void ); diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 568b3ed8047d..530e03f21888 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -96,7 +96,7 @@ public: m_xWidget->select_region(nStartPos, nEndPos); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xWidget->connect_changed(rLink); } @@ -169,7 +169,7 @@ friend class InputEdit; void CleanupUglyHackWithUndo(); void DelBoxContent(); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); using Window::IsActive; diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 2926f7c343cb..5a5e0e6d1954 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -52,7 +52,7 @@ class SwInsFootNoteDlg final : public weld::GenericDialogController std::unique_ptr m_xNextBT; DECL_LINK(NumberToggleHdl, weld::Toggleable&, void); - DECL_LINK(NumberEditHdl, weld::Entry&, void); + DECL_LINK(NumberEditHdl, weld::TextWidget&, void); DECL_LINK(NumberExtCharHdl, weld::Button&, void); DECL_LINK(NextPrevHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 4d6fa7b4db3b..e2f8d4c1df70 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -69,8 +69,8 @@ class SwInsTableDlg final : public SfxDialogController DECL_LINK(TextFilterHdl, OUString&, bool); DECL_LINK(SelFormatHdl, weld::ItemView&, void); - DECL_LINK(ModifyName, weld::Entry&, void); - DECL_LINK(ModifyRowCol, weld::Entry&, void); + DECL_LINK(ModifyName, weld::TextWidget&, void); + DECL_LINK(ModifyRowCol, weld::TextWidget&, void); DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index bd59ff455614..8a98b51aa327 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -55,7 +55,7 @@ private: std::unique_ptr m_xNumRowsFT; DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(LineOnOffHdl, weld::Toggleable&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: SwLineNumberingDlg(const SwView& rVw); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 3886cea7b244..447413226c95 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -192,7 +192,7 @@ private: DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void); - DECL_LINK(ModifyEntryHdl, weld::Entry&, void); + DECL_LINK(ModifyEntryHdl, weld::TextWidget&, void); DECL_LINK(ModifyComboHdl, weld::ComboBox&, void); DECL_LINK(OrderHdl, weld::ComboBox&, void ); DECL_LINK(ShowEntryHdl, weld::ItemView&, void); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 36429f3b192b..da65342947c1 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -98,7 +98,7 @@ class SwOutlineSettingsTabPage final : public SfxTabPage DECL_LINK( CollSelect, weld::ComboBox&, void ); void CollSave(); DECL_LINK( NumberSelect, weld::ComboBox&, void ); - DECL_LINK( DelimModify, weld::Entry&, void ); + DECL_LINK(DelimModify, weld::TextWidget&, void); DECL_LINK( StartModified, weld::SpinButton&, void ); DECL_LINK( CharFormatHdl, weld::ComboBox&, void ); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index aa865392a718..95bb711a9594 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -38,7 +38,7 @@ class SwRenameXNamedDlg final : public weld::GenericDialogController DECL_LINK(TextFilterHdl, OUString&, bool); DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); public: SwRenameXNamedDlg(weld::Widget* pParent, diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index ab885977b401..fb1874205a69 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -210,7 +210,7 @@ class SwTOXSelectTabPage final : public SfxTabPage void LanguageHdl(const weld::ComboBox*); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void ); DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); - DECL_LINK(ModifyEntryHdl, weld::Entry&, void); + DECL_LINK(ModifyEntryHdl, weld::TextWidget&, void); DECL_LINK(ModifySpinHdl, weld::SpinButton&, void); DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index d677c0ee73e8..d7e7717aa50b 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -106,7 +106,7 @@ class SwIndexMarkPane DECL_LINK(InsertHdl, weld::Button&, void); DECL_LINK(CloseHdl, weld::Button&, void); DECL_LINK(ResetHdl, weld::Button&, void); - DECL_LINK(GenericEntryModifiedHdl, weld::Entry&, void); + DECL_LINK(GenericEntryModifiedHdl, weld::TextWidget&, void); DECL_LINK(GenericToggleModifiedHdl, weld::Toggleable&, void); DECL_LINK(SyncSelectionHdl, weld::Button&, void); DECL_LINK(DelHdl, weld::Button&, void); @@ -115,12 +115,12 @@ class SwIndexMarkPane DECL_LINK( PrevHdl, weld::Button&, void ); DECL_LINK( PrevSameHdl, weld::Button&, void ); DECL_LINK( ModifyListBoxHdl, weld::ComboBox&, void ); - DECL_LINK( ModifyEditHdl, weld::Entry&, void ); + DECL_LINK(ModifyEditHdl, weld::TextWidget&, void); void ModifyHdl(const weld::Widget& rWidget); DECL_LINK( KeyDCBModifyHdl, weld::ComboBox&, void ); DECL_LINK( NewUserIdxHdl, weld::Button&, void ); DECL_LINK( SearchTypeHdl, weld::Toggleable&, void ); - DECL_LINK( PhoneticEDModifyHdl, weld::Entry&, void ); + DECL_LINK(PhoneticEDModifyHdl, weld::TextWidget&, void); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), @@ -209,9 +209,9 @@ class SwAuthorMarkPane DECL_LINK(CreateEntryHdl, weld::Button&, void); DECL_LINK(CompEntryHdl, weld::ComboBox&, void); DECL_LINK(ChangeSourceHdl, weld::Toggleable&, void); - DECL_LINK(IsEditAllowedHdl, weld::Entry&, bool); - DECL_LINK(IsEntryAllowedHdl, weld::Entry&, bool); - DECL_LINK(EditModifyHdl, weld::Entry&, void); + DECL_LINK(IsEditAllowedHdl, weld::TextWidget&, bool); + DECL_LINK(IsEntryAllowedHdl, weld::TextWidget&, bool); + DECL_LINK(EditModifyHdl, weld::TextWidget&, void); void InitControls(); void Activate(); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 4d75e1a023c5..ecb9c1607845 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -471,7 +471,7 @@ void SwInputWindow::SetFormula( const OUString& rFormula ) m_bDelSel = true; } -IMPL_LINK_NOARG(SwInputWindow, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwInputWindow, ModifyHdl, weld::TextWidget&, void) { if (m_pWrtShell && m_bIsTable && m_bResetUndo) { diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 2a67e42563d3..9ab12d60279e 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -190,7 +190,8 @@ private: std::unique_ptr m_xLabel2; std::unique_ptr m_xOKButton; - DECL_LINK(InputModifiedHdl, weld::Entry&, void); + DECL_LINK(InputModifiedHdl, weld::TextWidget&, void); + public: SwNumberInputDlg(weld::Window* pParent, const OUString& rTitle, const OUString& rLabel1, const sal_Int64 nValue, const sal_Int64 min, const sal_Int64 max, @@ -221,7 +222,7 @@ public: } }; -IMPL_LINK_NOARG(SwNumberInputDlg, InputModifiedHdl, weld::Entry&, void) +IMPL_LINK_NOARG(SwNumberInputDlg, InputModifiedHdl, weld::TextWidget&, void) { m_xOKButton->set_sensitive(!m_xSpinButton->get_text().isEmpty()); if (!m_xOKButton->get_sensitive()) diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index fa1061eb9209..e13573d3d614 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -30,8 +30,7 @@ // MasterPasswordCreateDialog--------------------------------------------------- - -IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl, weld::TextWidget&, void) { OUString aPasswordText = m_xEDMasterPasswordCrt->get_text(); m_xOKBtn->set_sensitive(aPasswordText.getLength() >= 1); diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 7b5ec79cef6e..0e3ca1a85b79 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -39,7 +39,7 @@ private: std::optional m_oPasswordPolicy; DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(EditHdl_Impl, weld::Entry&, void); + DECL_LINK(EditHdl_Impl, weld::TextWidget&, void); public: MasterPasswordCreateDialog(weld::Window* pParent, const std::locale& rLocale); diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 9e934ce707c5..08d6ff989f0e 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -134,7 +134,7 @@ PasswordDialog::PasswordDialog(weld::Window* pParent, m_xOKBtn->connect_clicked(LINK(this, PasswordDialog, OKHdl_Impl)); } -IMPL_LINK_NOARG(PasswordDialog, EnableOKBtn_Impl, weld::Entry&, void) +IMPL_LINK_NOARG(PasswordDialog, EnableOKBtn_Impl, weld::TextWidget&, void) { bool bFirstPasswordHasText = !m_xEDPassword->get_text().isEmpty(); m_xOKBtn->set_sensitive(bFirstPasswordHasText); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index cc0a4b0475d4..804fad5ef7bd 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -41,7 +41,7 @@ class PasswordDialog : public weld::GenericDialogController DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(EnableOKBtn_Impl, weld::Entry&, void); + DECL_LINK(EnableOKBtn_Impl, weld::TextWidget&, void); DECL_LINK(ShowHdl, weld::Toggleable&, void); public: diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 121a773517e6..3787f5fb4c45 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -250,7 +250,7 @@ namespace vcl DECL_LINK( UIOption_RadioHdl, weld::Toggleable&, void ); DECL_LINK( UIOption_SelectHdl, weld::ComboBox&, void ); DECL_LINK( UIOption_SpinModifyHdl, weld::SpinButton&, void ); - DECL_LINK( UIOption_EntryModifyHdl, weld::Entry&, void ); + DECL_LINK(UIOption_EntryModifyHdl, weld::TextWidget&, void); css::beans::PropertyValue* getValueForWindow(weld::Widget*) const; diff --git a/vcl/inc/qt5/QtInstanceFormattedSpinButton.hxx b/vcl/inc/qt5/QtInstanceFormattedSpinButton.hxx index 6c3e75bc435e..c1364511777b 100644 --- a/vcl/inc/qt5/QtInstanceFormattedSpinButton.hxx +++ b/vcl/inc/qt5/QtInstanceFormattedSpinButton.hxx @@ -34,7 +34,7 @@ public: virtual QWidget* getQWidget() const override; - virtual void connect_changed(const Link& rLink) override; + virtual void connect_changed(const Link& rLink) override; virtual void connect_focus_out(const Link& rLink) override; virtual Formatter& GetFormatter() override; diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 952bb84101b1..d2cea3fc9471 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -2161,7 +2161,7 @@ public: virtual void do_set_text(const OUString& rText) override; - virtual void connect_changed(const Link& rLink) override; + virtual void connect_changed(const Link& rLink) override; virtual void connect_focus_out(const Link& rLink) override; diff --git a/vcl/qt5/QtInstanceFormattedSpinButton.cxx b/vcl/qt5/QtInstanceFormattedSpinButton.cxx index 11816f3d836f..452e118ade08 100644 --- a/vcl/qt5/QtInstanceFormattedSpinButton.cxx +++ b/vcl/qt5/QtInstanceFormattedSpinButton.cxx @@ -53,7 +53,7 @@ QtInstanceFormattedSpinButton::QtInstanceFormattedSpinButton(QtDoubleSpinBox* pS QWidget* QtInstanceFormattedSpinButton::getQWidget() const { return m_pSpinBox; } -void QtInstanceFormattedSpinButton::connect_changed(const Link& rLink) +void QtInstanceFormattedSpinButton::connect_changed(const Link& rLink) { if (m_pFormatter) { @@ -87,7 +87,7 @@ Formatter& QtInstanceFormattedSpinButton::GetFormatter() auto aFocusOutHdl = m_aFocusOutHdl; m_aFocusOutHdl = Link(); auto aChangeHdl = m_aChangeHdl; - m_aChangeHdl = Link(); + m_aChangeHdl = Link(); m_xOwnFormatter = std::make_unique(*this); m_xOwnFormatter->SetMinValue(m_pSpinBox->minimum()); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7d8f470972e5..eaeec014bdab 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -5369,7 +5369,7 @@ void SalInstanceFormattedSpinButton::do_set_text(const OUString& rText) m_xButton->SpinField::SetText(rText); } -void SalInstanceFormattedSpinButton::connect_changed(const Link& rLink) +void SalInstanceFormattedSpinButton::connect_changed(const Link& rLink) { if (!m_pFormatter) // once a formatter is set, it takes over "changed" { diff --git a/vcl/source/weld/EntryFormatter.cxx b/vcl/source/weld/EntryFormatter.cxx index f3b0e79da0ed..c929542d7998 100644 --- a/vcl/source/weld/EntryFormatter.cxx +++ b/vcl/source/weld/EntryFormatter.cxx @@ -34,7 +34,7 @@ EntryFormatter::EntryFormatter(weld::Entry& rEntry) EntryFormatter::~EntryFormatter() { - m_rEntry.connect_changed(Link()); + m_rEntry.connect_changed(Link()); m_rEntry.connect_focus_out(Link()); if (m_pSpinButton) m_pSpinButton->SetFormatter(nullptr); @@ -116,7 +116,7 @@ SelectionOptions EntryFormatter::GetEntrySelectionOptions() const { return m_eOp void EntryFormatter::FieldModified() { m_aModifyHdl.Call(m_rEntry); } -IMPL_LINK_NOARG(EntryFormatter, ModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(EntryFormatter, ModifyHdl, weld::TextWidget&, void) { // This leads to FieldModified getting called at the end of Modify() and // FieldModified then calls any modification callback diff --git a/vcl/source/weld/EntryTreeView.cxx b/vcl/source/weld/EntryTreeView.cxx index 1050a27dfea4..dddfc136d021 100644 --- a/vcl/source/weld/EntryTreeView.cxx +++ b/vcl/source/weld/EntryTreeView.cxx @@ -25,7 +25,7 @@ IMPL_LINK(EntryTreeView, ClickHdl, weld::ItemView&, rView, void) m_aChangeHdl.Call(*this); } -IMPL_LINK_NOARG(EntryTreeView, ModifyHdl, weld::Entry&, void) { m_aChangeHdl.Call(*this); } +IMPL_LINK_NOARG(EntryTreeView, ModifyHdl, weld::TextWidget&, void) { m_aChangeHdl.Call(*this); } void EntryTreeView::set_height_request_by_rows(int nRows) { diff --git a/vcl/source/weld/PatternFormatter.cxx b/vcl/source/weld/PatternFormatter.cxx index fe775d74b749..171188bbde7a 100644 --- a/vcl/source/weld/PatternFormatter.cxx +++ b/vcl/source/weld/PatternFormatter.cxx @@ -24,7 +24,7 @@ PatternFormatter::PatternFormatter(weld::Entry& rEntry) m_rEntry.connect_key_press(LINK(this, PatternFormatter, KeyInputHdl)); } -IMPL_LINK_NOARG(PatternFormatter, ModifyHdl, weld::Entry&, void) { Modify(); } +IMPL_LINK_NOARG(PatternFormatter, ModifyHdl, weld::TextWidget&, void) { Modify(); } IMPL_LINK_NOARG(PatternFormatter, FocusOutHdl, weld::Widget&, void) { @@ -40,7 +40,7 @@ IMPL_LINK_NOARG(PatternFormatter, FocusInHdl, weld::Widget&, void) PatternFormatter::~PatternFormatter() { - m_rEntry.connect_changed(Link()); + m_rEntry.connect_changed(Link()); m_rEntry.connect_focus_out(Link()); } } diff --git a/vcl/source/window/hexcolorcontrol.cxx b/vcl/source/window/hexcolorcontrol.cxx index 64ebb8ac19ca..a8fc34036491 100644 --- a/vcl/source/window/hexcolorcontrol.cxx +++ b/vcl/source/window/hexcolorcontrol.cxx @@ -48,7 +48,7 @@ IMPL_LINK_NOARG(HexColorControl, OnAsyncModifyHdl, void*, void) // tdf#123291 resend it async so it arrives after ImplProcessInputHdl has been // processed -IMPL_LINK_NOARG(HexColorControl, ImplProcessModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(HexColorControl, ImplProcessModifyHdl, weld::TextWidget&, void) { if (m_nAsyncModifyEvent) Application::RemoveUserEvent(m_nAsyncModifyEvent); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f9ab836db53e..5d262e492c04 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -2431,7 +2431,7 @@ IMPL_LINK( PrintDialog, UIOption_SpinModifyHdl, weld::SpinButton&, i_rBox, void } } -IMPL_LINK( PrintDialog, UIOption_EntryModifyHdl, weld::Entry&, i_rBox, void ) +IMPL_LINK(PrintDialog, UIOption_EntryModifyHdl, weld::TextWidget&, i_rBox, void) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal && mxPageRangesRadioButton->get_active() ) diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index f1f4c9426c2a..43fd16c64c70 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -361,7 +361,7 @@ sal_uLong RTSDevicePage::getColorDevice() const return 0; } -IMPL_LINK(RTSDevicePage, ModifyHdl, weld::Entry&, rEdit, void) +IMPL_LINK(RTSDevicePage, ModifyHdl, weld::TextWidget&, rEdit, void) { if (m_pCustomValue) { diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index f9645b7d9527..1c05632a689f 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -127,7 +127,7 @@ private: Idle m_aReselectCustomIdle; DECL_LINK(SelectHdl, weld::ItemView&, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_LINK(ModifyHdl, weld::TextWidget&, void); DECL_LINK(ComboChangedHdl, weld::ComboBox&, void); DECL_LINK(ImplHandleReselectHdl, Timer*, void); diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 2109d42b8f59..a120939cf79e 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -17179,7 +17179,7 @@ public: m_dValueWhenEmpty = gtk_spin_button_get_value(m_pButton); } - virtual void connect_changed(const Link& rLink) override + virtual void connect_changed(const Link& rLink) override { if (!m_pFormatter) // once a formatter is set, it takes over "changed" { @@ -17215,7 +17215,7 @@ public: auto aFocusOutHdl = m_aFocusOutHdl; m_aFocusOutHdl = Link(); auto aChangeHdl = m_aChangeHdl; - m_aChangeHdl = Link(); + m_aChangeHdl = Link(); double fValue = gtk_spin_button_get_value(m_pButton); double fMin, fMax; diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index c9755033f89e..dfbe0ea36ee8 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -84,7 +84,7 @@ private: DECL_LINK(ViewButtonHdl, weld::Button&, void); DECL_LINK(CertificateHighlightHdl, weld::ItemView&, void); DECL_LINK(CertificateSelectHdl, const weld::TreeIter&, bool); - DECL_LINK(SearchModifyHdl, weld::Entry&, void); + DECL_LINK(SearchModifyHdl, weld::TextWidget&, void); void ImplShowCertificateDetails(); void ImplInitialize(bool mbSearch = false); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index f2b90deaae21..b286b324b2eb 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -416,7 +416,7 @@ IMPL_LINK_NOARG(CertificateChooser, ReloadButtonHdl, weld::Button&, void) ImplInitialize(); } -IMPL_LINK_NOARG(CertificateChooser, SearchModifyHdl, weld::Entry&, void) +IMPL_LINK_NOARG(CertificateChooser, SearchModifyHdl, weld::TextWidget&, void) { ImplInitialize(true); }