summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-05 09:59:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-05 12:05:38 +0200
commitc9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch)
tree2cb864a67b556f807ba175507296f7dfc5254944 /svx
parent8c4a1663f5d93380268365d35a5581d8065df897 (diff)
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx2
-rw-r--r--svx/inc/svdibrow.hxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx8
-rw-r--r--svx/source/dialog/contimp.hxx4
-rw-r--r--svx/source/dialog/fontwork.cxx3
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx3
-rw-r--r--svx/source/form/datanavi.cxx3
-rw-r--r--svx/source/form/formcontroller.cxx3
-rw-r--r--svx/source/inc/datanavi.hxx2
-rw-r--r--svx/source/inc/formcontroller.hxx2
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx4
-rw-r--r--svx/source/sidebar/PanelLayout.cxx3
-rw-r--r--svx/source/stbctrls/modctrl.cxx6
-rw-r--r--svx/source/svdraw/svdibrow.cxx3
-rw-r--r--svx/source/svdraw/svdpntv.cxx3
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
18 files changed, 22 insertions, 42 deletions
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 05db3120343f..48feb1dd7e0b 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -54,7 +54,7 @@ namespace sdr
bool mbRefreshWithPreRendering : 1;
// link for timer
- DECL_LINK(ImpBufferTimerHandler, AutoTimer*);
+ DECL_LINK_TYPED(ImpBufferTimerHandler, Idle*, void);
// Internal methods for buffering
void ImpPrepareBufferDevice();
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index b735152ef15d..0a436533b97e 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -120,7 +120,7 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
bool bDirty;
private:
static vcl::Window* ImpGetViewWin(SdrView& rView);
- DECL_LINK(IdleHdl, void *);
+ DECL_LINK_TYPED(IdleHdl, Idle *, void);
DECL_LINK(ChangedHdl,_SdrItemBrowserControl*);
DECL_LINK(SetDirtyHdl, void *);
public:
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 1d4799c7cc07..760a010fdd39 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -570,7 +570,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
return 0L;
}
-IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
+IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void)
{
aUpdateIdle.Stop();
@@ -592,11 +592,9 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
}
GetBindings().Invalidate( SID_CONTOUR_EXEC );
-
- return 0L;
}
-IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl)
+IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void)
{
aCreateIdle.Stop();
@@ -607,8 +605,6 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl)
EnterWait();
SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) );
LeaveWait();
-
- return 0L;
}
IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 68c78423c9e6..a0e76fb8cc19 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -86,8 +86,8 @@ class SvxSuperContourDlg : public SvxContourDlg
DECL_LINK( Tbx1ClickHdl, ToolBox* );
DECL_LINK( MousePosHdl, ContourWindow* );
DECL_LINK( GraphSizeHdl, ContourWindow* );
- DECL_LINK(UpdateHdl, void *);
- DECL_LINK(CreateHdl, void *);
+ DECL_LINK_TYPED(UpdateHdl, Idle *, void);
+ DECL_LINK_TYPED(CreateHdl, Idle *, void);
DECL_LINK( StateHdl, ContourWindow* );
DECL_LINK( PipetteHdl, ContourWindow* );
DECL_LINK( PipetteClickHdl, ContourWindow* );
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 3986a6a1a594..9285f3b32335 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl)
return 0;
}
-IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void)
{
// Possibly set the Metric system again. This should be done with a
// listen, this is however not possible at the moment due to compabillity
@@ -797,7 +797,6 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
// Slot-ID does not matter, the Exec method evaluates the entire item set
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SfxCallMode::RECORD, &aDistItem,
&aStartItem, &aShadowXItem, &aShadowYItem, 0L );
- return 0;
}
IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 98561d20faf0..85b96ece35a9 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -739,14 +739,12 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
eObjKind = OBJ_NONE;
}
-IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer )
+IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle*, pTimer, void )
{
if ( aUpdateLink.IsSet() )
aUpdateLink.Call( this );
pTimer->Start();
-
- return 0L;
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 1d606ce45a72..b260afa8db16 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -696,7 +696,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
return 0;
}
-IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
+IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void)
{
pOwnData->aIdle.Stop();
@@ -723,8 +723,6 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
pOwnData->aUpdateTargetList.clear();
GetBindings().Invalidate( SID_IMAP_EXEC );
-
- return 0L;
}
IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 65d12c962e88..4615a0cc57f4 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -533,7 +533,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
}
}
-IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void)
{
// only when a graphics was not there, it needs to be formatted
if(bGrfNotFound)
@@ -542,7 +542,6 @@ IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl)
Format();
}
Invalidate();
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 3a95687d1563..33fdcba23745 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2882,7 +2882,7 @@ namespace svxform
}
- IMPL_LINK_NOARG(AddConditionDialog, ResultHdl)
+ IMPL_LINK_NOARG_TYPED(AddConditionDialog, ResultHdl, Idle *, void)
{
OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' ');
OUString sResult;
@@ -2898,7 +2898,6 @@ namespace svxform
}
}
m_pResultWin->SetText( sResult );
- return 0;
}
NamespaceItemDialog::NamespaceItemDialog(
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index aadfc17d10e6..1ded55099cd5 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -496,10 +496,9 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any&
}
-IMPL_LINK( FormController, OnActivateTabOrder, void*, /*EMPTYTAG*/ )
+IMPL_LINK_NOARG_TYPED( FormController, OnActivateTabOrder, Idle*, void )
{
activateTabOrder();
- return 1;
}
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 378137464780..d336a391399b 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -495,7 +495,7 @@ namespace svxform
XPropertySet_ref m_xBinding;
DECL_LINK(ModifyHdl, void *);
- DECL_LINK(ResultHdl, void *);
+ DECL_LINK_TYPED(ResultHdl, Idle *, void);
DECL_LINK(EditHdl, void *);
DECL_LINK(OKHdl, void *);
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 4ed59e08533b..45d74e6b46e3 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -562,7 +562,7 @@ namespace svxform
bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const;
- DECL_LINK( OnActivateTabOrder, void* );
+ DECL_LINK_TYPED( OnActivateTabOrder, Idle*, void );
DECL_LINK_TYPED( OnInvalidateFeatures, Timer*, void );
DECL_LINK( OnLoad, void* );
DECL_LINK( OnToggleAutoFields, void* );
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 58814b1efe48..f5373057d0b1 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -206,7 +206,7 @@ namespace sdr
mpBufferDevice->EnableMapMode(bMapModeWasEnabledSource);
}
- IMPL_LINK(OverlayManagerBuffered, ImpBufferTimerHandler, AutoTimer*, /*pTimer*/)
+ IMPL_LINK_NOARG_TYPED(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void)
{
//Resolves: fdo#46728 ensure this exists until end of scope
rtl::Reference<OverlayManager> xRef(this);
@@ -372,8 +372,6 @@ namespace sdr
// forget remembered Region
maBufferRememberedRangePixel.reset();
}
-
- return 0;
}
OverlayManagerBuffered::OverlayManagerBuffered(
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 9a1f11fffa54..2535f9b3f00a 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -62,12 +62,11 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/)
m_aPanelLayoutIdle.Start();
}
-IMPL_LINK( PanelLayout, ImplHandlePanelLayoutTimerHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG_TYPED( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void )
{
vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
assert(pChild);
VclContainer::setLayoutAllocation(*pChild, Point(0, 0), GetSizePixel());
- return 0;
}
void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 701562908270..41d66e0c07f0 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -108,17 +108,15 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
-IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer )
+IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void )
{
if (pTimer == 0)
- return 0;
+ return;
pTimer->Stop();
mxImpl->mnModState = ImplData::MODIFICATION_STATE_NO;
_repaint();
-
- return 0;
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cddf3dfa9954..5e0fa262570d 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1140,10 +1140,9 @@ void SdrItemBrowser::Undirty()
}
}
-IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl)
+IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
{
Undirty();
- return 0;
}
IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index dfc7d210e6a5..775da2f42a79 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -293,13 +293,12 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
-IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl)
+IMPL_LINK_NOARG_TYPED(SdrPaintView, ImpComeBackHdl, Idle *, void)
{
if (bSomeObjChgdFlag) {
bSomeObjChgdFlag=false;
ModelHasChanged();
}
- return 0;
}
void SdrPaintView::FlushComeBackTimer() const
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 5cc2a78736a2..3e5e255c6d1f 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -91,7 +91,7 @@ private:
OUString maCommand;
Reference< XFrame > mxFrame;
- DECL_LINK(ImplModifyHdl, void *);
+ DECL_LINK_TYPED(ImplModifyHdl, Idle *, void);
protected:
@@ -146,7 +146,7 @@ void ImplGrafMetricField::Modify()
maIdle.Start();
}
-IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl)
+IMPL_LINK_NOARG_TYPED(ImplGrafMetricField, ImplModifyHdl, Idle *, void)
{
const sal_Int64 nVal = GetValue();
@@ -175,7 +175,6 @@ IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl)
maCommand,
aArgs );
}
- return 0L;
}
void ImplGrafMetricField::Update( const SfxPoolItem* pItem )