diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-07 14:54:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:47 +0200 |
| commit | c41906324acf933f906516af8f2c3305904ba3c4 (patch) | |
| tree | 5870ee5f3f337e9ed98052775c134ca725f8cd38 | |
| parent | 20646c4c0115a298560f9cff4aeaba9503f65977 (diff) | |
convert Link<> to typed
Change-Id: I4efbef7fb2024212fca679099a40c2b84081c5f4
| -rw-r--r-- | include/svx/dialcontrol.hxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index acc16f78122a..b11ec1607f87 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -113,7 +113,7 @@ public: void SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces = 0); /** The passed handler is called whenever the totation value changes. */ - void SetModifyHdl( const Link<>& rLink ); + void SetModifyHdl( const Link<DialControl*,void>& rLink ); /** Save value for later comparison */ void SaveValue(); @@ -127,8 +127,8 @@ protected: ScopedVclPtr<DialControlBmp> mxBmpEnabled; ScopedVclPtr<DialControlBmp> mxBmpDisabled; ScopedVclPtr<DialControlBmp> mxBmpBuffered; - Link<> maModifyHdl; - VclPtr<NumericField> mpLinkField; + Link<DialControl*,void> maModifyHdl; + VclPtr<NumericField> mpLinkField; sal_Int32 mnLinkedFieldValueMultiplyer; Size maWinSize; vcl::Font maWinFont; diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 5a2304bea73f..8d127e518dd3 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -410,7 +410,7 @@ bool DialControl::IsValueModified() return mpImpl->mnInitialAngle != mpImpl->mnAngle; } -void DialControl::SetModifyHdl( const Link<>& rLink ) +void DialControl::SetModifyHdl( const Link<DialControl*,void>& rLink ) { mpImpl->maModifyHdl = rLink; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 80ebaaedf01c..10b95b2bea98 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -535,7 +535,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl ) -IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl ) +IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mpDial->GetRotation(); @@ -547,8 +547,6 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl ) GetBindings()->GetDispatcher()->Execute( SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L ); - - return 0; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 875eae75f373..e24b41b08341 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -32,13 +32,15 @@ #include <com/sun/star/ui/XSidebar.hpp> #include <basegfx/range/b2drange.hxx> -class DialControl; class SdrView; class FixedText; class MetricField; class CheckBox; class MetricBox; +namespace svx { +class DialControl; +}; namespace svx { namespace sidebar { @@ -155,7 +157,7 @@ private: DECL_LINK( ChangeHeightHdl, void * ); DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); DECL_LINK( AngleModifiedHdl, void * ); - DECL_LINK( RotationHdl, void * ); + DECL_LINK_TYPED( RotationHdl, svx::DialControl*, void ); DECL_LINK_TYPED( FlipHdl, ToolBox *, void ); void Initialize(); |