[Libreoffice-commits] core.git: include/svtools svtools/source svx/source

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx     |    4 ++--
 svtools/source/brwbox/ebbcontrols.cxx |    2 +-
 svx/source/fmcomp/gridcell.cxx        |    8 ++++----
 svx/source/inc/gridcell.hxx           |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 52aae0c8cd63cf68976bb1c464049cf00d3f942e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 19 10:54:34 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 19 15:23:07 2021 +0200

    pass CheckButton argument instead of its Button baseclass
    
    Change-Id: I76f446266fcc74ba2db928ef1c5e764eead57997
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115801
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 20a302f75b61..4e0fd518efaa 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -515,7 +515,7 @@ namespace svt
     {
         std::unique_ptr<weld::CheckButton> m_xBox;
         weld::TriStateEnabled m_aModeState;
-        Link<weld::Button&,void> m_aClickLink;
+        Link<weld::CheckButton&,void> m_aToggleLink;
         Link<LinkParamNone*,void> m_aModify1Hdl;
         Link<LinkParamNone*,void> m_aModify2Hdl;
 
@@ -524,7 +524,7 @@ namespace svt
         virtual ~CheckBoxControl() override;
         virtual void dispose() override;
 
-        void SetClickHdl(const Link<weld::Button&,void>& rHdl) {m_aClickLink = rHdl;}
+        void SetToggleHdl(const Link<weld::CheckButton&,void>& rHdl) {m_aToggleLink = rHdl;}
 
         // sets a link to call when the text is changed by the user
         void SetModifyHdl(const Link<LinkParamNone*,void>& rHdl)
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index ef783529e6a5..5af701fba0fb 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -234,7 +234,7 @@ namespace svt
     IMPL_LINK_NOARG(CheckBoxControl, OnToggle, weld::ToggleButton&, void)
     {
         m_aModeState.ButtonToggled(*m_xBox);
-        m_aClickLink.Call(*m_xBox);
+        m_aToggleLink.Call(*m_xBox);
         CallModifyHdls();
     }
 
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 212a06a30aca..e1f01621024e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2625,7 +2625,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
 DbFilterField::~DbFilterField()
 {
     if (m_nControlClass == css::form::FormComponentType::CHECKBOX)
-        static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link<weld::Button&,void>() );
+        static_cast<CheckBoxControl*>(m_pWindow.get())->SetToggleHdl(Link<weld::CheckButton&,void>());
 
 }
 
@@ -2686,7 +2686,7 @@ void DbFilterField::CreateControl(BrowserDataWin* pParent, const Reference< css:
         case css::form::FormComponentType::CHECKBOX:
             m_pWindow = VclPtr<CheckBoxControl>::Create(pParent);
             m_pWindow->SetPaintTransparent( true );
-            static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( LINK( this, DbFilterField, OnClick ) );
+            static_cast<CheckBoxControl*>(m_pWindow.get())->SetToggleHdl(LINK(this, DbFilterField, OnToggle));
 
             m_pPainter = VclPtr<CheckBoxControl>::Create(pParent);
             m_pPainter->SetPaintTransparent( true );
@@ -3057,7 +3057,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co
     OSL_FAIL( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" );
 }
 
-IMPL_LINK_NOARG(DbFilterField, OnClick, weld::Button&, void)
+IMPL_LINK_NOARG(DbFilterField, OnToggle, weld::CheckButton&, void)
 {
     TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetState();
     OUStringBuffer aTextBuf;
@@ -3778,7 +3778,7 @@ void FmXCheckBoxCell::disposing()
     m_aItemListeners.disposeAndClear(aEvt);
     m_aActionListeners.disposeAndClear(aEvt);
 
-    m_pBox->SetClickHdl(Link<weld::Button&,void>());
+    m_pBox->SetToggleHdl(Link<weld::CheckButton&,void>());
     m_pBox = nullptr;
 
     FmXDataCell::disposing();
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 3966a4954a15..0ffeebcf84b2 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -672,7 +672,7 @@ private:
 
     void SetList(const css::uno::Any& rItems, bool bComboBox);
     void CreateControl(BrowserDataWin* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel);
-    DECL_LINK( OnClick, weld::Button&, void );
+    DECL_LINK(OnToggle, weld::CheckButton&, void);
 
     css::uno::Sequence< OUString >  m_aValueList;
     OUString    m_aText;