[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - include/svx svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 21 23:49:27 UTC 2018
include/svx/dialcontrol.hxx | 2 +-
svx/source/dialog/dialcontrol.cxx | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 04fbc01af362ca858e560d305320e50161acc5fa
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 21 16:42:35 2018 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 22 00:48:58 2018 +0100
Resolves: tdf#121531 impossible to change angle/rotation by text input
Change-Id: Ic5fb01ac088cc777534e7986001defb61bc6ee60
Reviewed-on: https://gerrit.libreoffice.org/63734
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 3f5ad7592f25..d962012eb448 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -214,7 +214,7 @@ protected:
private:
void InvalidateControl();
- DECL_LINK(LinkedFieldModifyHdl, weld::Entry&, void);
+ DECL_LINK(LinkedFieldModifyHdl, weld::SpinButton&, void);
void LinkedFieldModifyHdl();
};
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 66e8c22e461e..16a8c7bab4ec 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -601,7 +601,7 @@ void SvxDialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 nDecimal
if( mpImpl->mpLinkField )
{
weld::SpinButton& rField = *mpImpl->mpLinkField;
- rField.connect_changed(Link<weld::Entry&,void>());
+ rField.connect_value_changed(Link<weld::SpinButton&,void>());
}
// remember the new linked field
mpImpl->mpLinkField = pField;
@@ -609,11 +609,11 @@ void SvxDialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 nDecimal
if( mpImpl->mpLinkField )
{
weld::SpinButton& rField = *mpImpl->mpLinkField;
- rField.connect_changed(LINK(this, SvxDialControl, LinkedFieldModifyHdl));
+ rField.connect_value_changed(LINK(this, SvxDialControl, LinkedFieldModifyHdl));
}
}
-IMPL_LINK_NOARG(SvxDialControl, LinkedFieldModifyHdl, weld::Entry&, void)
+IMPL_LINK_NOARG(SvxDialControl, LinkedFieldModifyHdl, weld::SpinButton&, void)
{
LinkedFieldModifyHdl();
}
@@ -624,7 +624,6 @@ void SvxDialControl::LinkedFieldModifyHdl()
SetRotation(mpImpl->mpLinkField->get_value() * mpImpl->mnLinkedFieldValueMultiplyer);
}
-
void SvxDialControl::SaveValue()
{
mpImpl->mnInitialAngle = mpImpl->mnAngle;
More information about the Libreoffice-commits
mailing list