diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
| commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
| tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /svx/source/gallery2 | |
| parent | given that we can build with java7 now, allow it for windows too (diff) | |
| download | core-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 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galbrws.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 6 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index e7e5770b066e..4c80b8af3d28 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -268,7 +268,7 @@ sal_Bool GalleryBrowser::IsLinkage() const // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser, SplitHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser, SplitHdl) { mpSplitter->SetPosPixel( Point( mpSplitter->GetSplitPosPixel(), mpSplitter->GetPosPixel().Y() ) ); Resize(); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index fc20022bcf93..d581973fe00f 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -645,7 +645,7 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl) { ::std::vector< sal_uInt16 > aExecVector; ImplGetExecuteVector(aExecVector); @@ -684,7 +684,7 @@ IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl) { ( (GalleryBrowser*) GetParent() )->ThemeSelectionHasChanged(); return 0L; @@ -692,7 +692,7 @@ IMPL_LINK( GalleryBrowser1, SelectThemeHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) { String aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) ); String aName( aNewTheme ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 46311b3ea560..b9953f9c814a 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1212,7 +1212,7 @@ IMPL_LINK( GalleryBrowser2, MenuSelectHdl, Menu*, pMenu ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser2, SelectObjectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl) { ImplUpdateInfoBar(); return 0L; @@ -1232,7 +1232,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) // ----------------------------------------------------------------------------- -IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) { maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); |