desktop/source/deployment/gui/license_dialog.cxx | 2 +-
include/vcl/weld.hxx | 10 ++++++----
vcl/inc/qt5/QtInstanceTextView.hxx | 1 -
vcl/inc/salvtables.hxx | 2 --
vcl/qt5/QtInstanceTextView.cxx | 6 ------
vcl/source/app/salvtables.cxx | 8 +-------
vcl/unx/gtk3/gtkinst.cxx | 7 +------
7 files changed, 9 insertions(+), 27 deletions(-)
New commits:
commit be386cddcb667f6a07a3c0180b501ee11bdf789c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 12:08:35 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:15:39 2025 +0200
tdf#130857 weld: Rename signal for TextView scroll value change
Adjust naming to make clear that only changes of the
value property of the adjustment are notified about, see
also previous commit
Change-Id: Ie6ce7ff7f69725ddbf7ac4cb2e60c391a02ef1f7
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Aug 1 11:56:36 2025 +0200
tdf#150397 weld: Rename signals for ScrolledWindow scroll value
change
for more background.
Change-Id: I8fa3cbc9c6f3ea18902d0c53c4fa2e70e6b9adc3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188763
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx
b/desktop/source/deployment/gui/license_dialog.cxx
index ea522923ca55..12bfcd5ef04f 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -102,7 +102,7 @@ LicenseDialogImpl::LicenseDialogImpl(
m_xAcceptButton->connect_clicked( LINK(this, LicenseDialogImpl, AcceptHdl)
);
m_xDeclineButton->connect_clicked( LINK(this, LicenseDialogImpl,
CancelHdl) );
- m_xLicense->connect_vadjustment_changed(LINK(this, LicenseDialogImpl,
ScrolledHdl));
+ m_xLicense->connect_vadjustment_value_changed(LINK(this,
LicenseDialogImpl, ScrolledHdl));
m_xDown->connect_mouse_press(LINK(this, LicenseDialogImpl, MousePressHdl));
m_xDown->connect_mouse_release(LINK(this, LicenseDialogImpl,
MouseReleaseHdl));
m_xDown->connect_key_press(LINK(this, LicenseDialogImpl, KeyInputHdl));
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 142030af19cf..31143e44e950 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2412,12 +2412,12 @@ private:
protected:
Link<TextView&, void> m_aChangeHdl;
- Link<TextView&, void> m_aVChangeHdl;
+ Link<TextView&, void> m_aVValueChangeHdl;
Link<TextView&, void> m_aCursorPositionHdl;
void signal_changed() { m_aChangeHdl.Call(*this); }
void signal_cursor_position() { m_aCursorPositionHdl.Call(*this); }
- void signal_vadjustment_changed() { m_aVChangeHdl.Call(*this); }
+ void signal_vadjustment_value_changed() { m_aVValueChangeHdl.Call(*this); }
public:
virtual void set_text(const OUString& rText) = 0;
@@ -2476,7 +2476,10 @@ public:
virtual int vadjustment_get_upper() const = 0;
virtual int vadjustment_get_page_size() const = 0;
virtual void vadjustment_set_value(int value) = 0;
- void connect_vadjustment_changed(const Link<TextView&, void>& rLink) {
m_aVChangeHdl = rLink; }
+ void connect_vadjustment_value_changed(const Link<TextView&, void>& rLink)
+ {
+ m_aVValueChangeHdl = rLink;
+ }
};
class VCL_DLLPUBLIC Expander : virtual public Widget
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e9c73a269b36..f35e44d5bef4 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6142,7 +6142,7 @@ SalInstanceTextView::~SalInstanceTextView()
IMPL_LINK(SalInstanceTextView, VscrollHdl, ScrollBar*, pScrollBar, void)
{
- signal_vadjustment_changed();
+ signal_vadjustment_value_changed();
m_aOrigVScrollHdl.Call(pScrollBar);
}
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 17f5c9e361b9..650436db5299 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18015,7 +18015,7 @@ private:
{
GtkInstanceTextView* pThis = static_cast<GtkInstanceTextView*>(widget);
SolarMutexGuard aGuard;
- pThis->signal_vadjustment_changed();
+ pThis->signal_vadjustment_value_changed();
}
public:
commit 69b7040f49b693abec1316d327e7b8f74d1c1402
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Aug 1 12:05:59 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 09:15:30 2025 +0200
tdf#130857 weld: Drop unused TextView::vadjustment_get_lower
Change-Id: I881d59d61b752e0c7e291d42a158537b612a4c36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188762
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index e66ad3284e17..142030af19cf 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2474,7 +2474,6 @@ public:
virtual int vadjustment_get_value() const = 0;
virtual int vadjustment_get_upper() const = 0;
- virtual int vadjustment_get_lower() const = 0;
virtual int vadjustment_get_page_size() const = 0;
virtual void vadjustment_set_value(int value) = 0;
void connect_vadjustment_changed(const Link<TextView&, void>& rLink) {
m_aVChangeHdl = rLink; }
diff --git a/vcl/inc/qt5/QtInstanceTextView.hxx
b/vcl/inc/qt5/QtInstanceTextView.hxx
index 71279c82d37c..a1aceca839c3 100644
--- a/vcl/inc/qt5/QtInstanceTextView.hxx
+++ b/vcl/inc/qt5/QtInstanceTextView.hxx
@@ -46,7 +46,6 @@ public:
virtual int vadjustment_get_value() const override;
virtual int vadjustment_get_upper() const override;
- virtual int vadjustment_get_lower() const override;
virtual int vadjustment_get_page_size() const override;
virtual void vadjustment_set_value(int nValue) override;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index dd1f7ae469a6..8832d5da27e0 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1474,8 +1474,6 @@ public:
virtual int vadjustment_get_upper() const override;
- virtual int vadjustment_get_lower() const override;
-
virtual int vadjustment_get_page_size() const override;
virtual bool has_focus() const override;
diff --git a/vcl/qt5/QtInstanceTextView.cxx b/vcl/qt5/QtInstanceTextView.cxx
index cb37716a43b1..86483375b857 100644
--- a/vcl/qt5/QtInstanceTextView.cxx
+++ b/vcl/qt5/QtInstanceTextView.cxx
@@ -139,12 +139,6 @@ int QtInstanceTextView::vadjustment_get_upper() const
return -1;
}
-int QtInstanceTextView::vadjustment_get_lower() const
-{
- assert(false && "Not implemented yet");
- return -1;
-}
-
int QtInstanceTextView::vadjustment_get_page_size() const
{
assert(false && "Not implemented yet");
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2768b5395ff3..e9c73a269b36 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6120,12 +6120,6 @@ int SalInstanceTextView::vadjustment_get_upper() const
return rVertScrollBar.GetRangeMax();
}
-int SalInstanceTextView::vadjustment_get_lower() const
-{
- ScrollBar& rVertScrollBar = m_xTextView->GetVScrollBar();
- return rVertScrollBar.GetRangeMin();
-}
-
int SalInstanceTextView::vadjustment_get_page_size() const
{
ScrollBar& rVertScrollBar = m_xTextView->GetVScrollBar();
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 643bdcd196e9..17f5c9e361b9 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18239,11 +18239,6 @@ public:
return gtk_adjustment_get_upper(m_pVAdjustment);
}
- virtual int vadjustment_get_lower() const override
- {
- return gtk_adjustment_get_lower(m_pVAdjustment);
- }
-
virtual int vadjustment_get_page_size() const override
{
return gtk_adjustment_get_page_size(m_pVAdjustment);
