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

Caolán McNamara caolanm at redhat.com
Tue Sep 12 19:26:46 UTC 2017


 include/svx/dialcontrol.hxx       |    2 --
 svx/source/dialog/dialcontrol.cxx |   19 +------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 9659efe3f695aeeffc4cae427b80020fd2d96796
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 12 16:06:28 2017 +0100

    listening to modify is sufficient to get all changes
    
    Change-Id: Ic6872ec80cc4a36192fe23f9abf76c4fa10b94bd
    Reviewed-on: https://gerrit.libreoffice.org/42213
    Tested-by: Jenkins <ci at libreoffice.org>
    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 c12f3c97652b..dd485efb50a1 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -156,9 +156,7 @@ private:
     void                InvalidateControl();
 
     DECL_LINK( LinkedFieldModifyHdl, Edit&, void );
-    DECL_LINK( LinkedFieldFocusHdl, Control&, void );
     void LinkedFieldModifyHdl();
-    DECL_LINK(SpinFieldHdl, SpinField&, void);
 };
 
 /** Wrapper for usage of a DialControl in item connections. */
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index c13faa7110f3..d1fa4671cdb4 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -394,11 +394,6 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces
     {
         NumericField& rField = *mpImpl->mpLinkField;
         rField.SetModifyHdl( Link<Edit&,void>() );
-        rField.SetUpHdl( Link<SpinField&,void>() );
-        rField.SetDownHdl( Link<SpinField&,void>() );
-        rField.SetFirstHdl( Link<SpinField&,void>() );
-        rField.SetLastHdl( Link<SpinField&,void>() );
-        rField.SetLoseFocusHdl( Link<Control&,void>() );
     }
     // remember the new linked field
     mpImpl->mpLinkField = pField;
@@ -407,25 +402,13 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces
     {
         NumericField& rField = *mpImpl->mpLinkField;
         rField.SetModifyHdl( LINK( this, DialControl, LinkedFieldModifyHdl ) );
-        rField.SetUpHdl( LINK(this, DialControl, SpinFieldHdl) );
-        rField.SetDownHdl( LINK(this, DialControl, SpinFieldHdl) );
-        rField.SetFirstHdl( LINK(this, DialControl, SpinFieldHdl) );
-        rField.SetLastHdl( LINK(this, DialControl, SpinFieldHdl) );
-        rField.SetLoseFocusHdl( LINK( this, DialControl, LinkedFieldFocusHdl ) );
     }
 }
+
 IMPL_LINK_NOARG( DialControl, LinkedFieldModifyHdl, Edit&, void )
 {
     LinkedFieldModifyHdl();
 }
-IMPL_LINK_NOARG( DialControl, LinkedFieldFocusHdl, Control&, void )
-{
-    LinkedFieldModifyHdl();
-}
-IMPL_LINK_NOARG(DialControl, SpinFieldHdl, SpinField&, void)
-{
-    LinkedFieldModifyHdl();
-}
 
 void DialControl::LinkedFieldModifyHdl()
 {


More information about the Libreoffice-commits mailing list