summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svtools/toolbarmenu.hxx2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx15
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx2
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx15
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx27
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hxx10
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx12
8 files changed, 45 insertions, 40 deletions
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 5cbf6099ecaa..3999f89e4720 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -81,7 +81,7 @@ public:
const Size& getMenuSize() const;
- void SetSelectHdl( const Link<>& rLink );
+ void SetSelectHdl( const Link<ToolbarMenu*,void>& rLink );
int getSelectedEntryId() const;
int getHighlightedEntryId() const;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 288260f83e2b..3319f654aa4b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -70,9 +70,9 @@ public:
virtual void dispose() SAL_OVERRIDE;
protected:
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
-
+ void SelectHdl(void*);
private:
SlideLayoutController& mrController;
Reference< XFrame > mxFrame;
@@ -182,7 +182,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
SvtLanguageOptions aLanguageOptions;
const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
- SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
+ SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectToolbarMenuHdl ) );
mpLayoutSet1 = createEmptyValueSetControl();
mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) );
@@ -272,7 +272,12 @@ IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void
{
SelectHdl(pControl);
}
-IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
+IMPL_LINK_TYPED( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
+{
+ SelectHdl(pControl);
+}
+
+void LayoutToolbarMenu::SelectHdl(void* pControl)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -304,8 +309,6 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
}
mrController.dispatchCommand( sCommandURL, aArgs );
-
- return 0;
}
OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException)
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 2be2370e9fd1..62157b7a1268 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1612,7 +1612,7 @@ const Size& ToolbarMenu::getMenuSize() const
-void ToolbarMenu::SetSelectHdl( const Link<>& rLink )
+void ToolbarMenu::SetSelectHdl( const Link<ToolbarMenu*,void>& rLink )
{
mpImpl->maSelectHdl = rLink;
}
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 54a5bd7c9761..951bc746142b 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -267,7 +267,7 @@ struct ToolbarMenu_Impl
Size maSize;
- Link<> maSelectHdl;
+ Link<ToolbarMenu*,void> maSelectHdl;
ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
~ToolbarMenu_Impl();
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index d00606f59926..2ca014a028b7 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -38,9 +38,9 @@ class NumberingPopup : public svtools::ToolbarMenu
bool mbBulletItem;
NumberingToolBoxControl& mrController;
VclPtr<SvxNumValueSet> mpValueSet;
- DECL_LINK( VSSelectHdl, void * );
+ DECL_LINK_TYPED( VSSelectToolbarMenuHdl, ToolbarMenu*, void );
DECL_LINK_TYPED( VSSelectValueSetHdl, ValueSet*, void );
-
+ void VSSelectHdl(void *);
public:
NumberingPopup( NumberingToolBoxControl& rController,
const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -124,7 +124,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,
SetOutputSizePixel( getMenuSize() );
mpValueSet->SetSelectHdl( LINK( this, NumberingPopup, VSSelectValueSetHdl ) );
- SetSelectHdl( LINK( this, NumberingPopup, VSSelectHdl ) );
+ SetSelectHdl( LINK( this, NumberingPopup, VSSelectToolbarMenuHdl ) );
if ( mbBulletItem )
AddStatusListener( ".uno:CurrentBulletListType" );
@@ -157,7 +157,12 @@ IMPL_LINK_TYPED( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void
{
VSSelectHdl(pControl);
}
-IMPL_LINK( NumberingPopup, VSSelectHdl, void *, pControl )
+IMPL_LINK_TYPED( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void )
+{
+ VSSelectHdl(pControl);
+}
+
+void NumberingPopup::VSSelectHdl(void* pControl)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -193,8 +198,6 @@ IMPL_LINK( NumberingPopup, VSSelectHdl, void *, pControl )
aArgs[0].Value <<= aPageName;
mrController.dispatchCommand( ".uno:OutlineBullet", aArgs );
}
-
- return 0;
}
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 48043929eb44..18dfe434e0b8 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -78,7 +78,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
maImgDirection[i] = Image( SVX_RES( RID_SVXIMG_DIRECTION + i ) );
}
- SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
+ SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) );
mpDirectionSet = createEmptyValueSetControl();
mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectValueSetHdl ) );
@@ -206,7 +206,11 @@ IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pContro
{
SelectHdl(pControl);
}
-IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
+IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void )
+{
+ SelectHdl(pControl);
+}
+void ExtrusionDirectionWindow::SelectHdl(void* pControl)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -232,8 +236,6 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
implSetProjection( nProjection );
}
}
-
- return 0;
}
ExtrusionDirectionControl::ExtrusionDirectionControl(
@@ -430,7 +432,7 @@ void ExtrusionDepthWindow::statusChanged(
}
}
-IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void)
{
int nSelected = getSelectedEntryId();
if( nSelected != -1 )
@@ -474,7 +476,6 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
EndPopupMode();
}
}
- return 0;
}
@@ -569,7 +570,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
maImgLightingPreview[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_PREVIEW + i));
}
- SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
+ SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl ) );
mpLightingSet = createEmptyValueSetControl();
mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING );
@@ -707,7 +708,11 @@ IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl
{
SelectHdl(pControl);
}
-IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
+IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void )
+{
+ SelectHdl(pControl);
+}
+void ExtrusionLightingWindow::SelectHdl(void* pControl)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -747,8 +752,6 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
}
}
-
- return 0;
}
@@ -875,7 +878,7 @@ void ExtrusionSurfaceWindow::statusChanged(
-IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -891,8 +894,6 @@ IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl)
implSetSurface( nSurface, true );
}
-
- return 0;
}
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 07a8a9f19446..99946571b717 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -58,8 +58,9 @@ private:
const OUString msExtrusionDirection;
const OUString msExtrusionProjection;
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
+ void SelectHdl(void*);
void implSetDirection( sal_Int32 nSkew, bool bEnabled = true );
void implSetProjection( sal_Int32 nProjection, bool bEnabled = true );
@@ -104,7 +105,7 @@ private:
const OUString msExtrusionDepth;
const OUString msMetricUnit;
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void );
void implFillStrings( FieldUnit eUnit );
void implSetDepth( double fDepth );
@@ -160,8 +161,9 @@ private:
void implSetIntensity( int nLevel, bool bEnabled );
void implSetDirection( int nDirection, bool bEnabled );
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
+ void SelectHdl(void*);
public:
ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow );
virtual ~ExtrusionLightingWindow();
@@ -205,7 +207,7 @@ private:
const OUString msExtrusionSurface;
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void );
void implSetSurface( int nSurface, bool bEnabled );
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 4f9b5b86553a..a7f61727aee3 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -275,7 +275,7 @@ private:
const OUString msFontworkAlignment;
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void );
void implSetAlignment( int nAlignmentMode, bool bEnabled );
};
@@ -331,7 +331,7 @@ void FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Eve
}
}
-IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl)
+IMPL_LINK_NOARG_TYPED(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -347,8 +347,6 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl)
implSetAlignment( nAlignment, true );
}
-
- return 0;
}
class FontworkAlignmentControl : public svt::PopupWindowController
@@ -446,7 +444,7 @@ private:
const OUString msFontworkCharacterSpacing;
const OUString msFontworkKernCharacterPairs;
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void );
void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
void implSetKernCharacterPairs( bool bKernOnOff, bool bEnabled );
@@ -543,7 +541,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::fram
-IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl)
+IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void)
{
if ( IsInPopupMode() )
EndPopupMode();
@@ -587,8 +585,6 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl)
implSetCharacterSpacing( nCharacterSpacing, true );
}
-
- return 0;
}
class FontworkCharacterSpacingControl : public svt::PopupWindowController
generated by cgit (git 2.34.1) at 2024-12-27 20:54:19 +0000