summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx4
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx2
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx3
-rw-r--r--include/dbaccess/ToolBoxHelper.hxx2
-rw-r--r--include/svtools/miscopt.hxx4
-rw-r--r--include/svx/imapdlg.hxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx5
-rw-r--r--svtools/source/config/miscopt.cxx26
-rw-r--r--svx/inc/galbrws2.hxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx6
-rw-r--r--svx/source/dialog/contimp.hxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx6
-rw-r--r--svx/source/gallery2/galbrws2.cxx4
19 files changed, 35 insertions, 51 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 13d416fceace..a12497c38ed1 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -167,14 +167,12 @@ void DataEditor::SetReadOnly( bool bReadOnly )
m_xBrwData->SetReadOnly( m_bReadOnly );
}
-IMPL_LINK_NOARG(DataEditor, MiscHdl)
+IMPL_LINK_NOARG_TYPED(DataEditor, MiscHdl, LinkParamNone*, void)
{
SvtMiscOptions aMiscOptions;
sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );
m_pTbxData->SetOutStyle( nStyle );
-
- return 0L;
}
void DataEditor::UpdateData()
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index eb49d9238edd..e2c10059e42f 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -77,7 +77,7 @@ private:
/// is called, if the cursor of the table has moved
DECL_LINK_TYPED( BrowserCursorMovedHdl, DataBrowser*, void);
/// this is called if MiscOptions change, esp. High-Contrast mode
- DECL_LINK( MiscHdl, void* );
+ DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
void UpdateData();
/// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 52f658e12aea..facfa7244e58 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -63,7 +63,7 @@ namespace dbaui
}
}
- IMPL_LINK(OToolBoxHelper, ConfigOptionsChanged, SvtMiscOptions*, /*_pOptions*/)
+ IMPL_LINK_NOARG_TYPED(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void)
{
if ( m_pToolBox )
{
@@ -73,8 +73,6 @@ namespace dbaui
if ( aOptions.GetToolboxStyle() != m_pToolBox->GetOutStyle() )
m_pToolBox->SetOutStyle(aOptions.GetToolboxStyle());
}
-
- return 0L;
}
IMPL_LINK(OToolBoxHelper, SettingsChanged, VclWindowEvent*, _pEvt)
{
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index f634b49271f7..e60e3f7f2a33 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -533,7 +533,7 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt )
ToolBox::DataChanged( rDCEvt );
}
-IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl )
+IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void )
{
bool bRebuildToolBar = false;
sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize();
@@ -551,8 +551,6 @@ IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl )
if ( bRebuildToolBar )
RebuildToolbar();
-
- return 0L;
}
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 271e54dab088..341344e5e4c5 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -131,7 +131,7 @@ class BibToolBar: public ToolBox
DECL_LINK( SelHdl, ListBox* );
DECL_LINK_TYPED( SendSelHdl, Idle*, void );
DECL_LINK_TYPED( MenuHdl, ToolBox*, void );
- DECL_LINK( OptionsChanged_Impl, void* );
+ DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void );
DECL_LINK( SettingsChanged_Impl, void* );
void ApplyImageList();
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index f4431778c95c..b04150015bff 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -134,7 +134,7 @@ class ToolBarManager : public ToolbarManager_Base
DECL_LINK_TYPED(Select, ToolBox *, void);
DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
- DECL_LINK( MiscOptionsChanged, void* );
+ DECL_LINK_TYPED( MiscOptionsChanged, LinkParamNone*, void );
DECL_LINK_TYPED( MenuButton, ToolBox *, void );
DECL_LINK_TYPED( MenuSelect, Menu *, bool );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index f19c611c2e50..d41fbefdbbbc 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2099,10 +2099,9 @@ IMPL_LINK_TYPED( ToolBarManager, DataChanged, DataChangedEvent const *, pDataCha
}
}
-IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged)
+IMPL_LINK_NOARG_TYPED(ToolBarManager, MiscOptionsChanged, LinkParamNone*, void)
{
CheckAndUpdateImages();
- return 0;
}
IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx
index d9671b45fe3b..b64bf85272f1 100644
--- a/include/dbaccess/ToolBoxHelper.hxx
+++ b/include/dbaccess/ToolBoxHelper.hxx
@@ -71,7 +71,7 @@ namespace dbaui
void checkImageList();
protected:
- DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*);
+ DECL_LINK_TYPED(ConfigOptionsChanged, LinkParamNone*, void);
DECL_LINK(SettingsChanged, VclWindowEvent* );
};
}
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 7c660e6f7e99..d8da7035e364 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -60,8 +60,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
SvtMiscOptions();
virtual ~SvtMiscOptions();
- void AddListenerLink( const Link<>& rLink );
- void RemoveListenerLink( const Link<>& rLink );
+ void AddListenerLink( const Link<LinkParamNone*,void>& rLink );
+ void RemoveListenerLink( const Link<LinkParamNone*,void>& rLink );
bool UseSystemFileDialog() const;
void SetUseSystemFileDialog( bool bSet );
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 3c0b01328963..ebd0f486a489 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
DECL_LINK( URLLoseFocusHdl, void* );
DECL_LINK_TYPED( UpdateHdl, Idle *, void );
DECL_LINK_TYPED( StateHdl, GraphCtrl*, void );
- DECL_LINK( MiscHdl, void* );
+ DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
void DoOpen();
bool DoSave();
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index c096c0a2f551..9e60bd75ad51 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2247,13 +2247,11 @@ IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void)
-IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions )
+IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void )
{
- (void)pOptions; // unused variable
InitToolBoxImages();
Resize();
aToolBox->Invalidate();
- return 0;
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 29728f853784..89c7d5575a79 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -452,7 +452,7 @@ private:
bool isHandledKey( const vcl::KeyCode& _rKeyCode );
DECL_LINK_TYPED( SelectHdl, Idle *, void);
- DECL_LINK( NotifyHdl, SvtMiscOptions* );
+ DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void );
DECL_LINK( FindHdl, sfx2::SearchDialog* );
DECL_LINK( CloseHdl, sfx2::SearchDialog* );
DECL_LINK_TYPED( CheckHdl, Button*, void );
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 3f432f57d1e7..36b46eaa3aea 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -62,7 +62,7 @@ public:
Image GetImage( sal_uInt16 nId, bool bBig );
void SetSymbolsSize_Impl( sal_Int16 );
- DECL_LINK( OptionsChanged_Impl, void* );
+ DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void );
DECL_LINK( SettingsChanged_Impl, VclWindowEvent* );
explicit SfxImageManager_Impl(SfxModule& rModule);
@@ -200,10 +200,9 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
-IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl)
+IMPL_LINK_NOARG_TYPED(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void)
{
SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() );
- return 0L;
}
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 48adb6f4a119..76953abb54c2 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -69,8 +69,8 @@ using namespace ::com::sun::star;
class SvtMiscOptions_Impl : public ConfigItem
{
- private:
- ::std::list<Link<>> aList;
+private:
+ ::std::list<Link<LinkParamNone*,void>> aList;
bool m_bUseSystemFileDialog;
bool m_bIsUseSystemFileDialogRO;
bool m_bPluginsEnabled;
@@ -92,7 +92,7 @@ class SvtMiscOptions_Impl : public ConfigItem
virtual void ImplCommit() SAL_OVERRIDE;
- public:
+public:
SvtMiscOptions_Impl();
virtual ~SvtMiscOptions_Impl();
@@ -201,15 +201,15 @@ class SvtMiscOptions_Impl : public ConfigItem
bool IsShowLinkWarningDialogReadOnly() const
{ return m_bIsShowLinkWarningDialogRO; }
- void AddListenerLink( const Link<>& rLink );
- void RemoveListenerLink( const Link<>& rLink );
+ void AddListenerLink( const Link<LinkParamNone*,void>& rLink );
+ void RemoveListenerLink( const Link<LinkParamNone*,void>& rLink );
void CallListeners();
// private methods
- private:
+private:
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent oue module tree
@@ -471,14 +471,14 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
-void SvtMiscOptions_Impl::AddListenerLink( const Link<>& rLink )
+void SvtMiscOptions_Impl::AddListenerLink( const Link<LinkParamNone*,void>& rLink )
{
aList.push_back( rLink );
}
-void SvtMiscOptions_Impl::RemoveListenerLink( const Link<>& rLink )
+void SvtMiscOptions_Impl::RemoveListenerLink( const Link<LinkParamNone*,void>& rLink )
{
- for ( ::std::list<Link<>>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<LinkParamNone*,void>>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
{
if ( *iter == rLink )
{
@@ -490,8 +490,8 @@ void SvtMiscOptions_Impl::RemoveListenerLink( const Link<>& rLink )
void SvtMiscOptions_Impl::CallListeners()
{
- for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
- iter->Call( this );
+ for ( ::std::list<Link<LinkParamNone*,void>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( nullptr );
}
void SvtMiscOptions_Impl::SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified )
@@ -862,12 +862,12 @@ Mutex & SvtMiscOptions::GetInitMutex()
return theSvtMiscOptionsMutex::get();
}
-void SvtMiscOptions::AddListenerLink( const Link<>& rLink )
+void SvtMiscOptions::AddListenerLink( const Link<LinkParamNone*,void>& rLink )
{
m_pDataContainer->AddListenerLink( rLink );
}
-void SvtMiscOptions::RemoveListenerLink( const Link<>& rLink )
+void SvtMiscOptions::RemoveListenerLink( const Link<LinkParamNone*,void>& rLink )
{
m_pDataContainer->RemoveListenerLink( rLink );
}
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 09223c05f6a2..a2f13805415d 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -140,7 +140,7 @@ private:
DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void );
DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void );
DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void );
- DECL_LINK( MiscHdl, void* );
+ DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
private:
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 6e023967a9e0..f2d327cce33c 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -737,12 +737,10 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
return 0L;
}
-IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl)
+IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void)
{
- SvtMiscOptions aMiscOptions;
+ SvtMiscOptions aMiscOptions;
m_pTbx1->SetOutStyle( aMiscOptions.GetToolboxStyle() );
-
- return 0L;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 5f72e27d881b..9512e172f26e 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -92,7 +92,7 @@ class SvxSuperContourDlg : public SvxContourDlg
DECL_LINK( PipetteHdl, ContourWindow* );
DECL_LINK( PipetteClickHdl, ContourWindow* );
DECL_LINK( WorkplaceClickHdl, ContourWindow* );
- DECL_LINK( MiscHdl, void* );
+ DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
public:
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 0a75e7b2b444..3442f0d7b941 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -804,12 +804,10 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void )
}
}
-IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl)
+IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void)
{
- SvtMiscOptions aMiscOptions;
+ SvtMiscOptions aMiscOptions;
m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() );
-
- return 0L;
}
SvxIMapDlg* GetIMapDlg()
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ce1e8323799b..f54a93443707 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1331,7 +1331,7 @@ IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void )
SetMode( GALLERYBROWSERMODE_LIST );
}
-IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl)
+IMPL_LINK_NOARG_TYPED(GalleryBrowser2, MiscHdl, LinkParamNone*, void)
{
maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() );
@@ -1351,8 +1351,6 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl)
maViewBox->SetSizePixel( maViewBox->CalcWindowSizePixel() );
Resize();
-
- return 0L;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-12-27 21:48:35 +0000