summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-22 16:29:34 +0000
committerMichael Stahl <michael.stahl@allotropia.de>2021-01-26 10:43:15 +0100
commit227ebe934127c64fc0b8089d426b44462c7eb739 (patch)
tree446ab824a71cca0cc9cdb8590743b2726aa2fcc2 /include
parent0c52361286d11d34544ec0deedc6962103b3e832 (diff)
tdf#135550 ListBox should triger an event when changed non-interactively
not just when changed by the user Change-Id: If2238341ff8465fee6375dad1ea9b4d7ec0110e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109800 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'include')
-rw-r--r--include/svtools/editbrowsebox.hxx26
1 files changed, 19 insertions, 7 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 46a35c203e96..34696522bd78 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -566,7 +566,7 @@ namespace svt
private:
std::unique_ptr<weld::ComboBox> m_xWidget;
Link<LinkParamNone*,void> m_aModify1Hdl;
- Link<LinkParamNone*,void> m_aModify2Hdl;
+ Link<bool,void> m_aModify2Hdl;
friend class ComboBoxCellController;
@@ -587,11 +587,17 @@ namespace svt
}
// sets an additional link to call when the selection is changed by the user
- void SetAuxModifyHdl(const Link<LinkParamNone*,void>& rLink)
+ // bool arg is true when triggered interactively by the user
+ void SetAuxModifyHdl(const Link<bool,void>& rLink)
{
m_aModify2Hdl = rLink;
}
+ void TriggerAuxModify()
+ {
+ m_aModify2Hdl.Call(false);
+ }
+
virtual void dispose() override;
private:
@@ -600,7 +606,7 @@ namespace svt
void CallModifyHdls()
{
m_aModify1Hdl.Call(nullptr);
- m_aModify2Hdl.Call(nullptr);
+ m_aModify2Hdl.Call(true);
}
};
@@ -627,7 +633,7 @@ namespace svt
private:
std::unique_ptr<weld::ComboBox> m_xWidget;
Link<LinkParamNone*,void> m_aModify1Hdl;
- Link<LinkParamNone*,void> m_aModify2Hdl;
+ Link<bool,void> m_aModify2Hdl;
friend class ListBoxCellController;
@@ -642,12 +648,18 @@ namespace svt
m_aModify1Hdl = rHdl;
}
- // sets an additional link to call when the selection is changed by the user
- void SetAuxModifyHdl(const Link<LinkParamNone*,void>& rLink)
+ // sets an additional link to call when the selection is changed,
+ // bool arg is true when triggered interactively by the user
+ void SetAuxModifyHdl(const Link<bool,void>& rLink)
{
m_aModify2Hdl = rLink;
}
+ void TriggerAuxModify()
+ {
+ m_aModify2Hdl.Call(false);
+ }
+
virtual void dispose() override;
private:
DECL_LINK(SelectHdl, weld::ComboBox&, void);
@@ -655,7 +667,7 @@ namespace svt
void CallModifyHdls()
{
m_aModify1Hdl.Call(nullptr);
- m_aModify2Hdl.Call(nullptr);
+ m_aModify2Hdl.Call(true);
}
};