summaryrefslogtreecommitdiffstats
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-06 00:57:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-06 11:26:35 +0000
commit867df14dd1b4570fa5a3719faf2e8f2a2007323e (patch)
tree660ec8b3534ef02604aa1a57a71b40a21cbdb57c /sw
parentremove TransliterationWrapper::compareSubstring (diff)
downloadcore-867df14dd1b4570fa5a3719faf2e8f2a2007323e.tar.gz
core-867df14dd1b4570fa5a3719faf2e8f2a2007323e.zip
SwColumnPage::LinkStubTimeout doesn't need to be a link
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/frmdlg/column.cxx7
-rw-r--r--sw/source/ui/inc/column.hxx4
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 0c6a0357ec4a..e9059f758620 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1056,7 +1056,7 @@ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld )
IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
{
pModifiedField = pField;
- Timeout(0);
+ Timeout();
return 0;
}
@@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(SwColumnPage, Down)
handler; triggered by an alteration of the column width
or the column gap.
------------------------------------------------------------------------*/
-IMPL_LINK_NOARG(SwColumnPage, Timeout)
+void SwColumnPage::Timeout()
{
DBG_PROFSTART(columnhdl) ;
if(pModifiedField)
@@ -1156,7 +1156,6 @@ IMPL_LINK_NOARG(SwColumnPage, Timeout)
}
Update();
DBG_PROFSTOP(columnhdl) ;
- return 0;
}
/*------------------------------------------------------------------------
@@ -1312,7 +1311,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
pModifiedField = &aEd1;
}
bLockUpdate = sal_False;
- Timeout(0);
+ Timeout();
}
return 0;
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 5cc078c37fb5..213544fd6df0 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -164,13 +164,13 @@ class SwColumnPage : public SfxTabPage
DECL_LINK( GapModify, PercentField * );
DECL_LINK( EdModify, PercentField * );
DECL_LINK( AutoWidthHdl, CheckBox * );
- DECL_LINK(Timeout, void *);
DECL_LINK( SetDefaultsHdl, ValueSet * );
DECL_LINK(Up, void *);
DECL_LINK(Down, void *);
- void Apply(Button *);
DECL_LINK( UpdateColMgr, void* );
+ void Apply(Button *);
+ void Timeout();
void Update();
void UpdateCols();