summaryrefslogtreecommitdiffstats
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
commitbd205223ec029a875c662474bb6d423d3cdd1994 (patch)
tree6531a292edb0d2a13103a4c55cbd10e7137b8a58 /editeng
parentgiven that we can build with java7 now, allow it for windows too (diff)
downloadcore-bd205223ec029a875c662474bb6d423d3cdd1994.tar.gz
core-bd205223ec029a875c662474bb6d423d3cdd1994.zip
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem.
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit.hxx6
-rw-r--r--editeng/source/editeng/impedit2.cxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx10
-rw-r--r--editeng/source/misc/hangulhanja.cxx14
-rw-r--r--editeng/source/outliner/outliner.cxx2
5 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index d02a95989a0b..2076d29231da 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -671,9 +671,9 @@ private:
inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode );
inline void EraseVirtualDevice();
- DECL_LINK( StatusTimerHdl, Timer * );
- DECL_LINK( IdleFormatHdl, Timer * );
- DECL_LINK( OnlineSpellHdl, Timer * );
+ DECL_LINK(StatusTimerHdl, void *);
+ DECL_LINK(IdleFormatHdl, void *);
+ DECL_LINK(OnlineSpellHdl, void *);
DECL_LINK( DocModified, void* );
void CheckIdleFormatter();
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 313f54c03694..80f2710b050d 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4423,7 +4423,7 @@ void ImpEditEngine::LeaveBlockNotifications()
}
}
-IMPL_LINK( ImpEditEngine, DocModified, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpEditEngine, DocModified)
{
aModifyHdl.Call( NULL /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner
return 0;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 719a8753472b..350a5d12f857 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -322,7 +322,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
CallStatusHdl();
}
-IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl)
{
if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) && GetUpdateMode() && IsFormatted() )
DoOnlineSpelling();
@@ -332,7 +332,7 @@ IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG )
return 0;
}
-IMPL_LINK_INLINE_START( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, IdleFormatHdl)
{
aIdleFormatter.ResetRestarts();
@@ -350,7 +350,7 @@ IMPL_LINK_INLINE_START( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG )
}
return 0;
}
-IMPL_LINK_INLINE_END( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, IdleFormatHdl)
void ImpEditEngine::CheckIdleFormatter()
{
@@ -3884,12 +3884,12 @@ void ImpEditEngine::InvalidateFromParagraph( sal_uInt16 nFirstInvPara )
pTmpPortion->ResetHeight();
}
-IMPL_LINK_INLINE_START( ImpEditEngine, StatusTimerHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, StatusTimerHdl)
{
CallStatusHdl();
return 0;
}
-IMPL_LINK_INLINE_END( ImpEditEngine, StatusTimerHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, StatusTimerHdl)
void ImpEditEngine::CallStatusHdl()
{
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 6e0eb21d1f14..86bf60a38ffd 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -844,7 +844,7 @@ namespace editeng
m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex );
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnOptionsChanged, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnOptionsChanged)
{
//options and dictionaries might have been changed
//-> update our internal settings and the dialog
@@ -853,14 +853,14 @@ namespace editeng
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnIgnore, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnore)
{
// simply ignore, and proceed
implProceed( sal_False );
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnIgnoreAll, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnoreAll)
{
DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" );
@@ -880,7 +880,7 @@ namespace editeng
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnChange, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChange)
{
// change
DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" );
@@ -892,7 +892,7 @@ namespace editeng
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnChangeAll, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChangeAll)
{
DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" );
if ( m_pConversionDialog )
@@ -925,7 +925,7 @@ namespace editeng
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnConversionTypeChanged, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged)
{
DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" );
if( m_pConversionDialog )
@@ -933,7 +933,7 @@ namespace editeng
return 0L;
}
- IMPL_LINK( HangulHanjaConversion_Impl, OnFind, void*, EMPTYARG )
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnFind)
{
DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" );
if ( m_pConversionDialog )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 8b86352811f4..b1690e93d8bd 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1825,7 +1825,7 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
return 0;
}
-IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG )
+IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl)
{
DBG_CHKTHIS(Outliner,0);