Kaydet (Commit) 867df14d authored tarafından Caolán McNamara's avatar Caolán McNamara

SwColumnPage::LinkStubTimeout doesn't need to be a link

üst c1e467f7
...@@ -1056,7 +1056,7 @@ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld ) ...@@ -1056,7 +1056,7 @@ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld )
IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField ) IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
{ {
pModifiedField = pField; pModifiedField = pField;
Timeout(0); Timeout();
return 0; return 0;
} }
...@@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(SwColumnPage, Down) ...@@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(SwColumnPage, Down)
handler; triggered by an alteration of the column width handler; triggered by an alteration of the column width
or the column gap. or the column gap.
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
IMPL_LINK_NOARG(SwColumnPage, Timeout) void SwColumnPage::Timeout()
{ {
DBG_PROFSTART(columnhdl) ; DBG_PROFSTART(columnhdl) ;
if(pModifiedField) if(pModifiedField)
...@@ -1156,7 +1156,6 @@ IMPL_LINK_NOARG(SwColumnPage, Timeout) ...@@ -1156,7 +1156,6 @@ IMPL_LINK_NOARG(SwColumnPage, Timeout)
} }
Update(); Update();
DBG_PROFSTOP(columnhdl) ; DBG_PROFSTOP(columnhdl) ;
return 0;
} }
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
...@@ -1312,7 +1311,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) ...@@ -1312,7 +1311,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
pModifiedField = &aEd1; pModifiedField = &aEd1;
} }
bLockUpdate = sal_False; bLockUpdate = sal_False;
Timeout(0); Timeout();
} }
return 0; return 0;
......
...@@ -164,13 +164,13 @@ class SwColumnPage : public SfxTabPage ...@@ -164,13 +164,13 @@ class SwColumnPage : public SfxTabPage
DECL_LINK( GapModify, PercentField * ); DECL_LINK( GapModify, PercentField * );
DECL_LINK( EdModify, PercentField * ); DECL_LINK( EdModify, PercentField * );
DECL_LINK( AutoWidthHdl, CheckBox * ); DECL_LINK( AutoWidthHdl, CheckBox * );
DECL_LINK(Timeout, void *);
DECL_LINK( SetDefaultsHdl, ValueSet * ); DECL_LINK( SetDefaultsHdl, ValueSet * );
DECL_LINK(Up, void *); DECL_LINK(Up, void *);
DECL_LINK(Down, void *); DECL_LINK(Down, void *);
void Apply(Button *);
DECL_LINK( UpdateColMgr, void* ); DECL_LINK( UpdateColMgr, void* );
void Apply(Button *);
void Timeout();
void Update(); void Update();
void UpdateCols(); void UpdateCols();
......
...@@ -244,7 +244,6 @@ SwBlockNames::Remove(SwBlockName const*&, unsigned short) ...@@ -244,7 +244,6 @@ SwBlockNames::Remove(SwBlockName const*&, unsigned short)
SwBlockNames::Remove(unsigned short, unsigned short) SwBlockNames::Remove(unsigned short, unsigned short)
SwCellFrms::DeleteAndDestroy(unsigned short, unsigned short) SwCellFrms::DeleteAndDestroy(unsigned short, unsigned short)
SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short) SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short)
SwColumnPage::LinkStubTimeout(void*, void*)
SwContentArr::Insert(SwContent* const&, unsigned short&) SwContentArr::Insert(SwContent* const&, unsigned short&)
SwContentArr::Insert(SwContent* const*, unsigned short) SwContentArr::Insert(SwContent* const*, unsigned short)
SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short) SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment