diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-27 13:08:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-28 09:49:56 +0200 |
| commit | bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch) | |
| tree | f05be9665737f0667faf95702d96fbf3f0a103c5 | |
| parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) | |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
272 files changed, 603 insertions, 838 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 42828335819b..be36322b9a6b 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -108,8 +108,7 @@ public: private: void processQueue(); - DECL_STATIC_LINK( - MissingPluginInstaller, launchUi, MissingPluginInstallerThread *); + DECL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void*, void); osl::Mutex mutex_; std::set<OString> reported_; @@ -236,9 +235,9 @@ void MissingPluginInstaller::processQueue() { queued_.clear(); } -IMPL_STATIC_LINK( - MissingPluginInstaller, launchUi, MissingPluginInstallerThread *, thread) +IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void) { + MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p); rtl::Reference<MissingPluginInstallerThread> ref(thread, SAL_NO_ACQUIRE); gst_pb_utils_init(); // not thread safe; hopefully fine to consistently call from our event @@ -249,7 +248,6 @@ IMPL_STATIC_LINK( // gst_missing_plugin_message_get_installer_detail before calling // gst_pb_utils_init ref->launch(); - return 0; } struct TheMissingPluginInstaller: diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 41e4955f94e2..4152e368575c 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -207,12 +207,13 @@ namespace class MacroExecution { public: - DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* ); + DECL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, void ); }; - IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData ) + IMPL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, p, void ) { - ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L ); + MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p); + ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" ); // take ownership of the data boost::scoped_ptr< MacroExecutionData > pData( i_pData ); @@ -225,8 +226,6 @@ namespace pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) ); RunMethod(pData->xMethod); - - return 1L; } } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 698d55e4ab92..364199cae1ec 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -469,13 +469,12 @@ public: uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() ); xDeskTop->terminate(); } - DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void* ); + DECL_STATIC_LINK_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void ); }; -IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit ) +IMPL_STATIC_LINK_NOARG_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void ) { QuitApplication(); - return 0L; } // A Basic module has set EXTSEARCH, so that the elements, that the modul contains, diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index fca6544a212f..2664fcc0e604 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2113,16 +2113,12 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( return pNewEntry; } -IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg ) +IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void ) { - (void)pMsg; - // Asynchronous msg because of D&D ScopedVclPtr<MessageDialog>::Create( this, CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ), VCL_MESSAGE_INFO )->Execute(); - - return 0; } IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void ) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 420e644f0631..45d302f260b7 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -441,7 +441,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent /* Initialize, asynchronous to prevent virtial calls from a constructor */ -IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, ) +IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) { SetUpdateMode( false ); //show or hide AutoCorrect depending on the modules abilities @@ -468,7 +468,6 @@ IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, ) m_pCheckGrammarCB->Check( rParent.IsGrammarChecking() ); SetUpdateMode( true ); Show(); - return 0; }; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f5c6db0d972e..5774baa34bdd 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -245,7 +245,7 @@ IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void) -IMPL_LINK_NOARG(SearchProgress, CleanUpHdl) +IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void) { if (maSearchThread.is()) maSearchThread->join(); @@ -253,7 +253,6 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl) EndDialog( RET_OK ); disposeOnce(); - return 0L; } @@ -381,7 +380,7 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void) Terminate(); } -IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) +IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void) { if (maTakeThread.is()) maTakeThread->join(); @@ -430,7 +429,6 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) EndDialog( RET_OK ); disposeOnce(); - return 0L; } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 6e5e5096620f..734fae986b07 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1480,9 +1480,9 @@ short SvxScriptErrorDialog::Execute() return 0; } -IMPL_STATIC_LINK( - SvxScriptErrorDialog, ShowDialog, OUString*, pMessage ) +IMPL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, p, void ) { + OUString* pMessage = static_cast<OUString*>(p); OUString message; if ( pMessage && !pMessage->isEmpty() ) @@ -1499,8 +1499,6 @@ IMPL_STATIC_LINK( pBox->Execute(); delete pMessage; - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 1448d18022df..5dcf4e3281c9 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -437,11 +437,11 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox return 0; } -IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) { + SvxCheckListBox* pBox = static_cast<SvxCheckListBox*>(p); if (pBox && pBox->GetEntryCount() >= 2) pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable - return 0; } // class SvxThesaurusDialog ---------------------------------------------- diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 3f676d8e23f6..c33921c9e26f 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -187,7 +187,7 @@ private: DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_LINK( HandleHyperlink, FixedHyperlink * ); - DECL_LINK( InitHdl, SpellDialog * ); + DECL_LINK_TYPED( InitHdl, void*, void ); int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu ); void StartSpellOptDlg_Impl(); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 511040dcead7..f73b6349e14b 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -327,7 +327,7 @@ private: SaveInData* pCurrentSaveInData; DECL_LINK( SelectSaveInLocation, ListBox * ); - DECL_LINK( AsyncInfoMsg, OUString* ); + DECL_LINK_TYPED( AsyncInfoMsg, void*, void ); protected: diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 1883de8d57fe..30036c718da5 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -96,7 +96,7 @@ public: virtual ~SearchProgress(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( CleanUpHdl, void* ); + DECL_LINK_TYPED( CleanUpHdl, void*, void ); virtual short Execute() SAL_OVERRIDE; virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; @@ -142,7 +142,7 @@ public: virtual ~TakeProgress(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( CleanUpHdl, void* ); + DECL_LINK_TYPED( CleanUpHdl, void*, void ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 50bce86b2262..89a8e67f0c3a 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -140,7 +140,7 @@ private: DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK(PostDblClickHdl_Impl, void *); + DECL_LINK_TYPED(PostDblClickHdl_Impl, void *, void); DECL_LINK(OpenURLHdl_Impl, void *); void UpdateModulesBox_Impl(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index a60cc4174837..9224bb6d2494 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -189,7 +189,7 @@ private: OUString m_sMessage; - DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, OUString* ); + DECL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, void ); public: diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 6fd929d430fa..af209a197a7d 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -149,7 +149,7 @@ public: DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); - DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); + DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index ee9afe036efa..3836b1631795 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -396,7 +396,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) -IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) { try { @@ -410,8 +410,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl) { SAL_WARN( "cui.options", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" ); } - - return 0L; } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 70acc0e922c9..1cb35fe665a4 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -84,18 +84,18 @@ private: css::uno::Reference< ::svt::DialogClosedListener > xDialogListener; css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; - DECL_LINK_TYPED(EnableHdl_Impl, Button*, void); + DECL_LINK_TYPED( EnableHdl_Impl, Button*, void); DECL_LINK( CheckHdl_Impl, SvSimpleTable * ); - DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(ParameterHdl_Impl, Button*, void); - DECL_LINK_TYPED(ClassPathHdl_Impl, Button*, void); - DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void); + DECL_LINK( SelectHdl_Impl, void *); + DECL_LINK_TYPED( AddHdl_Impl, Button*, void); + DECL_LINK_TYPED( ParameterHdl_Impl, Button*, void); + DECL_LINK_TYPED( ClassPathHdl_Impl, Button*, void); + DECL_LINK_TYPED( ResetHdl_Impl, Idle *, void); - DECL_LINK( StartFolderPickerHdl, void * ); + DECL_LINK_TYPED( StartFolderPickerHdl, void *, void ); DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); - DECL_LINK_TYPED(ExpertConfigHdl_Impl, Button*, void); + DECL_LINK_TYPED( ExpertConfigHdl_Impl, Button*, void); void ClearJavaInfo(); void ClearJavaList(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 10cfb0c087fb..35c8b898bb46 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1534,10 +1534,9 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) -IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) { ClickHdl_Impl(m_pLinguModulesEditPB); - return 0; } diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 63facdf8aed3..07d14d5957f7 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -177,7 +177,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal } } -IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher ) +IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void ) { boost::scoped_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) ); try @@ -200,8 +200,6 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher ) { DBG_UNHANDLED_EXCEPTION(); } - - return 0L; } void SAL_CALL OInterceptor::addStatusListener( diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 2d7e8ece6242..571e6205db6f 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -39,7 +39,7 @@ class OInterceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProvide css::frame::XDispatch, css::document::XDocumentEventListener> { - DECL_LINK( OnDispatch, void* ); + DECL_LINK_TYPED( OnDispatch, void*, void ); protected: virtual ~OInterceptor(); public: diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 4745d24a3c49..f894fa8a87a8 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -278,7 +278,7 @@ namespace dbmm return MacroMigrationDialog_Base::onFinish(); } - IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration ) + IMPL_LINK_NOARG_TYPED( MacroMigrationDialog, OnStartMigration, void*, void ) { // prevent closing m_pData->bMigrationIsRunning = true; @@ -307,9 +307,6 @@ namespace dbmm { // if there was an error, show the summary automatically travelNext(); } - - // outta here - return 0L; } void MacroMigrationDialog::impl_showCloseDocsError( bool _bShow ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index c4247dc73d82..dc01920162cb 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -65,7 +65,7 @@ namespace dbmm void impl_reloadDocument_nothrow( bool _bMigrationSuccess ); private: - DECL_LINK( OnStartMigration, void* ); + DECL_LINK_TYPED( OnStartMigration, void*, void ); private: ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 0726f04ac84d..cbf6f380d5ab 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -231,7 +231,7 @@ private: OUString m_sCurrentURL; ImplSVEvent * m_nStartWizard; - DECL_LINK( OnStartTableWizard, void* ); + DECL_LINK_TYPED( OnStartTableWizard, void*, void ); public: explicit DBContentLoader(const Reference< XComponentContext >&); virtual ~DBContentLoader(); @@ -562,7 +562,7 @@ void DBContentLoader::cancel() throw(std::exception) { } -IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard ) +IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void ) { m_nStartWizard = 0; try @@ -583,7 +583,6 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard ) OSL_FAIL("caught an exception while starting the table wizard!"); } m_xMySelf = NULL; - return 0L; } } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e2ac9570173d..52e99495efae 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1897,11 +1897,10 @@ IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType ) return 0L; } -IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType ) +IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); newElementWithPilot( eType ); - return 0L; } void OApplicationController::newElementWithPilot( ElementType _eType ) diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index fda9a6a5576e..034a69aec8c4 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -525,8 +525,8 @@ namespace dbaui void OnInvalidateClipboard(); DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK( OnAsyncDrop, void* ); - DECL_LINK( OnCreateWithPilot, void* ); + DECL_LINK_TYPED( OnAsyncDrop, void*, void ); + DECL_LINK_TYPED( OnCreateWithPilot, void*, void ); DECL_LINK( OnSelectContainer, void* ); void OnFirstControllerConnected(); diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index f2943256c0a1..484acf870e8d 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -796,7 +796,7 @@ bool OApplicationController::isTableFormat() const return OTableCopyHelper::isTableFormat(getViewClipboard()); } -IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop ) +IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; @@ -828,8 +828,6 @@ IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop ) } m_aAsyncDrop.aDroppedData.clear(); - - return 0L; } } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d7723afd2c58..c935867d9ddc 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -127,7 +127,7 @@ namespace // class OPreviewWindow class OTablePreviewWindow : public vcl::Window { - DECL_LINK(OnDisableInput, void*); + DECL_LINK_TYPED(OnDisableInput, void*, void); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; @@ -146,10 +146,9 @@ namespace PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true ); return nRet; } - IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput) + IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void) { EnableInput(false); - return 0L; } void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index b7ddc1500474..f8c57cef4695 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -170,10 +170,9 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo return 1L; } -IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected) +IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void) { selectContainer(m_eLastType); - return 0L; } void OApplicationSwapWindow::selectContainer(ElementType _eType) diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 11f04fc9aef8..dba8d5f9db5b 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -38,7 +38,7 @@ namespace dbaui void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); - DECL_LINK( ChangeToLastSelected, void* ); + DECL_LINK_TYPED( ChangeToLastSelected, void*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 8dd872f30ca8..6b2dbe43cbce 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -65,7 +65,7 @@ void OAsynchronousLink::CancelCall() m_nEventId = 0; } -IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg) +IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) { { ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); @@ -74,14 +74,12 @@ IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg) if (!m_nEventId) // our destructor deleted the event just while we are waiting for m_aEventSafety // -> get outta here - return 0; + return; m_nEventId = 0; } } if (m_aHandler.IsSet()) - return m_aHandler.Call(_pArg); - - return 0L; + m_aHandler.Call(_pArg); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index dbec28796059..2f514739eefa 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -215,7 +215,7 @@ namespace dbaui if (pTransfer) pTransfer->CopyToClipboard(getView()); } - IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop ) + IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; @@ -232,8 +232,6 @@ namespace dbaui } m_aAsyncDrop.aDroppedData.clear(); - - return 0L; } void SbaTableQueryBrowser::clearTreeModel() { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 29ca432949cc..a1f1b707d75a 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -361,7 +361,7 @@ Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const c return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); } -IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent ) +IMPL_LINK_NOARG_TYPED( SbaXGridPeer, OnDispatchEvent, void*, void ) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -380,8 +380,6 @@ IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent ) SbaXGridPeer::dispatch( aArgs.aURL, aArgs.aArgs ); } } - - return 0; } SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL ) @@ -1444,7 +1442,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const return xReturn; } -IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent) +IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) { m_nAsyncDropEvent = 0; @@ -1487,8 +1485,6 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent) setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY)); } m_aDataDescriptor.clear(); - - return 0L; } OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0ba230eb9138..d1603a2a1628 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -120,10 +120,10 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; - DECL_LINK( AsynchDeactivate, void* ); + DECL_LINK_TYPED( AsynchDeactivate, void*, void ); private: - DECL_LINK( AsynchActivate, void* ); + DECL_LINK_TYPED( AsynchActivate, void*, void ); }; @@ -200,16 +200,14 @@ namespace dbaui return EditBrowseBox::PreNotify(rNEvt); } - IMPL_LINK_NOARG(ORelationControl, AsynchActivate) + IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchActivate, void*, void) { ActivateCell(); - return 0L; } - IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate) + IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchDeactivate, void*, void) { DeactivateCell(); - return 0L; } bool ORelationControl::IsTabAllowed(bool bForward) const diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 801dcd38ac1b..5316ef088533 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -167,18 +167,16 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) return EditBrowseBox::PreNotify(rNEvt); } -IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate) +IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void) { m_nDeactivateEvent = 0; ActivateCell(); - return 0L; } -IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate) +IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void) { m_nDeactivateEvent = 0; DeactivateCell(); - return 0L; } bool OTableGrantControl::IsTabAllowed(bool bForward) const diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 77edc1fbd907..4e264008184d 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -181,13 +181,13 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown(rMEvt); } -IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry) +IMPL_LINK_TYPED(DBTreeListBox, OnResetEntry, void*, p, void) { + SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // set the flag which allows if the entry can be expanded pEntry->SetFlags( (pEntry->GetFlags() & ~SvTLEntryFlags(SvTLEntryFlags::NO_NODEBMP | SvTLEntryFlags::HAD_CHILDREN)) | SvTLEntryFlags::CHILDREN_ON_DEMAND ); // redraw the entry GetModel()->InvalidateEntry( pEntry ); - return 0L; } void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry ) diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index b97d8ed546cc..30885ab5cc5f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -318,10 +318,9 @@ namespace dbaui { EndDialog( RET_OK ); } - IMPL_LINK_NOARG( DirectSQLDialog, OnClose ) + IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnClose, void*, void ) { EndDialog( RET_OK ); - return 0L; } IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void ) diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index baa9047c6c45..ac120a40723c 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -123,7 +123,7 @@ IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) SAL_WARN_IF( !m_pODBCManagement->isRunning(), "dbaccess.ui", "ODatasourceSelectDialog::ManageClickHdl: success, but not running - you were *fast*!" ); } -IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) +IMPL_LINK_NOARG_TYPED( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) { StringBag aOdbcDatasources; OOdbcEnumeration aEnumeration; @@ -134,8 +134,6 @@ IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) m_pOk->Enable(); m_pCancel->Enable(); m_pManageDatasources->Enable(); - - return 0L; } #endif diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 31c8116ba9e9..842047f8c76e 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -64,7 +64,7 @@ protected: DECL_LINK( ListDblClickHdl, ListBox * ); #ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK_TYPED(ManageClickHdl, Button*, void); - DECL_LINK( ManageProcessFinished, void* ); + DECL_LINK_TYPED( ManageProcessFinished, void*, void ); #endif void fillListBox(const StringBag& _rDatasources); }; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 6fff7c236cd1..8f5df59ef519 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -603,11 +603,11 @@ namespace dbaui EndDialog(RET_OK); } - IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) + IMPL_LINK_TYPED( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) { + SvTreeListEntry* _pEntry = static_cast<SvTreeListEntry*>(p); m_bEditAgain = false; m_pIndexList->EditEntry(_pEntry); - return 0L; } IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry ) diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index ace45b3f3875..b04aa698db60 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -240,11 +240,11 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) // ProcessTerminationWait class ProcessTerminationWait : public ::osl::Thread { - oslProcess m_hProcessHandle; - Link<> m_aFinishHdl; + oslProcess m_hProcessHandle; + Link<void*,void> m_aFinishHdl; public: - ProcessTerminationWait( oslProcess _hProcessHandle, const Link<>& _rFinishHdl ) + ProcessTerminationWait( oslProcess _hProcessHandle, const Link<void*,void>& _rFinishHdl ) :m_hProcessHandle( _hProcessHandle ) ,m_aFinishHdl( _rFinishHdl ) { @@ -262,7 +262,7 @@ protected: }; // OOdbcManagement -OOdbcManagement::OOdbcManagement(const Link<>& rAsyncFinishCallback) +OOdbcManagement::OOdbcManagement(const Link<void*,void>& rAsyncFinishCallback) : m_aAsyncFinishCallback(rAsyncFinishCallback) { } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 3da0b739f575..3059b1dcf06b 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -105,10 +105,10 @@ class ProcessTerminationWait; class OOdbcManagement { ::std::unique_ptr< ProcessTerminationWait > m_pProcessWait; - Link<> m_aAsyncFinishCallback; + Link<void*,void> m_aAsyncFinishCallback; public: - explicit OOdbcManagement( const Link<>& _rAsyncFinishCallback ); + explicit OOdbcManagement( const Link<void*,void>& _rAsyncFinishCallback ); ~OOdbcManagement(); bool manageDataSources_async(); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 75b99d31761f..1d7c81be9df7 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -77,7 +77,7 @@ namespace dbaui virtual void reset() SAL_OVERRIDE; virtual void impl_initialize() SAL_OVERRIDE; virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; - DECL_LINK( OnThreadFinished, void* ); + DECL_LINK_TYPED( OnThreadFinished, void*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 9d73ff7e3919..d7886860482a 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -96,8 +96,8 @@ protected: virtual void CellModified() SAL_OVERRIDE; private: - DECL_LINK( AsynchActivate, void* ); - DECL_LINK( AsynchDeactivate, void* ); + DECL_LINK_TYPED( AsynchActivate, void*, void ); + DECL_LINK_TYPED( AsynchDeactivate, void*, void ); static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege); void fillPrivilege(sal_Int32 _nRow) const; diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index c6199d3c087f..7b590cf38270 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -50,8 +50,8 @@ namespace dbaui DECL_LINK( OnDoubleClick, SvTreeListBox* ); DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); - DECL_LINK( DropHdl, void* ); - DECL_LINK( LookForUiHdl, void* ); + DECL_LINK_TYPED( DropHdl, void*, void ); + DECL_LINK_TYPED( LookForUiHdl, void*, void ); Timer m_aScrollTimer; Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 437bdd88b283..5875f795f7eb 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -75,7 +75,7 @@ namespace dbaui private: void init(); DECL_LINK_TYPED( OnTimeOut, Timer*, void ); - DECL_LINK( OnResetEntry, SvTreeListEntry* ); + DECL_LINK_TYPED( OnResetEntry, void*, void ); DECL_LINK( ScrollUpHdl, SvTreeListBox* ); DECL_LINK( ScrollDownHdl, SvTreeListBox* ); diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index df80ad6b8b31..972261f59822 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -86,7 +86,7 @@ namespace dbaui protected: DECL_LINK_TYPED( OnExecute, Button*, void ); - DECL_LINK( OnClose, void* ); + DECL_LINK_TYPED( OnClose, void*, void ); DECL_LINK_TYPED( OnCloseClick, Button*, void ); DECL_LINK( OnListEntrySelected, void* ); DECL_LINK( OnStatementModified, void* ); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 50f46556e974..3bcdc37a6465 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -137,7 +137,7 @@ namespace dbaui DECL_LINK( OnModified, void* ); DECL_LINK_TYPED( OnCloseDialog, Button*, void ); - DECL_LINK( OnEditIndexAgain, SvTreeListEntry* ); + DECL_LINK_TYPED( OnEditIndexAgain, void*, void ); private: sal_uInt16 mnNewCmdId; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 5266a0ab4665..cdf2ac3d71f0 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -236,7 +236,7 @@ namespace dbaui virtual bool allowQueries() const SAL_OVERRIDE; private: - DECL_LINK( OnExecuteAddTable, void* ); + DECL_LINK_TYPED( OnExecuteAddTable, void*, void ); private: using OQueryController_PBase::getFastPropertyValue; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 0ffd2f12910d..22b63a3cef2d 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -144,7 +144,7 @@ namespace dbaui css::uno::Sequence< css::beans::PropertyValue > aArgs; }; ::std::queue< DispatchArgs > m_aDispatchArgs; - DECL_LINK( OnDispatchEvent, void* ); + DECL_LINK_TYPED( OnDispatchEvent, void*, void ); // for dynamic states of our 4 dispatchable URLs enum DispatchType @@ -304,7 +304,7 @@ namespace dbaui SvNumberFormatter* GetDatasourceFormatter(); - DECL_LINK(AsynchDropEvent, void*); + DECL_LINK_TYPED(AsynchDropEvent, void*, void); private: bool IsReadOnlyDB() const; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 8aad618d0e57..ccd7b5c3fb86 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -354,7 +354,7 @@ namespace dbaui DECL_LINK( OnTreeEntryCompare, const SvSortData* ); - DECL_LINK( OnAsyncDrop, void* ); + DECL_LINK_TYPED( OnAsyncDrop, void*, void ); void implRemoveStatusListeners(); diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 684347a49e6b..a03b51239b46 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -54,10 +54,10 @@ namespace dbaui } private: - DECL_LINK( onExecute, void* ); + DECL_LINK_TYPED( onExecute, void*, void ); }; - IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute ) + IMPL_LINK_NOARG_TYPED( DialogExecutor_Impl, onExecute, void*, void ) { try { @@ -69,7 +69,6 @@ namespace dbaui } delete this; - return 0L; } // AsyncDialogExecutor diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 47eaeb320758..b56469e24d4b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -275,14 +275,13 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDND_Action; } -IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void ) { m_nUiEvent = 0; m_pTabWin->getTableView()->lookForUiActivities(); - return 0L; } -IMPL_LINK_NOARG( OTableWindowListBox, DropHdl ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void ) { // create the connection m_nDropEvent = 0; @@ -298,7 +297,6 @@ IMPL_LINK_NOARG( OTableWindowListBox, DropHdl ) // remember the exception so that we can show them later when d&d is finished m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e)); } - return 0L; } sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 37976f0aa3f7..9a21da5e71ad 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1967,10 +1967,9 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False ); } -IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable ) +IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); - return 0L; } bool OQueryController::allowViews() const diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 46a6c38c8ba3..3cb529731169 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -467,7 +467,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData } } -IMPL_LINK_NOARG( ORelationController, OnThreadFinished ) +IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -486,7 +486,6 @@ IMPL_LINK_NOARG( ORelationController, OnThreadFinished ) DBG_UNHANDLED_EXCEPTION(); } m_pWaitObject.reset(); - return 0L; } void ORelationController::loadData() diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f2ab8c30864c..3cc5fd5e1130 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -630,12 +630,10 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return true; } -IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void ) { nInvalidateTypeEvent = 0; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); - - return 0; } void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) @@ -1462,14 +1460,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void ) { nCutEvent = 0; OTableRowView::cut(); - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) { nPasteEvent = 0; @@ -1493,18 +1490,15 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste ) OTableRowView::Paste( nPastePosition ); SetNoSelection(); GoToRow( nPastePosition ); - - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void ) { nDeleteEvent = 0; DeleteRows(); - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void ) { nInsNewRowsEvent = 0; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); @@ -1514,8 +1508,6 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows ) InsertNewRows( nPastePosition ); SetNoSelection(); GoToRow( nPastePosition ); - - return 0; } void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index c85cb511df22..686270e1ad3c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -176,11 +176,11 @@ namespace dbaui private: DECL_LINK( StartIndexing, void* ); - DECL_LINK( DelayedCut, void* ); - DECL_LINK( DelayedPaste, void* ); - DECL_LINK( DelayedDelete, void* ); - DECL_LINK( DelayedInsNewRows, void* ); - DECL_LINK( InvalidateFieldType, void* ); + DECL_LINK_TYPED( DelayedCut, void*, void ); + DECL_LINK_TYPED( DelayedPaste, void*, void ); + DECL_LINK_TYPED( DelayedDelete, void*, void ); + DECL_LINK_TYPED( DelayedInsNewRows, void*, void ); + DECL_LINK_TYPED( InvalidateFieldType, void*, void ); void InitCellController(); sal_Int32 HasFieldName( const OUString& rFieldName ); diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index a7159e13496a..068c27e64e1c 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -79,12 +79,12 @@ class Desktop : public Application virtual void OverrideSystemSettings( AllSettings& rSettings ) SAL_OVERRIDE; virtual void AppEvent( const ApplicationEvent& rAppEvent ) SAL_OVERRIDE; - DECL_LINK( OpenClients_Impl, void* ); + DECL_LINK_TYPED( OpenClients_Impl, void*, void ); static void OpenClients(); static void OpenDefault(); - DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*); + DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void); static void HandleAppEvent( const ApplicationEvent& rAppEvent ); static ResMgr* GetDesktopResManager(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 798b69552ab3..b916d5396536 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1870,7 +1870,7 @@ class ExitTimer : public Timer } }; -IMPL_LINK_NOARG(Desktop, OpenClients_Impl) +IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void) { try { OpenClients(); @@ -1892,14 +1892,12 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) OUString a( "UNO exception during client open:\n" ); Application::Abort( a + e.Message ); } - return 0; } // enable acceptors -IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl) +IMPL_STATIC_LINK_NOARG_TYPED(Desktop, EnableAcceptors_Impl, void*, void) { enableAcceptors(); - return 0; } diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index c406336bbb86..a7075f128be5 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -282,19 +282,18 @@ OUString CreateMD5FromString( const OUString& aMsg ) class ProcessEventsClass_Impl { public: - DECL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void* pEvent ); - DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void* pEvent ); + DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, void ); + DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void ); }; -IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) +IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void ) { // Application events are processed by the Desktop::HandleAppEvent implementation. Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) ); delete static_cast<ApplicationEvent*>(pEvent); - return 0; } -IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) +IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void ) { // Documents requests are processed by the OfficeIPCThread implementation ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent); @@ -304,7 +303,6 @@ IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest ); delete pDocsRequest; } - return 0; } void ImplPostForeignAppEvent( ApplicationEvent* pEvent ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index cd2176a559d7..0c876826b330 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -655,7 +655,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const return true; } -void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink ) +void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink ) { if ( m_nEventID ) Application::RemoveUserEvent( m_nEventID ); @@ -967,7 +967,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void) -IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface ) +IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) { ::osl::MutexGuard aGuard( m_aMutex ); bool bLockInterface = (bool) _bLockInterface; @@ -994,8 +994,6 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface ) m_pExtensionBox->enableButtons( !bLockInterface ); clearEventID(); - - return 0; } @@ -1287,7 +1285,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void) } -IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface ) +IMPL_LINK_TYPED( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void ) { ::osl::MutexGuard aGuard( m_aMutex ); bool bLockInterface = (bool) _bLockInterface; @@ -1310,8 +1308,6 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface ) m_pCancelBtn->Enable( bLockInterface ); m_pUpdateBtn->Enable( false ); clearEventID(); - - return 0; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index df227bd726c6..8f7b3009f604 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -68,7 +68,7 @@ public: void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const; Dialog* getWindow() const { return m_pVCLWindow; }; - void PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink = false ); + void PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink = false ); void clearEventID() { m_nEventID = 0; } virtual void showProgress( bool bStart ) = 0; @@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog, DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_DLLPRIVATE_LINK( startProgress, void * ); + DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void ); public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); @@ -201,7 +201,7 @@ class UpdateRequiredDialog : public ModalDialog, DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void ); DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void ); DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_DLLPRIVATE_LINK( startProgress, void * ); + DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); static bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ); diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index ff1a73171875..4a3878e21aa8 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -272,11 +272,10 @@ namespace bib pGridWin->GrabFocus(); } - IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl ) + IMPL_LINK_NOARG_TYPED( BibBeamer, RecalcLayout_Impl, void*, void ) { long nHeight = pToolBar->GetSizePixel().Height(); SetItemSize( ID_TOOLBAR, nHeight ); - return 0L; } } // namespace bib diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 3569ff506439..02e074a18a5e 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -54,7 +54,7 @@ namespace bib VclPtr<BibToolBar> pToolBar; VclPtr<BibGridwin> pGridWin; - DECL_LINK( RecalcLayout_Impl, void* ); + DECL_LINK_TYPED( RecalcLayout_Impl, void*, void ); protected: diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 23d4186f7537..e497ee80f69a 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -176,10 +176,9 @@ namespace bib mpBibView->Resize(); } - IMPL_LINK( BibView, CallMappingHdl, BibView*, ) + IMPL_LINK_NOARG_TYPED( BibView, CallMappingHdl, void*, void) { m_pDatMan->CreateMappingDialog( this ); - return 0; } void BibView::Resize() diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index a27693221b03..86719c11b936 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -63,7 +63,7 @@ namespace bib BibViewFormControlContainer m_aFormControlContainer; private: - DECL_LINK(CallMappingHdl, BibView*); + DECL_LINK_TYPED(CallMappingHdl, void*, void); public: // Window overridables diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 790b32ec8521..af476f6b251a 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -630,10 +630,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } } } -IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl ) +IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void ) { xFrame->dispose(); - return 0; }; void BibFrameController_Impl::addStatusListener( diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index ce93e27782e4..f56e56135628 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -69,7 +69,7 @@ friend class BibFrameCtrl_Impl; BibDataManager* pDatMan; HdlBibModul pBibMod; - DECL_LINK( DisposeHdl, void* ); + DECL_LINK_TYPED( DisposeHdl, void*, void ); static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController); public: diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 56aeb13b1b76..f634b49271f7 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -176,7 +176,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw } } -BibToolBar::BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle): +BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 6c79ce1d2919..271e54dab088 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -123,7 +123,7 @@ class BibToolBar: public ToolBox sal_uInt16 nMenuId; sal_uInt16 nSelMenuItem; OUString aQueryField; - Link<> aLayoutManager; + Link<void*,void> aLayoutManager; sal_Int16 nSymbolsSize; sal_Int16 nOutStyle; @@ -148,7 +148,7 @@ class BibToolBar: public ToolBox public: - BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle = WB_3DLOOK ); + BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle = WB_3DLOOK ); virtual ~BibToolBar(); virtual void dispose() SAL_OVERRIDE; diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index f36e89b24079..f57540abd0ed 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -177,11 +177,12 @@ struct AsynchronousGetURL OUString aTarget; Reference< XEventListener > xListener; - DECL_LINK( getURL, XPlugin_Impl* ); + DECL_LINK_TYPED( getURL, void*, void ); }; -IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl ) +IMPL_LINK_TYPED( AsynchronousGetURL, getURL, void*, p, void ) { + XPlugin_Impl* pImpl = static_cast<XPlugin_Impl*>(p); try { pImpl->enterPluginCallback(); @@ -202,7 +203,6 @@ IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl ) } pImpl->leavePluginCallback(); delete this; - return 0; } diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index eab48cd11979..f8e69e757fc2 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -189,7 +189,7 @@ void XPlugin_Impl::checkListeners( const char* normalizedURL ) } } -IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ ) +IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void ) { Guard< Mutex > aGuard( m_aMutex ); @@ -206,7 +206,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ ) break; } if( iter == rList.end() || ! isDisposable() ) - return 0; + return; } if (m_pDisposer) @@ -229,7 +229,6 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ ) #endif destroyInstance(); PluginControl_Impl::dispose(); - return 0; } void XPlugin_Impl::dispose() throw(std::exception) diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index efbe9e366fe7..e0e9487926a9 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -201,7 +201,7 @@ public: void enterPluginCallback() { m_nCalledFromPlugin++; } void leavePluginCallback() { m_nCalledFromPlugin--; } bool isDisposable() { return m_nCalledFromPlugin < 1; } - DECL_LINK( secondLevelDispose, XPlugin_Impl* ); + DECL_LINK_TYPED( secondLevelDispose, void*, void ); void addPluginEventListener( PluginEventListener* pListener ) { m_aPEventListeners.push_back( pListener ); } diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 20db98077040..d0e3d33bc9af 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -133,7 +133,7 @@ protected: static std::vector<PluginConnector*> allConnectors; DECL_LINK( NewMessageHdl, Mediator* ); - DECL_LINK( WorkOnNewMessageHdl, Mediator* ); + DECL_LINK_TYPED( WorkOnNewMessageHdl, void*, void ); std::vector<NPStream*> m_aNPWrapStreams; std::vector<ConnectorInstance*> m_aInstances; diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 1129fc8ea3b9..5330c823bb04 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -520,7 +520,7 @@ PluginConnector::~PluginConnector() { } -IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) +IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void ) { MediatorMessage* pMessage; CommandAtoms nCommand; @@ -928,7 +928,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) } delete pMessage; } - return 0; } void LoadAdditionalLibs( const char* _pPluginLib ) diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index e55b14b3d35c..e89ded2a74ca 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -80,7 +80,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ ) return 0; } -IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) +IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void ) { bool bFound = false; for( std::vector< PluginConnector* >::iterator it = allConnectors.begin(); @@ -90,7 +90,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) bFound = true; } if( ! bFound ) - return 0; + return; MediatorMessage* pMessage; CommandAtoms nCommand; @@ -323,7 +323,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) delete pMessage; } - return 0; } #define GET_INSTANCE() \ diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 1028a0e2cede..85efd4ef82df 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -673,13 +673,12 @@ namespace pcr } - IMPL_LINK_NOARG( FormLinkDialog, OnInitialize ) + IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void ) { initializeColumnLabels(); initializeFieldLists(); initializeLinks(); initializeSuggest(); - return 0L; } } // namespace pcr diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 044432c2bed0..3913257fb4c0 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -88,7 +88,7 @@ namespace pcr private: DECL_LINK_TYPED( OnSuggest, Button*, void ); DECL_LINK( OnFieldChanged, FieldLinkRow* ); - DECL_LINK( OnInitialize, void* ); + DECL_LINK_TYPED( OnInitialize, void*, void); void updateOkButton(); void initializeFieldLists(); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 94d3ee4cd57c..2a9005a3e9ef 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -460,15 +460,13 @@ namespace pcr } - IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked ) + IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void ) { ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( boost::bind( &XActionListener::actionPerformed, _1, boost::cref(aEvent) ) ); - - return 0; } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 22edd9703358..e88111c453f7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -165,8 +165,8 @@ namespace pcr class HyperlinkInput : public Edit { private: - Point m_aMouseButtonDownPos; - Link<> m_aClickHandler; + Point m_aMouseButtonDownPos; + Link<void*,void> m_aClickHandler; public: HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle ); @@ -174,7 +174,7 @@ namespace pcr /** sets the handler which will (asynchronously, with locked SolarMutex) be called when the hyperlink has been clicked by the user */ - void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; } + void SetClickHdl( const Link<void*,void>& _rHdl ) { m_aClickHandler = _rHdl; } protected: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -213,7 +213,7 @@ namespace pcr virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: - DECL_LINK( OnHyperlinkClicked, void* ); + DECL_LINK_TYPED( OnHyperlinkClicked, void*, void ); }; diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index ec249536032c..f4df5af73ae4 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -104,8 +104,8 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener > uno::Reference< frame::XFrame > ImplGetActiveFrame(); uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster(); - DECL_LINK( ImplFallbackHdl, void* ); - DECL_LINK( ImplDestroyHdl, void* ); + DECL_LINK_TYPED( ImplFallbackHdl, void*, void ); + DECL_LINK_TYPED( ImplDestroyHdl, void*, void ); // from util::XCloseListener virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException); @@ -421,7 +421,7 @@ void ImpTwain::ImplFallback( ULONG_PTR nEvent ) Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent ); } -IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) +IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void ) { const sal_uIntPtr nEvent = (sal_uIntPtr) pData; bool bFallback = true; @@ -489,11 +489,9 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) if( bFallback ) ImplFallback( nEvent ); - - return 0L; } -IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl ) +IMPL_LINK_NOARG_TYPED( ImpTwain, ImplDestroyHdl, void*, void ) { if( hTwainWnd ) DestroyWindow( hTwainWnd ); @@ -505,8 +503,6 @@ IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl ) // should drop to zero exactly here) mxSelfRef = NULL; pImpTwainInstance = NULL; - - return 0L; } uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index d2ce4062dca8..55c77b66d2d6 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -147,7 +147,7 @@ private: DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* ); DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); DECL_LINK_TYPED(TimeOutHdl, Timer *, void); - DECL_LINK(UserEventHdl, void *); + DECL_LINK_TYPED(UserEventHdl, void *, void); DECL_LINK( WindowEventHdl, VclWindowEvent* ); DECL_LINK( ApplicationEventHdl, VclSimpleEvent* ); @@ -631,7 +631,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void) } -IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) +IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) { SolarMutexGuard aGuard; @@ -659,8 +659,6 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) if ( pActiveSysWin ) AddMenuBarIcon( pActiveSysWin, true ); - - return 0; } diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 9d5f55dc7031..62fd0b6860fc 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -415,7 +415,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { // Asynchronous for css::util::URL-Button - ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); + ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) ); { ::osl::MutexGuard aGuard( m_aMutex ); m_nClickEvent = n; @@ -423,7 +423,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::co } -IMPL_LINK_NOARG(OButtonControl, OnClick) +IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); m_nClickEvent = 0; @@ -443,7 +443,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick) // recognize the button type Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (!xSet.is()) - return 0L; + return; if (FormButtonType_PUSH == *static_cast<FormButtonType const *>(xSet->getPropertyValue(PROPERTY_BUTTONTYPE).getValue())) { @@ -474,7 +474,6 @@ IMPL_LINK_NOARG(OButtonControl, OnClick) else actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() ); } - return 0L; } diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 825d8dcb645e..c6a3139b3c4b 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -181,7 +181,7 @@ protected: virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE; private: - DECL_LINK( OnClick, void* ); + DECL_LINK_TYPED( OnClick, void*, void ); /// to be called whenever the feature URL represented by our model has potentially changed void modelFeatureUrlPotentiallyChanged( ); diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 3c4f6bf6cb0e..a135db3a7fa6 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -238,7 +238,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( // Because we're still in the header, trigger submit asynchronously if( m_nKeyEvent ) Application::RemoveUserEvent( m_nKeyEvent ); - m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl,OnKeyPressed) ); + m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl, OnKeyPressed) ); } @@ -247,7 +247,7 @@ void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) thr } -IMPL_LINK_NOARG(OEditControl, OnKeyPressed) +IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void) { m_nKeyEvent = 0; @@ -256,7 +256,6 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed) Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() ); - return 0L; } diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 52b32b370d7e..3f89f221efc9 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -170,7 +170,7 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - DECL_LINK( OnKeyPressed, void* ); + DECL_LINK_TYPED( OnKeyPressed, void*, void ); }; } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 036605d0df7d..8fde4d8a8534 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -240,7 +240,7 @@ void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/ { } -IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed) +IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void) { m_nKeyEvent = 0; Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); @@ -248,7 +248,6 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed) Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() ); - return 0L; } css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() throw(std::exception) diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 812f7f252a00..84132df1f478 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -181,7 +181,7 @@ class OFormattedModel using OBoundControl::disposing; private: - DECL_LINK( OnKeyPressed, void* ); + DECL_LINK_TYPED( OnKeyPressed, void*, void ); }; } #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 0788de46a203..e78a289b869d 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -34,7 +34,7 @@ private: Selection aOldSel; bool bMouseFlag; - DECL_LINK(ChangedHdl, void *); + DECL_LINK_TYPED(ChangedHdl, void *, void); protected: diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 8763389da9cc..606e6f3c4c72 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -437,7 +437,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt ) //When an Event cleared wurde, this routine is //first called. -IMPL_LINK_NOARG(EditBox, ChangedHdl) +IMPL_LINK_NOARG_TYPED(EditBox, ChangedHdl, void*, void) { if(pMEdit!=nullptr) { @@ -449,7 +449,6 @@ IMPL_LINK_NOARG(EditBox, ChangedHdl) aOldSel=aNewSel; } } - return 0; } void EditBox::UpdateOldSel() diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index 8e4c9e3d2ff6..6150b44f6a8a 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -125,7 +125,7 @@ namespace svt } - IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg ) + IMPL_LINK_TYPED( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void ) { DBG_TESTSOLARMUTEX(); // if this asserts, we'd need to have an own mutex per instance @@ -143,12 +143,12 @@ namespace svt if ( eFailure == eResult ) // TODO: do we need some kind of cleanup here? - return 0L; + return; if ( eTimeout == eResult ) { SvtFileDialog::displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ ); - return 0L; + return; } OSL_ENSURE( eSuccess == eResult, "AsyncPickerAction::OnActionDone: what else valid results are there?" ); @@ -173,8 +173,6 @@ namespace svt OSL_FAIL( "AsyncPickerAction::OnActionDone: unknown action!" ); break; } - - return 1L; } diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index bd40153ea8a8..0778d979760c 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -88,7 +88,7 @@ namespace svt virtual ~AsyncPickerAction(); private: - DECL_LINK( OnActionDone, void* ); + DECL_LINK_TYPED( OnActionDone, void*, void ); AsyncPickerAction( const AsyncPickerAction& ) SAL_DELETED_FUNCTION; AsyncPickerAction& operator=( const AsyncPickerAction& ) SAL_DELETED_FUNCTION; diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 451231e362e9..553214ebe3fa 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -389,7 +389,7 @@ namespace svt } - IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker) + IMPL_LINK_NOARG_TYPED(OCommonPicker, OnCancelPicker, void*, void) { // By definition, the solar mutex is locked when we arrive here. Note that this // is important, as for instance the consistency of m_pDlg depends on this mutex. @@ -400,13 +400,11 @@ namespace svt // nothing to do. This may be because the dialog was canceled after our cancel method // posted this async event, or because somebody called cancel without the dialog // being executed at this time. - return 0; + return; OSL_ENSURE( getDialog(), "OCommonPicker::OnCancelPicker: executing, but no dialog!" ); if ( getDialog() ) getDialog()->EndDialog(); - - return 0L; } diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 30c1ed72db18..6573de0579f0 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -186,7 +186,7 @@ namespace svt private: void stopWindowListening(); - DECL_LINK( OnCancelPicker, void* ); + DECL_LINK_TYPED( OnCancelPicker, void*, void ); }; } // namespace svt diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index d1e042d956bb..c8b4e7c37a91 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -168,7 +168,7 @@ namespace framework virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - DECL_LINK(MenuBarClose, void *); + DECL_LINK_TYPED( MenuBarClose, void *, void); DECL_LINK( WindowEventListener, VclSimpleEvent* ); // ILayoutNotifications diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index b24186f644bf..bf9b7cf81611 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -71,8 +71,8 @@ class ComplexToolbarController : public svt::ToolboxController // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); - DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* ); + DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void); protected: static sal_Int32 getFontSizePixel( const vcl::Window* pWindow ); diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index 26ebeb61ab46..cfef97d562fe 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -51,7 +51,7 @@ class GenericToolbarController : public svt::ToolboxController // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void ); protected: VclPtr<ToolBox> m_pToolbar; diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index a86d5ad97e9f..3243278d0dda 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -77,7 +77,7 @@ namespace framework // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* ); + DECL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, void ); private: virtual void impl_setPopupMenu() SAL_OVERRIDE; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 9a43da9b143c..5cf00f7290fe 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -140,7 +140,7 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK( MenuSelect, Menu * ); DECL_LINK_TYPED( MenuDeactivate, Menu *, bool ); DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void); - DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void ); virtual bool MenuItemAllowed( sal_uInt16 ) const; diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 41eb059f376c..3cc2c26ca660 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -80,7 +80,7 @@ namespace framework ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, void ); private: void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 743e45bdd65e..1f3b074e0b07 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1651,11 +1651,10 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } -IMPL_STATIC_LINK_NOARG( AddonsOptions, Notify ) +IMPL_STATIC_LINK_NOARG_TYPED( AddonsOptions, Notify, void*, void ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->ReadConfigurationData(); - return 0; } } diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 2cf7fb05f1e0..f27f528dd454 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2595,7 +2595,7 @@ bool LayoutManager::implts_resetMenuBar() return false; } -IMPL_LINK_NOARG(LayoutManager, MenuBarClose) +IMPL_LINK_NOARG_TYPED(LayoutManager, MenuBarClose, void*, void) { SolarMutexClearableGuard aReadLock; uno::Reference< frame::XDispatchProvider > xProvider(m_xFrame, uno::UNO_QUERY); @@ -2603,7 +2603,7 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose) aReadLock.clear(); if ( !xProvider.is()) - return 0; + return; uno::Reference< frame::XDispatchHelper > xDispatcher = frame::DispatchHelper::create( xContext ); @@ -2613,8 +2613,6 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose) OUString("_self"), 0, uno::Sequence< beans::PropertyValue >()); - - return 0; } // XLayoutManagerEventBroadcaster diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 8542eb626bfb..5ac9a3a1a59f 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -196,8 +196,9 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); SolarMutexReleaser aReleaser; try { @@ -211,11 +212,11 @@ IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExec } delete pExecuteInfo; - return 0; } -IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo ) +IMPL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, p, void ) { + NotifyInfo* pNotifyInfo = static_cast<NotifyInfo*>(p); SolarMutexReleaser aReleaser; try { @@ -233,7 +234,6 @@ IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInf } delete pNotifyInfo; - return 0; } void ComplexToolbarController::addNotifyInfo( diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 8c578e257cfc..bb599ab771b9 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -269,8 +269,9 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); SolarMutexReleaser aReleaser; try { @@ -284,7 +285,6 @@ IMPL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExec } delete pExecuteInfo; - return 0; } MenuToolbarController::MenuToolbarController( const Reference< XComponentContext >& rxContext, diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 5cc190e9a0c8..384c3e1e0a5f 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -522,8 +522,9 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) } } -IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument*, pNewDocument ) +IMPL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, p, void ) { + NewDocument* pNewDocument = static_cast<NewDocument*>(p); /* i62706: Don't catch all exceptions. We hide all problems here and are not able to handle them on higher levels. try @@ -534,7 +535,6 @@ IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument*, pNewDocument // elements if a component gets detached from its frame! pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq ); delete pNewDocument; - return 0; } } diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 1863251e5261..c21cb351e2cb 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -100,7 +100,7 @@ public: // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; - DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); + DECL_STATIC_LINK_TYPED( RecentFilesMenuController, ExecuteHdl_Impl, void*, void ); private: virtual void impl_setPopupMenu() SAL_OVERRIDE; @@ -439,8 +439,9 @@ throw( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) +IMPL_STATIC_LINK_TYPED( RecentFilesMenuController, ExecuteHdl_Impl, void*, p, void ) { + LoadRecentFile* pLoadRecentFile = static_cast<LoadRecentFile*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -453,7 +454,6 @@ IMPL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, p } delete pLoadRecentFile; - return 0; } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 2c946aacbd8a..2224e5cbcf3c 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2121,8 +2121,9 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void) UpdateControllers(); } -IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -2158,7 +2159,6 @@ IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) } delete pExecuteInfo; - return 0; } Image ToolBarManager::QueryAddonsImage( const OUString& aCommandURL, bool bBigImages ) diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 277469bc2646..6305cea7f3d7 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -851,8 +851,9 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume } } -IMPL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -868,7 +869,6 @@ IMPL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecut } delete pExecuteInfo; - return 0; } } diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index 789a3fed0d52..a551886540cc 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -58,7 +58,7 @@ namespace dbaui void CancelCall(); protected: - DECL_LINK(OnAsyncCall, void*); + DECL_LINK_TYPED(OnAsyncCall, void*, void); }; } #endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index dee6ec0ef662..92bf9048e96e 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -229,7 +229,7 @@ class FWE_DLLPUBLIC AddonsOptions We create a static mutex only for one ime and use at different times. @return A reference to a static mutex member. *//*-*****************************************************************************************************/ - DECL_STATIC_LINK( AddonsOptions, Notify, void* ); + DECL_STATIC_LINK_TYPED( AddonsOptions, Notify, void*, void ); private: diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index c3021091d429..854703a89b15 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -223,7 +223,7 @@ public: */ void SetContext( Context _eNewContext ); - DECL_LINK( ExecuteSystemFilePicker, void* ); + DECL_LINK_TYPED( ExecuteSystemFilePicker, void*, void ); ErrCode Execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index fbcc47708f78..36a7cabe1b8c 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -41,7 +41,7 @@ class SfxHintPoster : public SvRefBase private: Link<SfxRequest*,void> m_Link; - DECL_LINK( DoEvent_Impl, SfxRequest * ); + DECL_LINK_TYPED( DoEvent_Impl, void*, void ); protected: virtual ~SfxHintPoster(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 2232406e0145..f502fa0eefcd 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -57,7 +57,7 @@ public: /// Update the information in the view. virtual void Reload() SAL_OVERRIDE; - DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* ); + DECL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, void ); protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index 408805ad4330..02186de0c6ba 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -46,7 +46,7 @@ private: Action maAction; ImplSVEvent * mnCallId; - DECL_LINK(HandleUserCall, void*); + DECL_LINK_TYPED(HandleUserCall, void*, void); }; } } // end of namespace sfx2::sidebar diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index f7fa977f7a2f..0607377e9b3d 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -132,7 +132,7 @@ namespace svt DECL_LINK(OnComboLoseFocus, ComboBox*); DECL_LINK(OnComboSelect, ComboBox*); DECL_LINK_TYPED(OnOkClicked, Button*, void); - DECL_LINK(OnDelayedInitialize, void*); + DECL_LINK_TYPED(OnDelayedInitialize, void*, void); }; diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index 862bd3fc0351..747b0c38678d 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -41,7 +41,7 @@ class SVT_DLLPUBLIC AsynchronLink ::osl::Mutex* _pMutex; DECL_DLLPRIVATE_LINK_TYPED( HandleCall_Idle, Idle*, void ); - DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void* ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCall_PostUserEvent, void*, void ); SVT_DLLPRIVATE void Call_Impl( void* pArg ); public: diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx index 4b7db90b83fd..3333027d4391 100644 --- a/include/svtools/contextmenuhelper.hxx +++ b/include/svtools/contextmenuhelper.hxx @@ -63,7 +63,7 @@ class SVT_DLLPUBLIC ContextMenuHelper private: // asynchronous link to prevent destruction while on stack - DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void ); ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION; const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 62d0aeabbb93..753e0684f8e9 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -667,9 +667,9 @@ namespace svt SVT_DLLPRIVATE void impl_construct(); DECL_DLLPRIVATE_LINK(ModifyHdl, void* ); - DECL_DLLPRIVATE_LINK(StartEditHdl, void* ); - DECL_DLLPRIVATE_LINK(EndEditHdl, void* ); - DECL_DLLPRIVATE_LINK(CellModifiedHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED(StartEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK_TYPED(EndEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK_TYPED(CellModifiedHdl, void*, void ); }; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 69469754994e..0621dd7718d7 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -51,7 +51,7 @@ struct FileViewAsyncAction { sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned - Link<> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result + Link<void*,void> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result FileViewAsyncAction() { diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index d5bf7d7fc51d..5356b27844fa 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -47,7 +47,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void ); private: VclPtr<ToolBox> m_pToolbox; diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index c800470f4ccf..474864ef40ee 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -111,7 +111,7 @@ namespace svt virtual void impl_setPopupMenu(); static OUString determineBaseURL( const OUString& aURL ); - DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); + DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); bool m_bInitialized; diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index fb61f2171756..288d8d97a938 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -149,7 +149,7 @@ class SVT_DLLPUBLIC ToolboxController : {} }; - DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); + DECL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, void ); typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 3f54aeba6263..556f5e82e790 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -56,7 +56,7 @@ protected: // DragSourceHelper virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) SAL_OVERRIDE; - DECL_LINK(ExecDragHdl, void*); + DECL_LINK_TYPED(ExecDragHdl, void*, void); public: SvxColorValueSet_docking( vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index c9147531f3d0..76355084a10e 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -85,7 +85,7 @@ protected: */ void notifyColumnSelect(sal_uInt16 nColumnId); private: - DECL_LINK( OnAsyncExecuteDrop, void* ); + DECL_LINK_TYPED( OnAsyncExecuteDrop, void*, void ); }; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 6ff1dfeec8da..e3962aa07312 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -584,9 +584,9 @@ protected: protected: void ImplInitWindow( const InitWindowFacet _eInitWhat ); - DECL_LINK(OnDelete, void*); + DECL_LINK_TYPED(OnDelete, void*, void); - DECL_LINK(OnAsyncAdjust, void*); + DECL_LINK_TYPED(OnAsyncAdjust, void*, void); // if the param is != NULL, AdjustRows will be called, else AdjustDataSource private: diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 153efff59575..2b7d13b76d3e 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -148,7 +148,7 @@ private: SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos ); - DECL_LINK( UpdateHdl, void * ); + DECL_LINK_TYPED( UpdateHdl, void *, void ); //TableModelRef mxTable; rtl::Reference< TableModel > mxTable; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 273606b2220e..5fc0708fed02 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -58,7 +58,7 @@ private: SAL_DLLPRIVATE Dialog (const Dialog &) SAL_DELETED_FUNCTION; SAL_DLLPRIVATE Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION; - DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void ); protected: using Window::ImplInit; diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index e98ec15398e8..55f93685cac6 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -38,7 +38,7 @@ namespace vcl ImplSVEvent * m_nId; Link<> m_aLink; - DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* ); + DECL_DLLPRIVATE_LINK_TYPED( DoEvent_Impl, void*, void ); public: EventPoster( const Link<>& rLink ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 023666f5f04c..9c64ada7c50c 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -112,7 +112,7 @@ private: Link<> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); - DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE; FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index e6109dbc3507..2c77726ad0bc 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -183,7 +183,7 @@ protected: SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); - DECL_DLLPRIVATE_LINK(ImplCallSelect, void* ); + DECL_DLLPRIVATE_LINK_TYPED(ImplCallSelect, void*, void ); SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; } @@ -412,7 +412,7 @@ VCL_DLLPUBLIC void Invalidated(); class VCL_DLLPUBLIC MenuBar : public Menu { - Link<> maCloseHdl; + Link<void*,void> maCloseHdl; Link<> maFloatHdl; Link<> maHideHdl; bool mbCloseBtnVisible : 1; @@ -468,10 +468,10 @@ public: bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const; bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId); - void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; } - const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; } - const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; } - const Link<>& GetHideButtonClickHdl() const { return maHideHdl; } + void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; } + const Link<void*,void>& GetCloseButtonClickHdl() const { return maCloseHdl; } + const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; } + const Link<>& GetHideButtonClickHdl() const { return maHideHdl; } // - by default a menubar is displayable // - if a menubar is not displayable, its MenuBarWindow will never be shown diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index e7808c0b1e12..d9dd2eddaf6c 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -853,7 +853,7 @@ public: @return the event ID used to post the event. */ - static ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL, + static ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL, bool bReferenceLink = false ); /** Remove user event based on event ID @@ -1489,7 +1489,7 @@ private: static void InitSettings(ImplSVData* pSVData); - DECL_STATIC_LINK( Application, PostEventHandler, void* ); + DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void ); }; @@ -1682,7 +1682,7 @@ VCL_DLLPUBLIC void JoinMainLoopThread(); inline void Application::EndYield() { - PostUserEvent( Link<>() ); + PostUserEvent( Link<void*,void>() ); } namespace vcl diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index b5122f60c5e9..939b9de2aaaa 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -38,7 +38,7 @@ namespace vcl long m_nReturn; bool m_bTimeout; - DECL_DLLPRIVATE_LINK( worker, void* ); + DECL_DLLPRIVATE_LINK_TYPED( worker, void*, void ); public: SolarThreadExecutor(); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 7fe0bd1283af..9d91d49a1ab1 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -224,7 +224,7 @@ private: SAL_DLLPRIVATE bool ImplHasExternalMenubutton(); SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem ); - DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplCallExecuteCustomMenu, void*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void ); DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* ); DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 57ac3197aaaa..63be0ac19f2c 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -554,9 +554,9 @@ private: public: DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void ); @@ -884,7 +884,7 @@ public: void AddChildEventListener( const Link<>& rEventListener ); void RemoveChildEventListener( const Link<>& rEventListener ); - ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL, bool bReferenceLink = false ); + ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL, bool bReferenceLink = false ); void RemoveUserEvent( ImplSVEvent * nUserEvent ); void IncrementLockCount(); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 88bc3164a971..d2f4281dc90d 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -168,13 +168,13 @@ protected: private: - DECL_LINK( DelayedPaste, void* ); - DECL_LINK( CBChangeHdl,ComboBox*); + DECL_LINK_TYPED( DelayedPaste, void*, void ); + DECL_LINK( CBChangeHdl, ComboBox*); void InsertRows( long nRow ); public: - DECL_LINK( DelayedDelete, void* ); + DECL_LINK_TYPED( DelayedDelete, void*, void ); }; @@ -858,7 +858,7 @@ void OFieldExpressionControl::paste() } } -IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste ) +IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void ) { m_nPasteEvent = 0; @@ -867,15 +867,12 @@ IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste ) InsertRows( nPastePosition ); SetNoSelection(); GoToRow( nPastePosition ); - - return 0; } -IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete ) +IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedDelete, void*, void ) { m_nDeleteEvent = 0; DeleteRows(); - return 0; } void OFieldExpressionControl::InsertRows( long nRow ) diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 4c85a2c3159a..b53f1b32bb85 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -316,8 +316,8 @@ namespace rptui void OnInvalidateClipboard(); DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK( OnExecuteReport, void* ); - DECL_LINK( OnOpenHelpAgent, void* ); + DECL_LINK_TYPED( OnExecuteReport, void*, void ); + DECL_LINK_TYPED( OnOpenHelpAgent, void*, void ); // all the features which should be handled by this class virtual void describeSupportedFeatures() SAL_OVERRIDE; // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 4f5b9f712c84..811d57c2c389 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -83,7 +83,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> CreateComponentPair( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xFormComponent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); - DECL_LINK( OnAsyncGetFocus, void* ); + DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); public: PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 301385410da6..f706f88351ce 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1746,10 +1746,9 @@ void OReportController::impl_initialize( ) } } -IMPL_LINK_NOARG( OReportController, OnOpenHelpAgent ) +IMPL_LINK_NOARG_TYPED( OReportController, OnOpenHelpAgent, void*, void ) { doOpenHelpAgent(); - return 0L; } IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg) @@ -3147,10 +3146,9 @@ void OReportController::createNewFunction(const uno::Any& _aValue) xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction)); } -IMPL_LINK_NOARG( OReportController, OnExecuteReport ) +IMPL_LINK_NOARG_TYPED( OReportController, OnExecuteReport, void*, void ) { executeReport(); - return 0L; } void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 6706c74cfe85..76e66e891ca3 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -569,11 +569,10 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) } } -IMPL_LINK_NOARG( PropBrw, OnAsyncGetFocus ) +IMPL_LINK_NOARG_TYPED( PropBrw, OnAsyncGetFocus, void*, void ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); - return 0L; } void PropBrw::LoseFocus() diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 66b3bf589a8a..4a18293ccc03 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -297,8 +297,9 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) return 0; } -IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) +IMPL_LINK_TYPED(ScCondFormatList, AfterTypeListHdl, void*, p, void) { + ListBox* pBox = static_cast<ListBox*>(p); EntryContainer::iterator itr = maEntries.begin(); for(; itr != maEntries.end(); ++itr) { @@ -306,7 +307,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) break; } if(itr == maEntries.end()) - return 0;; + return; sal_Int32 nPos = pBox->GetSelectEntryPos(); switch(nPos) @@ -322,7 +323,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) case condformat::entry::COLORSCALE3: case condformat::entry::DATABAR: case condformat::entry::ICONSET: - return 0; + return; } itr->disposeAndClear(); *itr = VclPtr<ScColorScale3FrmtEntry>::Create(this, mpDoc, maPos); @@ -331,7 +332,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) break; case 1: if((*itr)->GetType() == condformat::entry::CONDITION) - return 0; + return; itr->disposeAndClear(); *itr = VclPtr<ScConditionFrmtEntry>::Create(this, mpDoc, mpDialogParent, maPos); @@ -340,7 +341,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) break; case 2: if((*itr)->GetType() == condformat::entry::FORMULA) - return 0; + return; itr->disposeAndClear(); *itr = VclPtr<ScFormulaFrmtEntry>::Create(this, mpDoc, mpDialogParent, maPos); @@ -349,7 +350,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) break; case 3: if((*itr)->GetType() == condformat::entry::DATE) - return 0; + return; itr->disposeAndClear(); *itr = VclPtr<ScDateFrmtEntry>::Create( this, mpDoc ); @@ -359,7 +360,6 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) } RecalcAll(); - return 0; } IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index b9e4eae8a67b..d0e5d0c76a60 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -211,7 +211,7 @@ IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) ); } -IMPL_LINK_NOARG(FuPoor, DragHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, void*, void) { SdrHdl* pHdl = pView->PickHandle(aMDPos); @@ -221,7 +221,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) bIsInDragMode = true; pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos); } - return 0; } // Detektiv-Linie diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 5a6faed4f9da..75c211cafe38 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -92,7 +92,7 @@ public: DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* ); DECL_LINK( TypeListHdl, ListBox*); - DECL_LINK( AfterTypeListHdl, ListBox*); + DECL_LINK_TYPED( AfterTypeListHdl, void*, void); DECL_LINK( ColFormatTypeHdl, ListBox*); }; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 2f482a3fd16b..ecd4f0c53feb 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -103,7 +103,7 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); DECL_LINK( ContentDoubleClickHdl, void* ); - DECL_LINK( ExecDragHdl, void* ); + DECL_LINK_TYPED( ExecDragHdl, void*, void ); public: SvTreeListEntry* pTmpEntry; bool m_bFirstPaint; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 6ea7f7602a4e..d54d0cc45e14 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -55,7 +55,7 @@ protected: Timer aDragTimer; // for Drag&Drop DECL_LINK_TYPED( DragTimerHdl, Timer *, void ); - DECL_LINK( DragHdl, void * ); + DECL_LINK_TYPED( DragHdl, void *, void ); bool bIsInDragMode; Point aMDPos; // Position of MouseButtonDown diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index a4ca81b9d3aa..a83d2a7a79bd 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -154,7 +154,7 @@ public: void CalcAll() { CalcPages(); } void SetInGetState(bool bSet) { bInGetState = bSet; } - DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); + DECL_STATIC_LINK_TYPED( ScPreview, InvalidateHdl, void*, void ); static void StaticInvalidate(); FmFormView* GetDrawView() { return pDrawView; } diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 9933947fb837..f32ce4a9fe1a 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -53,9 +53,9 @@ private: sal_uInt16 nPageUsage; VclPtr<ScStyleDlg> pStyleDlg; - DECL_LINK_TYPED(BtnHdl, Button*, void); - DECL_LINK( HFEditHdl, void* ); - DECL_LINK_TYPED(TurnOnHdl, Button*, void); + DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK_TYPED( HFEditHdl, void*, void ); + DECL_LINK_TYPED( TurnOnHdl, Button*, void ); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 204e312b75be..a85e24073453 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1448,13 +1448,12 @@ void ScContentTree::DoDrag() delete pDocLoader; // falls Dokument zum Draggen geladen wurde } -IMPL_LINK_NOARG(ScContentTree, ExecDragHdl) +IMPL_LINK_NOARG_TYPED(ScContentTree, ExecDragHdl, void*, void) { // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der // Navigator geloescht werden darf DoDrag(); - return 0; } bool ScContentTree::LoadFile( const OUString& rUrl ) diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index c091636f4847..f629e8bc5bc9 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -166,14 +166,14 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), NULL, true ); } -IMPL_LINK_NOARG(ScHFPage, HFEditHdl) +IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) { SfxViewShell* pViewSh = SfxViewShell::Current(); if ( !pViewSh ) { OSL_FAIL( "Current ViewShell not found." ); - return 0; + return; } if ( m_pCntSharedBox->IsEnabled() @@ -233,8 +233,6 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) aDataSet.Put( *pDlg->GetOutputItemSet() ); } } - - return 0; } // class ScHeaderPage diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 94fa0d5b67f5..d49cc688eed9 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -160,7 +160,7 @@ private: /** Posts a Workbook_WindowResize user event. */ void postWindowResizeEvent( vcl::Window* pWindow ); /** Callback link for Application::PostUserEvent(). */ - DECL_LINK( processWindowResizeEvent, vcl::Window* ); + DECL_LINK_TYPED( processWindowResizeEvent, void*, void ); private: typedef ::std::map< VclPtr<vcl::Window>, uno::Reference< frame::XController > > WindowControllerMap; @@ -477,8 +477,9 @@ void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow ) } } -IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, pWindow ) +IMPL_LINK_TYPED( ScVbaEventListener, processWindowResizeEvent, void*, p, void ) { + vcl::Window* pWindow = static_cast<vcl::Window*>(p); ::osl::MutexGuard aGuard( maMutex ); /* Check that the passed window is still alive (it must be registered in @@ -507,7 +508,6 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, pWindow ) } maPostedWindows.erase(pWindow); release(); - return 0; } ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index d16b70dab1ed..e106cb3cd823 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -187,10 +187,9 @@ static bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) //after end execute from !IsModalInputMode, it is safer to delay deleting namespace { - sal_IntPtr DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) + void DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) { delete static_cast<SfxAbstractTabDialog*>( pAbstractDialog ); - return 0; } } @@ -947,7 +946,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } //after end execute from !IsModalInputMode, it is safer to delay deleting //delete pDlg; - Application::PostUserEvent( Link<>( pDlg, &DelayDeleteAbstractDialog ) ); + Application::PostUserEvent( Link<void*,void>( pDlg, &DelayDeleteAbstractDialog ) ); } } break; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 470634229483..666abee73ca2 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -927,10 +927,9 @@ void ScPreview::StaticInvalidate() rBindings.Invalidate(SID_ATTR_ZOOMSLIDER); } -IMPL_STATIC_LINK_NOARG( ScPreview, InvalidateHdl ) +IMPL_STATIC_LINK_NOARG_TYPED( ScPreview, InvalidateHdl, void*, void ) { StaticInvalidate(); - return 0; } void ScPreview::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 7520787b4fc7..c0d5c25b40fd 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -82,10 +82,10 @@ public: void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; DECL_LINK(WindowEventListener, VclWindowEvent*); DECL_LINK(SelectionChangeListener, void*); - DECL_LINK(BroadcastSelectionChange, void*); + DECL_LINK_TYPED(BroadcastSelectionChange, void*, void); DECL_LINK(FocusChangeListener, void*); DECL_LINK(VisibilityChangeListener, void*); - DECL_LINK(UpdateChildrenCallback, void*); + DECL_LINK_TYPED(UpdateChildrenCallback, void*, void); void Activated(); private: @@ -699,7 +699,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren() if (mnUpdateChildrenUserEventId == 0) mnUpdateChildrenUserEventId = Application::PostUserEvent( LINK(this, AccessibleSlideSorterView::Implementation, - UpdateChildrenCallback)); + UpdateChildrenCallback)); } void AccessibleSlideSorterView::Implementation::UpdateChildren() @@ -928,14 +928,13 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListen return 1; } -IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange) +IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void) { mnSelectionChangeUserEventId = 0; mrAccessibleSlideSorter.FireAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any()); - return 1; } IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) @@ -981,12 +980,10 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) return 1; } -IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback) +IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void) { mnUpdateChildrenUserEventId = 0; UpdateChildren(); - - return 1; } IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 36bf3318ac21..87ff4ba822dd 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -790,7 +790,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron ) } } -IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl) +IMPL_LINK_NOARG_TYPED(AnnotationManagerImpl, UpdateTagsHdl, void*, void) { mnUpdateTagsEvent = 0; DisposeTags(); @@ -802,8 +802,6 @@ IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl) static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); invalidateSlots(); - - return 0; } void AnnotationManagerImpl::CreateTags() diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index b01b431e09a4..2eed181c6d90 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -96,7 +96,7 @@ public: void invalidateSlots(); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(UpdateTagsHdl, void *); + DECL_LINK_TYPED(UpdateTagsHdl, void *, void); void UpdateTags(bool bSynchron = false); void CreateTags(); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index f5a75cfc32cc..10c9274ecbbc 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -668,11 +668,10 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) return sal_IntPtr(true); } -IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl) +IMPL_LINK_NOARG_TYPED(AnnotationTag, ClosePopupHdl, void*, void) { mnClosePopupEvent = 0; ClosePopup(); - return 0; } } // end of namespace sd diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 036e682ff118..043708b40262 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -74,7 +74,7 @@ protected: virtual void deselect() SAL_OVERRIDE; DECL_LINK( WindowEventHandler, VclWindowEvent* ); - DECL_LINK( ClosePopupHdl, void* ); + DECL_LINK_TYPED( ClosePopupHdl, void*, void ); private: AnnotationManagerImpl& mrManager; diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 27d69ec7d524..95939e11ab3d 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -58,7 +58,7 @@ private: void CheckSelectionState(); - DECL_LINK( PlayMusicHdl, void * ); + DECL_LINK_TYPED( PlayMusicHdl, void *, void ); Idle maUpdateIdle; @@ -96,7 +96,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil } } -IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) +IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void) { maUpdateIdle.Stop(); mnPlaySoundEvent = 0; @@ -159,8 +159,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) } } } - - return 0; } IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index bac890e5890c..a04069b58b4a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1366,12 +1366,11 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) /** * Handler for Dragging */ -IMPL_LINK_NOARG(SdPageObjsTLB, ExecDragHdl) +IMPL_LINK_NOARG_TYPED(SdPageObjsTLB, ExecDragHdl, void*, void) { // as link, then it is allowed to asynchronous, without ImpMouseMoveMsg on // the stack, delete the Navigator DoDrag(); - return 0; } bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 0a0014a9b701..975e593ad27e 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -111,7 +111,7 @@ void ChangeRequestQueueProcessor::StartProcessing() } } -IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent) +IMPL_LINK_NOARG_TYPED(ChangeRequestQueueProcessor, ProcessEvent, void*, void) { ::osl::MutexGuard aGuard (maMutex); @@ -124,8 +124,6 @@ IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent) // Schedule the processing of the next event. StartProcessing(); } - - return 0; } void ChangeRequestQueueProcessor::ProcessOneEvent() diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index fa3b4d456b9c..696635d2e6c6 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -121,7 +121,7 @@ private: /** Callback function for the PostUserEvent() call. */ - DECL_LINK(ProcessEvent,void*); + DECL_LINK_TYPED(ProcessEvent, void*, void); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 7884da011526..3ef12728cc6f 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -278,7 +278,7 @@ protected: DECL_LINK_TYPED( DropErrorHdl, Idle*, void ); DECL_LINK_TYPED( DropInsertFileHdl, Idle*, void ); - DECL_LINK( ExecuteNavigatorDrop, SdNavigatorDropEvent* ); + DECL_LINK_TYPED( ExecuteNavigatorDrop, void*, void ); void ImplClearDrawDropMarker(); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 6b8c84b837bf..b68ff7ea84dd 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -163,7 +163,7 @@ protected: const SdrObject* pObject, const bool bCreate = true) const; void CloseBookmarkDoc(); - DECL_LINK(ExecDragHdl, void*); + DECL_LINK_TYPED(ExecDragHdl, void*, void); /** Handle the reordering of entries in the navigator. This method reorders both the involved shapes in their page as well as the diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index b8c1178a7ac2..59454e6a9be1 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -190,7 +190,7 @@ public: private: SlideShow( SdDrawDocument* pDoc ); - DECL_LINK( StartInPlacePresentationConfigurationHdl, void * ); + DECL_LINK_TYPED( StartInPlacePresentationConfigurationHdl, void *, void ); void StartInPlacePresentationConfigurationCallback(); void StartInPlacePresentation(); diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 1259690dcc59..1d65446dec18 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -41,7 +41,7 @@ public: void UpdateTags(); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(UpdateTagsHdl, void *); + DECL_LINK_TYPED(UpdateTagsHdl, void *, void); bool CreateTags(); bool DisposeTags(); diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 0f73676fff4b..134ef6251e44 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -87,7 +87,7 @@ void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll) } } -IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) +IMPL_LINK_NOARG_TYPED(CanvasUpdateRequester, Callback, void*, void) { mnUserEventId = 0; if (mxCanvas.is()) @@ -95,7 +95,6 @@ IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) mxCanvas->updateScreen(mbUpdateFlag); mbUpdateFlag = false; } - return 0; } } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 35085a1e2fc8..abd1973f161e 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -62,7 +62,7 @@ private: css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; ImplSVEvent * mnUserEventId; bool mbUpdateFlag; - DECL_LINK(Callback, void*); + DECL_LINK_TYPED(Callback, void*, void); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 393774a334f9..82ad5b50c774 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -171,7 +171,7 @@ private: bool mbContainerCleaningPending; typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData; - DECL_LINK(AsynchronousNotifyCallback, EventData*); + DECL_LINK_TYPED(AsynchronousNotifyCallback, void*, void); Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); @@ -618,8 +618,9 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize return maLargePreviewSizePixel; } -IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventData*, pData) +IMPL_LINK_TYPED(MasterPageContainer::Implementation,AsynchronousNotifyCallback, void*, p, void) { + EventData* pData = static_cast<EventData*>(p); const ::osl::MutexGuard aGuard (maMutex); if (pData != NULL) @@ -627,8 +628,6 @@ IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventD FireContainerChange(pData->first, pData->second); delete pData; } - - return 0; } MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index cdf9b8401f9d..42417ad7ccaa 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -76,7 +76,7 @@ void SlideShowRestarter::Restart (bool bForce) LINK(this, SlideShowRestarter, EndPresentation)); } -IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation) +IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void) { mnEventId = 0; if (mpSlideShow.is()) @@ -120,7 +120,6 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation) } } } - return 0; } void SlideShowRestarter::StartPresentation() diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 56a23b80030f..42b494c91fd0 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -75,7 +75,7 @@ private: */ sal_Int32 GetDisplayCount(); - DECL_LINK(EndPresentation, void*); + DECL_LINK_TYPED(EndPresentation, void*, void); /** Restart the presentation on the slide last shown before the restart was initiated. diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 4ec13bc8aeb7..46cec5f87145 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1077,11 +1077,10 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } -IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) +IMPL_LINK_NOARG_TYPED(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void) { mnInPlaceConfigEvent = 0; StartInPlacePresentation(); - return 0; } void SlideShow::StartInPlacePresentation() diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index bf369a235420..59cae0341c12 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1424,13 +1424,12 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } -IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) +IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void) { mnEndShowEvent = 0; if( mxPresentation.is() ) mxPresentation->end(); - return 0; } void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) @@ -2092,12 +2091,12 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } -IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) +IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) { mnContextMenuEvent = 0; if( mpSlideController.get() == 0 ) - return 0; + return; mbWasPaused = mbIsPaused; if( !mbWasPaused ) @@ -2223,7 +2222,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) if( !mbWasPaused ) resume(); - return 0; } IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 6e1c2f0c3777..705e0a36e4e2 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -277,9 +277,9 @@ private: DECL_LINK_TYPED(updateHdl, Timer *, void); DECL_LINK( PostYieldListener, void* ); DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void); - DECL_LINK( endPresentationHdl, void* ); + DECL_LINK_TYPED( endPresentationHdl, void*, void ); DECL_LINK( ContextMenuSelectHdl, Menu * ); - DECL_LINK( ContextMenuHdl, void* ); + DECL_LINK_TYPED( ContextMenuHdl, void*, void ); DECL_LINK_TYPED(deactivateHdl, Timer *, void); DECL_LINK( EventListenerHdl, VclSimpleEvent* ); diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 6511aa06909c..b270ac67a58c 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -578,7 +578,7 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) } } -IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData) +IMPL_LINK_TYPED(Clipboard, ProcessDragFinished, void*, pUserData, void) { const sal_Int8 nDropAction (static_cast<sal_Int8>(reinterpret_cast<sal_IntPtr>(pUserData))); @@ -607,8 +607,6 @@ IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData) } mxUndoContext.reset(); mxSelectionObserverContext.reset(); - - return 1; } sal_Int8 Clipboard::AcceptDrop ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 235d125e8540..5caeba792722 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -225,7 +225,7 @@ private: /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. */ - DECL_LINK(ProcessDragFinished, void*); + DECL_LINK_TYPED(ProcessDragFinished, void*, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 4fe12fac0026..5c9bad5ef4a2 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -324,9 +324,9 @@ private: static OUString GetToolBarResourceName (const OUString& rsBaseName); bool CheckPlugInMode (const OUString& rsName) const; - DECL_LINK(UpdateCallback, void *); + DECL_LINK_TYPED(UpdateCallback, void *, void); DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*); - DECL_LINK(SetValidCallback,void*); + DECL_LINK_TYPED(SetValidCallback, void*, void); }; //===== ToolBarManager ======================================================== @@ -848,7 +848,7 @@ void ToolBarManager::Implementation::Update ( } } -IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback) +IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, void) { mnPendingUpdateCall = 0; if (mnLockCount == 0) @@ -860,7 +860,6 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback) if (mbIsValid && mxLayouter.is()) mpAsynchronousLayouterLock.reset(); } - return 0; } IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, @@ -888,11 +887,10 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, return 0; } -IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) +IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, SetValidCallback, void*, void) { mnPendingSetValidCall = 0; SetValid(true); - return 0; } OUString ToolBarManager::Implementation::GetToolBarResourceName ( diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 87bfa3680f35..7bb04352864f 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -807,8 +807,9 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar return nRet; } -IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent ) +IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void ) { + SdNavigatorDropEvent* pSdNavigatorDropEvent = static_cast<SdNavigatorDropEvent*>(p); TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); SdPageObjsTLB::SdPageObjsTransferable* pPageObjsTransferable = SdPageObjsTLB::SdPageObjsTransferable::getImplementation( aDataHelper.GetXTransferable() ); INetBookmark aINetBookmark; @@ -860,8 +861,6 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv } delete pSdNavigatorDropEvent; - - return 0; } bool View::GetExchangeList (std::vector<OUString> &rExchangeList, diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 11ac62bfcf4b..4cdbd335d6b0 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -472,7 +472,7 @@ void ViewOverlayManager::UpdateTags() mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) ); } -IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl) +IMPL_LINK_NOARG_TYPED(ViewOverlayManager, UpdateTagsHdl, void*, void) { OSL_TRACE("ViewOverlayManager::UpdateTagsHdl"); @@ -482,7 +482,6 @@ IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl) if( bChanges && mrBase.GetDrawView() ) static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); - return 0; } bool ViewOverlayManager::CreateTags() diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index dcc6b1120076..8562b7f43b19 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -44,7 +44,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); public: diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index d1e3032d577a..a70005105749 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -497,13 +497,13 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl ) return 0; } -IMPL_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef*, deleteMedium ) +IMPL_LINK_TYPED( SvFileObject, DelMedium_Impl, void*, p, void ) { + SfxMediumRef* deleteMedium = static_cast<SfxMediumRef*>(p); nPostUserEventId = 0; assert(pDelMed == deleteMedium); pDelMed = NULL; delete deleteMedium; - return 0; } IMPL_LINK_TYPED( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 8e24f0ff1363..6bdc7a15a526 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -54,7 +54,7 @@ class SvFileObject : public sfx2::SvLinkSource bool LoadFile_Impl(); void SendStateChg_Impl( sfx2::LinkManager::LinkState nState ); - DECL_LINK( DelMedium_Impl, SfxMediumRef* ); + DECL_LINK_TYPED( DelMedium_Impl, void*, void ); DECL_LINK( LoadGrfReady_Impl, void* ); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 7a76ea369ee9..e4f59320ba33 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -312,8 +312,9 @@ void RecentDocsView::Clear() ThumbnailView::Clear(); } -IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile ) +IMPL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) { + LoadRecentFile* pLoadRecentFile = static_cast< LoadRecentFile*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -326,7 +327,6 @@ IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentF } delete pLoadRecentFile; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index ec76c0565041..a0d3c1c01ef5 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -698,7 +698,7 @@ struct ImplDelayedDispatch ~ImplDelayedDispatch() {} }; -static sal_IntPtr implDispatchDelayed( void*, void* pArg ) +static void implDispatchDelayed( void*, void* pArg ) { struct ImplDelayedDispatch* pDispatch = static_cast<ImplDelayedDispatch*>(pArg); try @@ -711,8 +711,6 @@ static sal_IntPtr implDispatchDelayed( void*, void* pArg ) // clean up delete pDispatch; - - return 0; } void BackingWindow::dispatchURL( const OUString& i_rURL, @@ -745,7 +743,7 @@ void BackingWindow::dispatchURL( const OUString& i_rURL, if ( xDispatch.is() ) { ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs ); - if( Application::PostUserEvent( Link<>( NULL, implDispatchDelayed ), pDisp ) == 0 ) + if( Application::PostUserEvent( Link<void*,void>( NULL, implDispatchDelayed ), pDisp ) == 0 ) delete pDisp; // event could not be posted for unknown reason, at least don't leak } } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index fd1f6799a277..fdca859cd80c 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1158,14 +1158,12 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } } -IMPL_LINK_NOARG( FileDialogHelper_Impl, InitControls ) +IMPL_LINK_NOARG_TYPED( FileDialogHelper_Impl, InitControls, void*, void ) { mnPostUserEventId = 0; enablePasswordBox( true ); updateFilterOptionsBox( ); updateSelectionBox( ); - - return 0L; } void FileDialogHelper_Impl::preExecute() @@ -2301,13 +2299,11 @@ void FileDialogHelper::SetContext( Context _eNewContext ) mpImp->SetContext( _eNewContext ); } -IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker) +IMPL_LINK_NOARG_TYPED(FileDialogHelper, ExecuteSystemFilePicker, void*, void) { m_nError = mpImp->execute(); if ( m_aDialogClosedLink.IsSet() ) m_aDialogClosedLink.Call( this ); - - return 0L; } // rDirPath has to be a directory diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 9103318581d0..e0122ff2f01f 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -147,8 +147,8 @@ namespace sfx2 std::vector<OUString>& rpURLList, const SfxFilter* pFilter ); - DECL_LINK_TYPED(TimeOutHdl_Impl, Idle *, void); - DECL_LINK( InitControls, void* ); + DECL_LINK_TYPED( TimeOutHdl_Impl, Idle *, void); + DECL_LINK_TYPED( InitControls, void*, void ); public: // XFilePickerListener methods diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 814df2accdd5..ff90fc97dad1 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -549,7 +549,7 @@ namespace sfx2 static bool impl_isToolPanelResource( const OUString& i_rResourceURL ); - DECL_LINK( OnActivatePanel, void* ); + DECL_LINK_TYPED( OnActivatePanel, void*, void ); private: ModuleTaskPane& m_rAntiImpl; @@ -571,10 +571,9 @@ namespace sfx2 } - IMPL_LINK( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg ) + IMPL_LINK_TYPED( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg, void ) { m_aPanelDeck->ActivatePanel( reinterpret_cast< size_t >( i_pArg ) ); - return 1L; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index ba176f00cce7..f9a313df50a5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -284,10 +284,9 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop) +IMPL_LINK_NOARG_TYPED(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) { pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE ); - return 0; } bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) @@ -2151,25 +2150,23 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox return 0; } -IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu ) { - if( pMenu ) - { - nLastItemId = pMenu->GetCurItemId(); - Application::PostUserEvent( - LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 ); - return sal_IntPtr(true); - } + nLastItemId = pMenu->GetCurItemId(); + Application::PostUserEvent( + LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl ), 0 ); + return sal_IntPtr(true); +} +IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) +{ switch(nLastItemId) { case ID_NEW: NewHdl(0); break; case ID_EDIT: EditHdl(0); break; case ID_DELETE: DeleteHdl(0); break; case ID_HIDE: HideHdl(0); break; case ID_SHOW: ShowHdl(0); break; - default: return sal_IntPtr(false); } - return sal_IntPtr(true); } SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 612166cfcf7b..6cc5b08be270 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -154,8 +154,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta } } -IMPL_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, - SfxTemplateControllerItem*,) +IMPL_LINK_NOARG_TYPED(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, void*, void) { nUserEventId = 0; SfxBoolItem* pState = 0; @@ -168,7 +167,6 @@ IMPL_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, } rTemplateDlg.SetWaterCanState(pState); delete pState; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 28e8d2419a64..8a79c49f5e91 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace frame { class DropListBox_Impl : public SvTreeListBox { private: - DECL_LINK(OnAsyncExecuteDrop, void *); + DECL_LINK_TYPED(OnAsyncExecuteDrop, void *, void); protected: SfxCommonTemplateDialog_Impl* pDialog; @@ -292,6 +292,7 @@ public: virtual ~SfxCommonTemplateDialog_Impl(); DECL_LINK( MenuSelectHdl, Menu * ); + DECL_LINK_TYPED( MenuSelectAsyncHdl, void*, void ); virtual void EnableEdit( bool b = true ) { diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 57270b480b57..35a490a1e215 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -29,7 +29,7 @@ class SfxTemplateControllerItem : public SfxControllerItem { sal_uInt8 nWaterCanState; ImplSVEvent* nUserEventId; - DECL_LINK(SetWaterCanStateHdl_Impl, SfxTemplateControllerItem*); + DECL_LINK_TYPED(SetWaterCanStateHdl_Impl, void*, void); protected: virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) SAL_OVERRIDE; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index fc85b0055cff..8ba12b55e3ca 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -133,8 +133,9 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) -IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -147,7 +148,6 @@ IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExe } delete pExecuteInfo; - return 0; } diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index f952b6b5971a..81c68d50e11a 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -39,11 +39,10 @@ void SfxHintPoster::Post( SfxRequest* pHintToPost ) AddFirstRef(); } -IMPL_LINK( SfxHintPoster, DoEvent_Impl, SfxRequest *, pPostedHint ) +IMPL_LINK_TYPED( SfxHintPoster, DoEvent_Impl, void *, pPostedHint, void ) { - m_Link.Call( pPostedHint ); + m_Link.Call( static_cast<SfxRequest*>(pPostedHint) ); ReleaseRef(); - return 0; } void SfxHintPoster::SetEventHdl(const Link<SfxRequest*,void>& rLink) diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index f9ebe18624a9..13aff881c322 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -43,7 +43,7 @@ void AsynchronousCall::RequestCall() { if (mnCallId == 0) { - Link<> aLink (LINK(this, AsynchronousCall, HandleUserCall)); + Link<void*,void> aLink (LINK(this, AsynchronousCall, HandleUserCall)); mnCallId = Application::PostUserEvent(aLink); } } @@ -57,13 +57,11 @@ void AsynchronousCall::CancelRequest() } } -IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall ) +IMPL_LINK_NOARG_TYPED(AsynchronousCall, HandleUserCall, void*, void ) { mnCallId = 0; if (maAction) maAction(); - - return sal_IntPtr(true); } } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index dc6f439905e5..4a0c3f743a99 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -135,7 +135,7 @@ private: uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr; uno::Reference< lang::XComponent > m_xCtrl; - DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo* ); + DECL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, void ); }; SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr ) @@ -170,8 +170,9 @@ void SfxClipboardChangeListener::ChangedContents() } } -IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo*, pAsyncExecuteInfo ) +IMPL_STATIC_LINK_TYPED( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, void ) { + AsyncExecuteInfo* pAsyncExecuteInfo = static_cast<AsyncExecuteInfo*>(p); if ( pAsyncExecuteInfo ) { uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( pAsyncExecuteInfo->m_xThis ); @@ -184,8 +185,6 @@ IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecute } } delete pAsyncExecuteInfo; - - return 0; } void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ ) diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 569606e45ffd..d64b3b850394 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -252,7 +252,7 @@ namespace svt } - IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl) + IMPL_LINK_NOARG_TYPED(EditBrowseBox, StartEditHdl, void*, void) { nStartEvent = 0; if (IsEditing()) @@ -261,7 +261,6 @@ namespace svt if (!aController->GetWindow().HasFocus() && (m_pFocusWhileRequest.get() == Application::GetFocusWindow())) aController->GetWindow().GrabFocus(); } - return 0; } @@ -1079,15 +1078,13 @@ namespace svt } - IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl) + IMPL_LINK_NOARG_TYPED(EditBrowseBox, EndEditHdl, void*, void) { nEndEvent = 0; aOldController = CellControllerRef(); nOldEditRow = -1; nOldEditCol = 0; - - return 0; } @@ -1100,11 +1097,10 @@ namespace svt } - IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl) + IMPL_LINK_NOARG_TYPED(EditBrowseBox, CellModifiedHdl, void*, void) { nCellModifiedEvent = 0; CellModified(); - return 0; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 564235822c45..3c3f6d94e5ce 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -341,7 +341,7 @@ protected: ::rtl::Reference< ::svt::FileViewContentEnumerator > m_xContentEnumerator; - Link<> m_aCurrentAsyncActionHandler; + Link<void*,void> m_aCurrentAsyncActionHandler; ::osl::Condition m_aAsyncActionFinished; ::rtl::Reference< ::salhelper::Timer > m_xCancelAsyncTimer; ::svt::EnumerationResult m_eAsyncActionResult; @@ -1597,7 +1597,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( // don't (yet) set m_aCurrentAsyncActionHandler to pTimeout->aFinishHandler. // By definition, this handler *only* get's called when the result cannot be obtained // during the minimum wait time, so it is only set below, when needed. - m_aCurrentAsyncActionHandler = Link<>(); + m_aCurrentAsyncActionHandler = Link<void*,void>(); // minimum time to wait boost::scoped_ptr< TimeValue > pTimeout( new TimeValue ); @@ -1856,7 +1856,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* ) if ( m_aCurrentAsyncActionHandler.IsSet() ) { Application::PostUserEvent( m_aCurrentAsyncActionHandler, reinterpret_cast< void* >( eTimeout ) ); - m_aCurrentAsyncActionHandler = Link<>(); + m_aCurrentAsyncActionHandler = Link<void*,void>(); } } @@ -1886,7 +1886,7 @@ void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult ) if ( m_aCurrentAsyncActionHandler.IsSet() ) { Application::PostUserEvent( m_aCurrentAsyncActionHandler, reinterpret_cast< void* >( m_eAsyncActionResult ) ); - m_aCurrentAsyncActionHandler = Link<>(); + m_aCurrentAsyncActionHandler = Link<void*,void>(); } } diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index d806740c53b1..cc777f3e112c 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -226,8 +226,8 @@ class SvxIconChoiceCtrl_Impl DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); - DECL_LINK_TYPED(EditTimeoutHdl, Idle *, void); - DECL_LINK( UserEventHdl, void* ); + DECL_LINK_TYPED( EditTimeoutHdl, Idle *, void); + DECL_LINK_TYPED( UserEventHdl, void*, void ); DECL_LINK_TYPED( AutoArrangeHdl, Idle*, void ); DECL_LINK_TYPED( DocRectChangedHdl, Idle*, void ); DECL_LINK_TYPED( VisRectChangedHdl, Idle*, void ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 9d1f2a54a484..0a115d96c5e1 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2963,7 +2963,7 @@ bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos -IMPL_LINK(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId ) +IMPL_LINK_TYPED(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) { if( nId == EVENTID_ADJUST_SCROLLBARS ) { @@ -2975,7 +2975,6 @@ IMPL_LINK(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId ) nUserEventShowCursor = 0; ShowCursor( true ); } - return 0; } void SvxIconChoiceCtrl_Impl::CancelUserEvents() diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 211fec12088f..5206c1bdb70d 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -3341,7 +3341,7 @@ bool SvImpLBox::IsNowExpandable() const return IsExpandable() && !pView->IsExpanded( pCursor ); } -IMPL_LINK(SvImpLBox, MyUserEvent, void*, pArg ) +IMPL_LINK_TYPED(SvImpLBox, MyUserEvent, void*, pArg, void ) { nCurUserEvent = 0; if( !pArg ) @@ -3355,7 +3355,6 @@ IMPL_LINK(SvImpLBox, MyUserEvent, void*, pArg ) ShowVerSBar(); pView->Invalidate( GetVisibleArea() ); } - return 0; } diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 6c079e0fc71c..5b4d6a9936ac 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -85,10 +85,9 @@ IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) Call_Impl( _pArg ); } -IMPL_LINK_NOARG( AsynchronLink, HandleCall_PostUserEvent ) +IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_PostUserEvent, void*, void ) { HandleCall_Idle(nullptr); - return 0; } void AsynchronLink::ClearPendingCall() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 6cb9fe4919ef..68637b63f84d 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -395,7 +395,7 @@ private: Idle maLoseFocusIdle; bool mbPostEvt; - DECL_LINK( ImplEndEditHdl, void* ); + DECL_LINK_TYPED( ImplEndEditHdl, void*, void ); DECL_LINK_TYPED( ImplEndTimerHdl, Idle*, void ); public: @@ -458,7 +458,7 @@ void TabBarEdit::LoseFocus() Edit::LoseFocus(); } -IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) +IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) { ResetPostEvent(); maLoseFocusIdle.Stop(); @@ -473,8 +473,6 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) } else GetParent()->EndEditMode( pCancel != 0 ); - - return 0; } IMPL_LINK_NOARG_TYPED(TabBarEdit, ImplEndTimerHdl, Idle *, void) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 041c198e619a..539d33703eef 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1109,7 +1109,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize) + IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnDelayedInitialize, void*, void) { // load the initial data from the configuration loadConfiguration(); @@ -1119,8 +1119,6 @@ void AssignmentPersistentData::ImplCommit() if ( !m_pImpl->bWorkingPersistent ) if ( m_pImpl->pFields[0] ) m_pImpl->pFields[0]->GrabFocus(); - - return 0L; } diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index e7260aba093b..2629362905d4 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -77,7 +77,7 @@ class MainThreadFrameCloserRequest : m_xFrame( xFrame ) {} - DECL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest* ); + DECL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, void ); static void Start( MainThreadFrameCloserRequest* pRequest ); }; @@ -98,8 +98,9 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque } -IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest*, pMTRequest ) +IMPL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, p, void ) { + MainThreadFrameCloserRequest* pMTRequest = static_cast<MainThreadFrameCloserRequest*>(p); if ( pMTRequest ) { if ( pMTRequest->m_xFrame.is() ) @@ -140,8 +141,6 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq delete pMTRequest; } - - return 0; } ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments) diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index ec8b19e7f1aa..72a75379d7fc 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -164,7 +164,7 @@ private: DECL_LINK_TYPED(EditTimerCall, Idle *, void); DECL_LINK_TYPED( BeginDragHdl, Idle*, void ); - DECL_LINK( MyUserEvent,void*); + DECL_LINK_TYPED( MyUserEvent, void*, void); void StopUserEvent(); void InvalidateEntriesFrom( long nY ) const; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index dc6b43f6eaab..a6491b64613e 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2386,12 +2386,11 @@ namespace svt { namespace table } - IMPL_LINK_NOARG( TableControl_Impl, OnUpdateScrollbars ) + IMPL_LINK_NOARG_TYPED( TableControl_Impl, OnUpdateScrollbars, void*, void ) { // TODO: can't we simply use lcl_updateScrollbar here, so the scrollbars ranges are updated, instead of // doing a complete re-layout? impl_ni_relayout(); - return 1L; } diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 478f611ba5ea..574042a8ca87 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -459,7 +459,7 @@ namespace svt { namespace table void impl_invalidateColumn( ColPos const i_column ); DECL_LINK( OnScroll, ScrollBar* ); - DECL_LINK( OnUpdateScrollbars, void* ); + DECL_LINK_TYPED( OnUpdateScrollbars, void*, void ); }; //see seleng.hxx, seleng.cxx, FunctionSet overridables, part of selection engine diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 87c1f41b9581..dc9ecf6af369 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -609,8 +609,9 @@ ContextMenuHelper::completeMenuProperties( } -IMPL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); // Release solar mutex to prevent deadlocks with clipboard thread SolarMutexReleaser aReleaser; try @@ -624,7 +625,6 @@ IMPL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo } delete pExecuteInfo; - return 0; } } // namespace svt diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index da53d908b3e3..e8f961cd395f 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -167,8 +167,9 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try { // Asynchronous execution as this can lead to our own destruction! @@ -180,7 +181,6 @@ IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo*, pExec { } delete pExecuteInfo; - return 0; } } // namespace diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 472a62131a0f..d89a7fe3d481 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -148,11 +148,11 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons } -IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) { + PopupMenuControllerBaseDispatchInfo* pDispatchInfo = static_cast<PopupMenuControllerBaseDispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); delete pDispatchInfo; - return 0; } void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception) diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 99f7a57360ef..cd5c2c5b62f5 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -763,11 +763,11 @@ throw( com::sun::star::uno::Exception, std::exception) -IMPL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void ) { + DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); delete pDispatchInfo; - return 0; } void ToolboxController::enable( bool bEnable ) diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 6e5381bad7fc..9bced5a872cc 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -182,7 +182,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > &rxDispatch = com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >(), const com::sun::star::util::URL &rURL = com::sun::star::util::URL() ); - DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo* ); + DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); }; #endif diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index c5a9c446186e..7fba848455e5 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -375,7 +375,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_LINK; } -IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop ) +IMPL_LINK_NOARG_TYPED( FmGridHeader, OnAsyncExecuteDrop, void*, void ) { OUString sCommand, sFieldName,sURL; sal_Int32 nCommandType = CommandType::COMMAND; @@ -402,7 +402,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop ) { ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); - return 0L; + return; } // Vom Feld werden nun zwei Informationen benoetigt: @@ -420,7 +420,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop ) case DataType::OTHER: ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); - return 0L; + return; } // Erstellen der Column @@ -527,7 +527,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop ) ::comphelper::disposeComponent(xCol); // in case only the creation of the second column failed ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); - return 0L; + return; } if (bDateNTimeCol) @@ -626,12 +626,11 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop ) OSL_FAIL("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); - return 0L; + return; } ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); - return 1L; } void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index b4d305da16d2..70ea9e9601cf 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2849,11 +2849,10 @@ void DbGridControl::Command(const CommandEvent& rEvt) } } -IMPL_LINK_NOARG(DbGridControl, OnDelete) +IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void) { m_nDeleteEvent = 0; DeleteSelectedRows(); - return 0; } void DbGridControl::DeleteSelectedRows() @@ -3461,7 +3460,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows) } } -IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat) +IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) { m_nAsynAdjustEvent = 0; @@ -3470,8 +3469,6 @@ IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat) if ( !pAdjustWhat ) AdjustDataSource(); - - return 0L; } void DbGridControl::BeginCursorAction() diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 1063d0fc526e..0d12fdbd2dbf 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -37,10 +37,10 @@ namespace svxform m_nEventId = 0; } - IMPL_LINK( DelayedEvent, OnCall, void*, _pArg ) + IMPL_LINK_TYPED( DelayedEvent, OnCall, void*, _pArg, void ) { m_nEventId = 0; - return m_aHandler.Call( _pArg ); + m_aHandler.Call( _pArg ); } } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 7a00bad224db..b9fcbb29e834 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1243,11 +1243,11 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN } -IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry ) +IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void ) { + SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // now remove the entry m_pModel->Remove(static_cast<FmFilterData*>(pEntry->GetUserData())); - return 0L; } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 4b0b6691ac38..7085bc6c3788 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -485,11 +485,10 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const } -IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus ) +IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, void ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); - return 0L; } diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 07cbcb0e36af..ff6121406c08 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -136,7 +136,7 @@ namespace svxform void impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult ); private: - DECL_LINK( OnAsyncScriptEvent, ScriptEvent* ); + DECL_LINK_TYPED( OnAsyncScriptEvent, void*, void ); }; class FormScriptingEnvironment: @@ -770,11 +770,12 @@ namespace svxform } - IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent ) + IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) { + ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p); OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); if ( !_pEvent ) - return 1L; + return; { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -786,7 +787,6 @@ namespace svxform delete _pEvent; // we acquired ourself immediately before posting the event release(); - return 0L; } FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 6866e3a28f80..7f56255a547f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1003,10 +1003,10 @@ void FmXFormShell::LockSlotInvalidation(bool bLock) } -IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots) +IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void) { if ( impl_checkDisposed() ) - return 0L; + return; ::osl::MutexGuard aGuard(m_aInvalidationSafety); m_nInvalidationEvent = 0; @@ -1019,7 +1019,6 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots) m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell); } m_arrInvalidSlots.clear(); - return 0L; } @@ -3616,10 +3615,10 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate } -IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation ) +IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) { if ( impl_checkDisposed() ) - return 0L; + return; m_nActivationEvent = 0; SfxObjectShell* pDocument = m_pShell->GetObjectShell(); @@ -3633,8 +3632,6 @@ IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation ) m_pShell->GetViewShell()->GetViewFrame()->ToggleChildWindow( SID_FM_SHOW_DATANAVIGATOR ); } } - - return 0L; } @@ -3782,13 +3779,12 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels } -IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ ) +IMPL_LINK_NOARG_TYPED( FmXFormShell, OnLoadForms, void*, void ) { FmLoadAction aAction = m_aLoadingPages.front(); m_aLoadingPages.pop(); loadForms( aAction.pPage, aAction.nFlags & ~FORMS_ASYNC ); - return 0L; } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 7b90f621db4e..eba86b2b0eaf 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -606,11 +606,10 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) } -IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage) +IMPL_LINK_NOARG_TYPED(FmXFormView, OnDelayedErrorMessage, void*, void) { m_nErrorMessageEvent = 0; displayException( m_aAsyncError ); - return 0L; } @@ -715,14 +714,14 @@ namespace } -IMPL_LINK_NOARG(FmXFormView, OnActivate) +IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void) { m_nActivationEvent = 0; if ( !m_pView ) { OSL_FAIL( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" ); - return 0; + return; } // setting the controller to activate @@ -731,7 +730,7 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate) FmXFormShell* const pShImpl = m_pView->GetFormShell()->GetImpl(); if(!pShImpl) - return 0; + return; find_active_databaseform fad(pShImpl->getActiveController()); @@ -775,7 +774,6 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate) pShImpl->setActiveController( xControllerToActivate ); } } - return 0; } @@ -955,16 +953,13 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF } -IMPL_LINK_NOARG(FmXFormView, OnAutoFocus) +IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) { m_nAutoFocusEvent = 0; // go to the first form of our page, examine it's TabController, go to it's first (in terms of the tab order) // control, give it the focus - do - { - SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL; SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL; // get the forms collection of the page we belong to @@ -974,13 +969,13 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus) const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; - ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L ); + ENSURE_OR_RETURN_VOID( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" ); try { // go for the tab controller of the first form if ( !xForms->getCount() ) - break; + return; Reference< XForm > xForm( xForms->getByIndex( 0 ), UNO_QUERY_THROW ); Reference< XTabController > xTabController( pAdapter->getController( xForm ), UNO_QUERY_THROW ); @@ -1005,7 +1000,7 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus) // set the focus to this first control Reference< XWindow > xControlWindow( lcl_firstFocussableControl( aControls ), UNO_QUERY ); if ( !xControlWindow.is() ) - break; + return; xControlWindow->setFocus(); @@ -1023,11 +1018,6 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus) { DBG_UNHANDLED_EXCEPTION(); } - - } // do - while ( false ); - - return 1L; } @@ -1077,12 +1067,12 @@ void FmXFormView::breakCreateFormObject() m_xLastCreatedControlModel.clear(); } -IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard ) +IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) { m_nControlWizardEvent = 0; OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" ); if ( !m_xLastCreatedControlModel.is() ) - return 0L; + return; sal_Int16 nClassId = FormComponentType::CONTROL; try @@ -1146,7 +1136,6 @@ IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard ) } m_xLastCreatedControlModel.clear(); - return 1L; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 7eeb6e59c8e8..58ca669f076e 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1483,13 +1483,11 @@ namespace svxform } - IMPL_LINK_NOARG(NavigatorTree, OnEdit) + IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEdit, void*, void) { nEditEvent = 0; EditEntry( m_pEditEntry ); m_pEditEntry = NULL; - - return 0L; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 6e0a1a304b27..bf1e04d68bd0 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -339,12 +339,12 @@ IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, VclAbstractDialog2*, pDial return 0L; } -IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, pDialog ) +IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) { + VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p); delete pDialog; delete mpThemePropsDlgItemSet; mpThemePropsDlgItemSet = 0; - return 0L; } void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) @@ -581,7 +581,7 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) return bRet; } -IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl) +IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) { ::std::vector< sal_uInt16 > aExecVector; ImplGetExecuteVector(aExecVector); @@ -606,8 +606,6 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl) aMenu.Execute( this, aSelPos ); } - - return 0L; } IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu ) diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index cc8f2490f1f3..74a655206452 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -111,11 +111,11 @@ private: DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void ); DECL_LINK( SelectThemeHdl, void* ); - DECL_LINK( ShowContextMenuHdl, void* ); + DECL_LINK_TYPED( ShowContextMenuHdl, void*, void ); DECL_LINK( PopupMenuHdl, Menu* ); DECL_LINK( EndNewThemePropertiesDlgHdl, VclAbstractDialog2* ); DECL_LINK( EndThemePropertiesDlgHdl, VclAbstractDialog2* ); - DECL_LINK( DestroyThemePropertiesDlgHdl, VclAbstractDialog2* ); + DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void ); public: diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 13ba4de2997c..6f0d17364d10 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -73,8 +73,9 @@ struct DispatchInfo css::uno::Reference< css::frame::XDispatch > Dispatch; }; -IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchInfo ) +IMPL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void ) { + DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); if ( pDispatchInfo && pDispatchInfo->Dispatch.is() ) { try @@ -88,7 +89,6 @@ IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchI } delete pDispatchInfo; - return 0; } namespace diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 2ccaca72b11c..8286cca9d831 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -66,7 +66,7 @@ namespace svxform ImplSVEvent * m_nEventId; private: - DECL_LINK( OnCall, void* ); + DECL_LINK_TYPED( OnCall, void*, void ); private: DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 16fbcba186dd..8e1bf2190c98 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -280,7 +280,7 @@ protected: void Insert(FmFilterData* pItem, sal_uLong nPos); void Remove(FmFilterData* pItem); - DECL_LINK(OnRemove, SvTreeListEntry*); + DECL_LINK_TYPED(OnRemove, void*, void); DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); private: diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index fdd9d6726fd8..ff6b0213618f 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -67,7 +67,7 @@ protected: virtual void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - DECL_LINK( OnAsyncGetFocus, void* ); + DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 604a5a49979e..12db53d0c2b1 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -473,7 +473,7 @@ namespace svxform static bool IsHiddenControl(FmEntryData* pEntryData); - DECL_LINK( OnEdit, void* ); + DECL_LINK_TYPED( OnEdit, void*, void ); DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); DECL_LINK(OnEntrySelDesel, NavigatorTree*); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 29575413ccfd..082633eef1a0 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -468,7 +468,7 @@ private: DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation*); DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*); DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); - DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*); + DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void); DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPage*); SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE); @@ -480,7 +480,7 @@ private: // (asynchron) invalidiert SAL_DLLPRIVATE void LockSlotInvalidation(bool bLock); - DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*); + DECL_DLLPRIVATE_LINK_TYPED(OnInvalidateSlots, void*, void); SAL_DLLPRIVATE void CloseExternalFormViewer(); // closes the task-local beamer displaying a grid view for a form @@ -530,7 +530,7 @@ public: SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, ::com::sun::star::form::runtime::FeatureState* _pCompleteState = NULL ); protected: - DECL_DLLPRIVATE_LINK( OnLoadForms, FmFormPage* ); + DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void ); }; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 6dd1c861ed01..a713c6e734d8 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -296,10 +296,10 @@ private: /// the auto focus to the first (in terms of the tab order) control void AutoFocus( bool _bSync = false ); - DECL_LINK( OnActivate, void* ); - DECL_LINK( OnAutoFocus, void* ); - DECL_LINK( OnDelayedErrorMessage, void* ); - DECL_LINK( OnStartControlWizard, void* ); + DECL_LINK_TYPED( OnActivate, void*, void ); + DECL_LINK_TYPED( OnAutoFocus, void*, void ); + DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void ); + DECL_LINK_TYPED( OnStartControlWizard, void*, void ); private: ::svxform::DocumentType impl_getDocumentType() const; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 4a02a44058ae..8b4bd29c776a 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2789,7 +2789,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo -IMPL_LINK_NOARG(SvxTableController, UpdateHdl) +IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) { mnUpdateEvent = 0; @@ -2805,8 +2805,6 @@ IMPL_LINK_NOARG(SvxTableController, UpdateHdl) } } updateSelectionOverlay(); - - return 0; } namespace diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index dfced96d64db..7200055bb5b1 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -167,12 +167,11 @@ void SvxColorValueSet_docking::DoDrag() } } -IMPL_LINK_NOARG(SvxColorValueSet_docking, ExecDragHdl) +IMPL_LINK_NOARG_TYPED(SvxColorValueSet_docking, ExecDragHdl, void*, void) { // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die // Farbleiste geloescht werden darf DoDrag(); - return 0; } SvxColorDockingWindow::SvxColorDockingWindow diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index d31e4d71ae04..0172fac75359 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -171,120 +171,120 @@ class SwPostItMgr: public SfxListener const Rectangle& rBorder, long lNeededHeight); void CheckForRemovedPostIts(); - bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const; - bool BorderOverPageBorder(unsigned long aPage) const; - bool HasScrollbars() const; + bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const; + bool BorderOverPageBorder(unsigned long aPage) const; + bool HasScrollbars() const; void Focus(SfxBroadcaster& rBC); - sal_Int32 GetInitialAnchorDistance() const; - sal_Int32 GetScrollSize() const; - sal_Int32 GetSpaceBetween() const; + sal_Int32 GetInitialAnchorDistance() const; + sal_Int32 GetScrollSize() const; + sal_Int32 GetSpaceBetween() const; void SetReadOnlyState(); - DECL_LINK( CalcHdl, void*); + DECL_LINK_TYPED( CalcHdl, void*, void); sw::sidebarwindows::SwSidebarWin* GetSidebarWin(const SfxBroadcaster* pBroadcaster) const; - void InsertItem( SfxBroadcaster* pItem, bool bCheckExistance, bool bFocus); - void RemoveItem( SfxBroadcaster* pBroadcast ); + void InsertItem( SfxBroadcaster* pItem, bool bCheckExistance, bool bFocus); + void RemoveItem( SfxBroadcaster* pBroadcast ); - void Sort(); + void Sort(); public: - SwPostItMgr(SwView* aDoc); - virtual ~SwPostItMgr(); + SwPostItMgr(SwView* aDoc); + virtual ~SwPostItMgr(); - typedef std::list< SwSidebarItem* >::const_iterator const_iterator; - const_iterator begin() const { return mvPostItFields.begin(); } - const_iterator end() const { return mvPostItFields.end(); } + typedef std::list< SwSidebarItem* >::const_iterator const_iterator; + const_iterator begin() const { return mvPostItFields.begin(); } + const_iterator end() const { return mvPostItFields.end(); } - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - void LayoutPostIts(); - bool CalcRects(); + void LayoutPostIts(); + bool CalcRects(); - void MakeVisible( const sw::sidebarwindows::SwSidebarWin* pPostIt, - long aPage = -1); + void MakeVisible( const sw::sidebarwindows::SwSidebarWin* pPostIt, + long aPage = -1); - bool ShowScrollbar(const unsigned long aPage) const; - bool HasNotes() const ; - bool ShowNotes() const; - bool IsShowAnchor() { return mbIsShowAnchor;} - unsigned long GetSidebarWidth(bool bPx = false) const; - unsigned long GetSidebarBorderWidth(bool bPx = false) const; - unsigned long GetNoteWidth(); + bool ShowScrollbar(const unsigned long aPage) const; + bool HasNotes() const ; + bool ShowNotes() const; + bool IsShowAnchor() { return mbIsShowAnchor;} + unsigned long GetSidebarWidth(bool bPx = false) const; + unsigned long GetSidebarBorderWidth(bool bPx = false) const; + unsigned long GetNoteWidth(); - void PrepareView(bool bIgnoreCount = false); + void PrepareView(bool bIgnoreCount = false); - void CorrectPositions(); + void CorrectPositions(); - void SetLayout() { mbLayout = true; }; - void Delete(const OUString& aAuthor); - void Delete(); + void SetLayout() { mbLayout = true; }; + void Delete(const OUString& aAuthor); + void Delete(); - void ExecuteFormatAllDialog(SwView& rView); - void FormatAll(const SfxItemSet &rNewAttr); + void ExecuteFormatAllDialog(SwView& rView); + void FormatAll(const SfxItemSet &rNewAttr); - void Hide( const OUString& rAuthor ); - void Hide(); - void Show(); + void Hide( const OUString& rAuthor ); + void Hide(); + void Show(); - void Rescale(); + void Rescale(); - Rectangle GetBottomScrollRect(const unsigned long aPage) const; - Rectangle GetTopScrollRect(const unsigned long aPage) const; + Rectangle GetBottomScrollRect(const unsigned long aPage) const; + Rectangle GetTopScrollRect(const unsigned long aPage) const; - bool IsHit(const Point &aPointPixel); - Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const; + bool IsHit(const Point &aPointPixel); + Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const; - sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const; + sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const; - sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection, - sw::sidebarwindows::SwSidebarWin* aPostIt); - long GetNextBorder(); + sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection, + sw::sidebarwindows::SwSidebarWin* aPostIt); + long GetNextBorder(); - sw::sidebarwindows::SwSidebarWin* GetActiveSidebarWin() { return mpActivePostIt; } - void SetActiveSidebarWin( sw::sidebarwindows::SwSidebarWin* p); - bool HasActiveSidebarWin() const; - bool HasActiveAnnotationWin() const; - void GrabFocusOnActiveSidebarWin(); - void UpdateDataOnActiveSidebarWin(); - void DeleteActiveSidebarWin(); - void HideActiveSidebarWin(); - void ToggleInsModeOnActiveSidebarWin(); + sw::sidebarwindows::SwSidebarWin* GetActiveSidebarWin() { return mpActivePostIt; } + void SetActiveSidebarWin( sw::sidebarwindows::SwSidebarWin* p); + bool HasActiveSidebarWin() const; + bool HasActiveAnnotationWin() const; + void GrabFocusOnActiveSidebarWin(); + void UpdateDataOnActiveSidebarWin(); + void DeleteActiveSidebarWin(); + void HideActiveSidebarWin(); + void ToggleInsModeOnActiveSidebarWin(); - sal_Int32 GetMinimumSizeWithMeta() const; - sal_Int32 GetSidebarScrollerHeight() const; + sal_Int32 GetMinimumSizeWithMeta() const; + sal_Int32 GetSidebarScrollerHeight() const; - void SetShadowState(const SwPostItField* pField,bool bCursor = true); + void SetShadowState(const SwPostItField* pField,bool bCursor = true); - void SetSpellChecking(); + void SetSpellChecking(); - static Color GetColorDark(sal_uInt16 aAuthorIndex); - static Color GetColorLight(sal_uInt16 aAuthorIndex); - static Color GetColorAnchor(sal_uInt16 aAuthorIndex); + static Color GetColorDark(sal_uInt16 aAuthorIndex); + static Color GetColorLight(sal_uInt16 aAuthorIndex); + static Color GetColorAnchor(sal_uInt16 aAuthorIndex); - void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;} - OutlinerParaObject* IsAnswer() {return mpAnswer;} - void CheckMetaText(); + void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;} + OutlinerParaObject* IsAnswer() {return mpAnswer;} + void CheckMetaText(); - sal_uInt16 Replace(SvxSearchItem* pItem); - sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); - sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); + sal_uInt16 Replace(SvxSearchItem* pItem); + sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); + sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); - void AssureStdModeAtShell(); + void AssureStdModeAtShell(); - void ConnectSidebarWinToFrm( const SwFrm& rFrm, - const SwFormatField& rFormatField, - sw::sidebarwindows::SwSidebarWin& rSidebarWin ); - void DisconnectSidebarWinFromFrm( const SwFrm& rFrm, - sw::sidebarwindows::SwSidebarWin& rSidebarWin ); - bool HasFrmConnectedSidebarWins( const SwFrm& rFrm ); - vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm, - const sal_Int32 nIndex ); - void GetAllSidebarWinForFrm( const SwFrm& rFrm, - std::vector< vcl::Window* >* pChildren ); + void ConnectSidebarWinToFrm( const SwFrm& rFrm, + const SwFormatField& rFormatField, + sw::sidebarwindows::SwSidebarWin& rSidebarWin ); + void DisconnectSidebarWinFromFrm( const SwFrm& rFrm, + sw::sidebarwindows::SwSidebarWin& rSidebarWin ); + bool HasFrmConnectedSidebarWins( const SwFrm& rFrm ); + vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm, + const sal_Int32 nIndex ); + void GetAllSidebarWinForFrm( const SwFrm& rFrm, + std::vector< vcl::Window* >* pChildren ); - void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); + void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); }; #endif diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 7bbbb2ecffb1..b3a62474f4cd 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -190,7 +190,7 @@ class SwSidebarWin : public vcl::Window DECL_LINK(ModifyHdl, void*); DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(DeleteHdl, void*); + DECL_LINK_TYPED(DeleteHdl, void*, void); inline SwView& DocView() { return mrView;} inline SwPostItMgr& Mgr() { return mrMgr; } diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 44d19603a3de..6398b92f192c 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -455,7 +455,7 @@ public: static sal_uInt16 GetMoveType(); static void SetMoveType(sal_uInt16 nSet); - DECL_LINK( MoveNavigationHdl, bool* ); // #i75416# + DECL_LINK_TYPED( MoveNavigationHdl, void*, void ); static void SetActMark(sal_Int32 nSet); bool HandleWheelCommands( const CommandEvent& ); diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index d8168abfba96..1bbba464d1f9 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -122,14 +122,14 @@ bool SwRetrievedInputStreamDataManager::PopData( const tDataKey nDataKey, #i73788# Note: This method has to be run in the main thread. */ -IMPL_LINK( SwRetrievedInputStreamDataManager, +IMPL_LINK_TYPED( SwRetrievedInputStreamDataManager, LinkedInputStreamReady, - SwRetrievedInputStreamDataManager::tDataKey*, - pDataKey ) + void*, p, void ) { + SwRetrievedInputStreamDataManager::tDataKey* pDataKey = static_cast<SwRetrievedInputStreamDataManager::tDataKey*>(p); if ( !pDataKey ) { - return 0; + return; } osl::MutexGuard aGuard(maMutex); @@ -148,8 +148,6 @@ IMPL_LINK( SwRetrievedInputStreamDataManager, } } delete pDataKey; - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index c89686fe08fb..831df4ee563a 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -75,7 +75,7 @@ class SwRetrievedInputStreamDataManager bool PopData( const tDataKey nDataKey, tData& rData ); - DECL_LINK( LinkedInputStreamReady, SwRetrievedInputStreamDataManager::tDataKey* ); + DECL_LINK_TYPED( LinkedInputStreamReady, void*, void ); private: diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index f24fb15fe512..7ad8b7b05d4f 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -489,7 +489,7 @@ SwHTMLParser::~SwHTMLParser() } } -IMPL_LINK_NOARG( SwHTMLParser, AsyncCallback ) +IMPL_LINK_NOARG_TYPED( SwHTMLParser, AsyncCallback, void*, void ) { nEventId=0; @@ -503,7 +503,6 @@ IMPL_LINK_NOARG( SwHTMLParser, AsyncCallback ) } GetAsynchCallLink().Call(0); - return 0; } SvParserState SwHTMLParser::CallParser() diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 73eb990bd338..dfe788654790 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -486,7 +486,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SwViewShell *CallEndAction( bool bChkAction = false, bool bChkPtr = true ); SwViewShell *CheckActionViewShell(); - DECL_LINK( AsyncCallback, void* ); + DECL_LINK_TYPED( AsyncCallback, void*, void ); // Attribute am Dok setzen void _SetAttr( bool bChkEnd, bool bBeforeTable, _HTMLAttrs *pPostIts ); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index b21c252bc1e6..18fa4f8d7e25 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -68,7 +68,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog void Test(); DECL_LINK_TYPED(StopHdl, Button*, void); - DECL_LINK(TestHdl, void*); + DECL_LINK_TYPED(TestHdl, void*, void); public: explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); virtual ~SwTestAccountSettingsDialog(); @@ -278,12 +278,11 @@ IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void) m_bStop = true; } -IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl) +IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, TestHdl, void*, void) { EnterWait(); Test(); LeaveWait(); - return 0; } void SwTestAccountSettingsDialog::Test() diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index c7b708837dac..33f283b69730 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -477,11 +477,12 @@ IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) return 0; } -IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pSelect) +IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) { + SvTreeListEntry* pSelect = static_cast<SvTreeListEntry*>(p); //prevent nested calls of the select handler if(m_bInSelectHdl) - return 0; + return; EnterWait(); m_bInSelectHdl = true; AddressUserData_Impl* pUserData = 0; @@ -530,7 +531,6 @@ IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pS !SWUnoHelper::UCB_IsReadOnlyFileName( pUserData->sURL ) ); m_bInSelectHdl = false; LeaveWait(); - return 0; } // detect the number of tables for a data source diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index cb542429007f..921ece655941 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -82,7 +82,7 @@ class SwAddressListDialog : public SfxModalDialog DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK(StaticListBoxSelectHdl_Impl, SvTreeListEntry*); + DECL_LINK_TYPED(StaticListBoxSelectHdl_Impl, void*, void); public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 9b564897e4d8..6f264cb0db42 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -180,8 +180,8 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog DECL_DLLPRIVATE_LINK_TYPED( StopHdl_Impl, Button*, void ); DECL_DLLPRIVATE_LINK_TYPED( CloseHdl_Impl, Button* , void); - DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* ); - DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* ); + DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void ); DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void ); SAL_DLLPRIVATE void IterateMails(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 46e34667986b..382c09cc9318 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -388,10 +388,9 @@ IMPL_LINK_NOARG_TYPED(SwSendMailDialog, CloseHdl_Impl, Button*, void) ModelessDialog::Show( false ); } -IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog ) +IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, pDialog, void ) { - pDialog->SendMails(); - return 0; + static_cast<SwSendMailDialog*>(pDialog)->SendMails(); } IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) @@ -416,8 +415,9 @@ IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) } } -IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog ) +IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, p, void ) { + SwSendMailDialog* pDialog = static_cast<SwSendMailDialog*>(p); if(pDialog->m_pImpl->xMailDispatcher.is() && pDialog->m_pImpl->xMailDispatcher->isStarted()) { @@ -425,7 +425,6 @@ IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog ) pDialog->m_pStop->SetText(pDialog->m_sContinue); pDialog->m_pPaused->Show(); } - return 0; } void SwSendMailDialog::SendMails() diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 387e28f23bed..3caad9da0d2c 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -268,11 +268,10 @@ class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject AbstractMailMergeWizard* m_pWizard; // always owner DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* ); - DECL_LINK( DestroyDialogHdl, void* ); - DECL_STATIC_LINK( - SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard* ); - DECL_LINK( CancelHdl, void* ); - DECL_LINK( CloseFrameHdl, void* ); + DECL_LINK_TYPED( DestroyDialogHdl, void*, void ); + DECL_STATIC_LINK_TYPED( SwMailMergeWizardExecutor, DestroyWizardHdl, void*, void ); + DECL_LINK_TYPED( CancelHdl, void*, void ); + DECL_LINK_TYPED( CloseFrameHdl, void*, void ); void ExecutionFinished( bool bDeleteConfigItem ); void ExecuteWizard(); @@ -575,24 +574,20 @@ IMPL_LINK( SwMailMergeWizardExecutor, EndDialogHdl, AbstractMailMergeWizard*, pD return 0L; } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, DestroyDialogHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, DestroyDialogHdl, void*, void) { delete m_pWizard; m_pWizard = 0; release(); - return 0L; } -IMPL_STATIC_LINK( - SwMailMergeWizardExecutor, DestroyWizardHdl, AbstractMailMergeWizard*, - pDialog ) +IMPL_STATIC_LINK_TYPED(SwMailMergeWizardExecutor, DestroyWizardHdl, void*, pDialog, void ) { - delete pDialog; - return 0L; + delete static_cast<AbstractMailMergeWizard*>(pDialog); } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) { if(m_pMMConfig->GetTargetView()) { @@ -608,19 +603,15 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl) // m_pWizard already deleted by closing the target view m_pWizard = 0; release(); - - return 0L; } -IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) { if ( m_pView2Close ) { m_pView2Close->GetViewFrame()->DoClose(); m_pView2Close = NULL; } - - return 0L; } } // namespace diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index b4f6046974bc..a10fb41e268d 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -174,8 +174,9 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) } } -IMPL_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect ) +IMPL_LINK_TYPED( SwWrtShell, InsertRegionDialog, void*, p, void ) { + SwSectionData* pSect = static_cast<SwSectionData*>(p); boost::scoped_ptr<SwSectionData> xSectionData(pSect); if (xSectionData.get()) { @@ -199,7 +200,6 @@ IMPL_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect ) aTabDlg->SetSectionData(*xSectionData); aTabDlg->Execute(); } - return 0; } void SwBaseShell::EditRegionDialog(SfxRequest& rReq) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index c6b6b817cd84..362919f7c763 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1877,14 +1877,14 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p) } } -IMPL_LINK_NOARG( SwPostItMgr, CalcHdl ) +IMPL_LINK_NOARG_TYPED( SwPostItMgr, CalcHdl, void*, void ) { mnEventId = 0; if ( mbLayouting ) { OSL_FAIL("Reentrance problem in Layout Manager!"); mbWaitingForCalcRects = false; - return 0; + return; } // do not change order, even if it would seem so in the first place, we need the calcrects always @@ -1893,7 +1893,6 @@ IMPL_LINK_NOARG( SwPostItMgr, CalcHdl ) mbLayout = false; LayoutPostIts(); } - return 0; } void SwPostItMgr::Rescale() diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 63bd1f1d70df..7023c79dca78 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1189,11 +1189,10 @@ IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl) return 0; } -IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl) +IMPL_LINK_NOARG_TYPED(SwSidebarWin, DeleteHdl, void*, void) { mnEventId = 0; Delete(); - return 0; } void SwSidebarWin::ResetAttributes() diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 8d4737e7c6f9..38651f917cf0 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -59,7 +59,7 @@ protected: inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } - DECL_LINK( InsertDBTextHdl, DBTextStruct_Impl* ); + DECL_LINK_TYPED( InsertDBTextHdl, void*, void ); void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText ); void InsertTable( SfxRequest& _rRequest ); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index a305c3569572..9fd8e2a8ab37 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -299,7 +299,7 @@ protected: static const SfxObjectShell* GetShowShell() {return pShowShell;} static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} - DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); + DECL_STATIC_LINK_TYPED(SwGlobalTree, ShowFrameHdl, void*, void); virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 0ccd8c57c1a9..f965c87f4479 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -443,7 +443,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL ); // link for inserting ranges via Drag&Drop/Clipboard - DECL_LINK( InsertRegionDialog, SwSectionData* ); + DECL_LINK_TYPED( InsertRegionDialog, void*, void ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index cf95548cb6b9..925d2af5c0cc 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -154,8 +154,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) pNew->xCursor = xCursor; pNew->xConnection = xConnection; - Application::PostUserEvent( LINK( this, SwBaseShell, - InsertDBTextHdl ), pNew ); + Application::PostUserEvent( LINK( this, SwBaseShell, InsertDBTextHdl ), pNew ); // the pNew will be removed in InsertDBTextHdl !! } } @@ -234,8 +233,9 @@ void SwTextShell::ExecDB(SfxRequest &rReq) } } -IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) +IMPL_LINK_TYPED( SwBaseShell, InsertDBTextHdl, void*, p, void ) { + DBTextStruct_Impl* pDBStruct = static_cast<DBTextStruct_Impl*>(p); if( pDBStruct ) { bool bDispose = false; @@ -243,7 +243,7 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource); // #111987# the connection is disposed an so no parent has been found if(xConnection.is() && !xSource.is()) - return 0; + return; if ( !xConnection.is() ) { @@ -278,7 +278,6 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) } delete pDBStruct; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 4980439b3641..896d240acbe9 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -604,11 +604,12 @@ struct ExecuteInfo class AsyncExecute { public: - DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, void ); }; -IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) +IMPL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, p, void ) { + ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); SolarMutexReleaser aReleaser; try { @@ -622,7 +623,6 @@ IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) } delete pExecuteInfo; - return 0; } //!! End of extra code for context menu modifying extensions diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index e27caff132e7..49424a6e864d 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -313,10 +313,11 @@ int SwView::_CreateScrollbar( bool bHori ) return 1; } -IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) +IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void ) { + bool* pbNext = static_cast<bool*>(p); if ( !pbNext ) - return 0; + return; const bool bNext = *pbNext; SwWrtShell& rSh = GetWrtShell(); switch( m_nMoveType ) @@ -462,7 +463,6 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) } m_pEditWin->GrabFocus(); delete pbNext; - return 0; } int SwView::CreateTab() diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 0f4e6d6f127f..a7db9aa3e904 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1216,14 +1216,13 @@ SwNavigationPI* SwGlobalTree::GetParentWindow() return static_cast<SwNavigationPI*>(Window::GetParent()); } -IMPL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*,) +IMPL_STATIC_LINK_NOARG_TYPED(SwGlobalTree, ShowFrameHdl, void*, void) { const SfxObjectShell* pShell = SwGlobalTree::GetShowShell(); SfxViewFrame* pFirst = pShell ? SfxViewFrame::GetFirst(pShell) : NULL; if (pFirst) pFirst->ToTop(); SwGlobalTree::SetShowShell(0); - return 0; } void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry, diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 391cccf6e782..cc988b2b0831 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -61,7 +61,7 @@ private: css::uno::Any aData; }; - DECL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData* ); + DECL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, void ); virtual ~AsyncCallback() {} }; @@ -97,8 +97,9 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC } // private asynchronous link to call reference to the callback object -IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) +IMPL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, p, void ) { + CallbackData* pCallbackData = static_cast<CallbackData*>(p); try { // Asynchronous execution @@ -111,7 +112,6 @@ IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) } delete pCallbackData; - return 0; } } // closing anonymous implementation namespace diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 01c9d65e190f..32943402e3b7 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -188,7 +188,7 @@ public: ~VCLXWindowImpl(); private: - DECL_LINK( OnProcessCallbacks, void* ); + DECL_LINK_TYPED( OnProcessCallbacks, void*, void ); }; @@ -271,7 +271,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) } -IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) +IMPL_LINK_NOARG_TYPED(VCLXWindowImpl, OnProcessCallbacks, void*, void) { const Reference< uno::XInterface > xKeepAlive( mrAntiImpl ); @@ -287,7 +287,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) if ( !mnCallbackEventId ) // we were disposed while waiting for the mutex to lock - return 1L; + return; mnCallbackEventId = 0; } @@ -302,8 +302,6 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) (*loop)(); } } - - return 0L; } Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index d16935bedd8e..5a9ad912cd7b 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -146,8 +146,7 @@ UUIInteractionHelper::~UUIInteractionHelper() { } -sal_IntPtr -UUIInteractionHelper::handlerequest( +void UUIInteractionHelper::handlerequest( void* pHandleData, void* pInteractionHelper) { HandleData* pHND @@ -159,7 +158,6 @@ UUIInteractionHelper::handlerequest( pHND->bHandled = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy); pHND->set(); - return 0; } bool @@ -176,7 +174,7 @@ UUIInteractionHelper::handleRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link<> aLink(&aHD,handlerequest); + Link<void*,void> aLink(&aHD,handlerequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); @@ -190,15 +188,13 @@ UUIInteractionHelper::handleRequest( } } -sal_IntPtr -UUIInteractionHelper::getstringfromrequest( +void UUIInteractionHelper::getstringfromrequest( void* pHandleData,void* pInteractionHelper) { HandleData* pHND = static_cast<HandleData*>(pHandleData); UUIInteractionHelper* pUUI = static_cast<UUIInteractionHelper*>(pInteractionHelper); pHND->m_aResult = pUUI->getStringFromRequest_impl(pHND->m_rRequest); pHND->set(); - return 0; } beans::Optional< OUString > @@ -232,7 +228,7 @@ UUIInteractionHelper::getStringFromRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link<> aLink(&aHD,getstringfromrequest); + Link<void*,void> aLink(&aHD,getstringfromrequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 86897db51d19..d8782cf0eb9b 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -129,16 +129,14 @@ private: bool & bHasErrorString, OUString & rErrorString); - static sal_IntPtr - handlerequest(void* pHandleData, void* pInteractionHandler); + static void handlerequest(void* pHandleData, void* pInteractionHandler); com::sun::star::beans::Optional< OUString > getStringFromRequest_impl( com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > const & rRequest); - static sal_IntPtr - getstringfromrequest(void* pHandleData, void* pInteractionHandler); + static void getstringfromrequest(void* pHandleData, void* pInteractionHandler); vcl::Window * getParentProperty(); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index a035ae301aee..54fc68f8897f 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -148,7 +148,7 @@ struct ImplSVAppData */ ImeStatusWindowMode meShowImeStatusWindow; - DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* ); + DECL_STATIC_LINK_TYPED( ImplSVAppData, ImplQuitMsg, void*, void ); }; struct ImplSVGDIData @@ -403,7 +403,7 @@ struct ImplFocusDelData : public ImplDelData struct ImplSVEvent { void* mpData; - Link<>* mpLink; + Link<void*,void> maLink; VclPtr<vcl::Window> mpInstanceRef; VclPtr<vcl::Window> mpWindow; ImplDelData maDelData; diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 48d202c6a7e4..190ead3292b0 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -57,10 +57,10 @@ class SessionManagerClient static OString getPreviousSessionID(); - DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void* ); - DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void* ); - DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void* ); - DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void* ); + DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownHdl, void*, void ); + DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ); + DECL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, void ); + DECL_STATIC_LINK_TYPED( SessionManagerClient, InteractionHdl, void*, void ); public: static void open(SalSession * pSession); static void close(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 2c8f41d8cdd1..7b87430e1a4a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -411,10 +411,9 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased) #endif } -IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg ) +IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplQuitMsg, void*, void ) { ImplGetSVData()->maAppData.mbAppQuit = true; - return 0; } void Application::Quit() @@ -777,12 +776,12 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, } -IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData ) +IMPL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, pCallData, void ) { const SolarMutexGuard aGuard; ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); const void* pEventData; - sal_uLong nEvent; + sal_uLong nEvent; ImplSVEvent * const nEventId = pData->mnEventId; switch( pData->mnEvent ) @@ -844,8 +843,6 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData ) else ++aIter; } - - return 0; } void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin ) @@ -870,12 +867,12 @@ void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin ) } } -ImplSVEvent * Application::PostUserEvent( const Link<>& rLink, void* pCaller, +ImplSVEvent * Application::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mpData = pCaller; - pSVEvent->mpLink = new Link<>( rLink ); + pSVEvent->maLink = rLink; pSVEvent->mpWindow = NULL; pSVEvent->mbCall = true; if (bReferenceLink) @@ -891,7 +888,6 @@ ImplSVEvent * Application::PostUserEvent( const Link<>& rLink, void* pCaller, vcl::Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow == 0 || !pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) { - delete pSVEvent->mpLink; delete pSVEvent; pSVEvent = 0; } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 2b8b8ad0355b..2c8eb81d60a3 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -269,17 +269,15 @@ struct PrintJobAsync : mxController( i_xController ), maInitSetup( i_rInitSetup ) {} - DECL_LINK( ExecJob, void* ); + DECL_LINK_TYPED( ExecJob, void*, void ); }; -IMPL_LINK_NOARG(PrintJobAsync, ExecJob) +IMPL_LINK_NOARG_TYPED(PrintJobAsync, ExecJob, void*, void) { Printer::ImplPrintJob(mxController, maInitSetup); // clean up, do not access members after this delete this; - - return 0; } void Printer::PrintJob(const std::shared_ptr<PrinterController>& i_xController, diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index d278e9aa71b0..ce84ec74cba2 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -46,12 +46,12 @@ void EventPoster::Post( UserEvent* pEvent ) m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent ); } -IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent ) +IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, p, void ) { + UserEvent* pEvent = static_cast<UserEvent*>(p); DBG_TESTSOLARMUTEX(); m_nId = 0; m_aLink.Call( pEvent ); - return 0; } } diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index a62bcfc3ab88..5fe7376c6556 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -36,7 +36,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK_NOARG(SolarThreadExecutor, worker) +IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void) { if ( !m_bTimeout ) { @@ -44,7 +44,6 @@ IMPL_LINK_NOARG(SolarThreadExecutor, worker) m_nReturn = doIt(); osl_setCondition( m_aFinish ); } - return m_nReturn; } long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 62e3fbf978e7..57be7b8cf795 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -579,10 +579,9 @@ void Dialog::dispose() SystemWindow::dispose(); } -IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) +IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void) { Close(); - return 0; } bool Dialog::ImplHandleCmdEvent( const CommandEvent& rCEvent ) @@ -999,7 +998,7 @@ void Dialog::EndAllDialogs( vcl::Window* pParent ) if(!pParent || pParent->IsWindowOrChild(pModDialog,true)) { pModDialog->EndDialog(); - pModDialog->PostUserEvent( Link<>() ); + pModDialog->PostUserEvent( Link<void*,void>() ); } pModDialog = pTempModDialog; } diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index be1017590491..11c647ab5ba8 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -50,7 +50,7 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK(DockingHdl, void *); + DECL_LINK_TYPED(DockingHdl, void *, void); DECL_LINK_TYPED(DockTimerHdl, Idle *, void); DECL_LINK_TYPED(EndDockTimerHdl, Idle *, void); public: @@ -151,7 +151,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) +IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockingHdl, void*, void) { // called during move of a floating window mnLastUserEvent = 0; @@ -221,7 +221,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) } } mbInMove = false; - return 0; } void ImplDockFloatWin2::Move() diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 4e91deb85609..feb4b405742f 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -67,7 +67,7 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK(DockingHdl, void *); + DECL_LINK_TYPED(DockingHdl, void *, void); DECL_LINK_TYPED(DockTimerHdl, Idle *, void); public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, @@ -153,7 +153,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) +IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockingHdl, void*, void) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); @@ -187,7 +187,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) } } mbInMove = false; - return 0; } void ImplDockFloatWin::Move() diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index b73614102cb1..8fcc65bf3735 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -264,11 +264,11 @@ void Window::RemoveChildEventListener( const Link<>& rEventListener ) mpWindowImpl->maChildEventListeners.removeListener( rEventListener ); } -ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink ) +ImplSVEvent * Window::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mpData = pCaller; - pSVEvent->mpLink = new Link<>( rLink ); + pSVEvent->maLink = rLink; pSVEvent->mpWindow = this; pSVEvent->mbCall = true; if (bReferenceLink) @@ -284,7 +284,6 @@ ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller, bool bR if ( !mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) { ImplRemoveDel( &(pSVEvent->maDelData) ); - delete pSVEvent->mpLink; delete pSVEvent; pSVEvent = 0; } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 944960931869..46353c822b9d 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -539,14 +539,13 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ) return false; } -IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) +IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void) { VclPtr<FloatingWindow> pThis(this); mnPostId = 0; mnPopupModeFlags = FloatWinPopupFlags::NONE; mbPopupMode = false; PopupModeEnd(); - return 0; } bool FloatingWindow::Notify( NotifyEvent& rNEvt ) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 5bad674c0f17..c2e415a4ede2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2204,11 +2204,10 @@ void Menu::ImplCallHighlight(sal_uInt16 nItem) } } -IMPL_LINK_NOARG(Menu, ImplCallSelect) +IMPL_LINK_NOARG_TYPED(Menu, ImplCallSelect, void*, void) { nEventId = 0; Select(); - return 0; } Menu* Menu::ImplFindSelectMenu() diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index b92bb20cc41b..16bb316496eb 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -163,7 +163,7 @@ void Window::ImplGenerateMouseMove() mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), NULL, true ); } -IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) +IMPL_LINK_NOARG_TYPED(Window, ImplGenerateMouseMoveHdl, void*, void) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; vcl::Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; @@ -173,7 +173,6 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { ImplCallMouseMove( mpWindowImpl->mpFrameData->mnMouseCode ); } - return 0; } void Window::ImplInvertFocus( const Rectangle& rRect ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 19ca6dc19778..9c2af02d1c0d 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1862,11 +1862,10 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent*, pEvent ) return 0; } -IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu) +IMPL_LINK_NOARG_TYPED(ToolBox, ImplCallExecuteCustomMenu, void*, void) { mpData->mnEventId = 0; ImplExecuteCustomMenu(); - return 0; } void ToolBox::ImplExecuteCustomMenu() diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index da55c5f37784..c25af35f8722 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -249,7 +249,7 @@ struct ContextMenuEvent Point aChildPos; }; -static sal_IntPtr ContextMenuEventLink( void* pCEvent, void* ) +static void ContextMenuEventLink( void* pCEvent, void* ) { ContextMenuEvent* pEv = static_cast<ContextMenuEvent*>(pCEvent); @@ -259,8 +259,6 @@ static sal_IntPtr ContextMenuEventLink( void* pCEvent, void* ) ImplCallCommand( pEv->pWindow, CommandEventId::ContextMenu, NULL, true, &pEv->aChildPos ); } delete pEv; - - return 0; } bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool bMouseLeave, @@ -818,7 +816,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool pEv->pWindow = pChild; pEv->aChildPos = aChildPos; pChild->ImplAddDel( &pEv->aDelData ); - Application::PostUserEvent( Link<>( pEv, ContextMenuEventLink ) ); + Application::PostUserEvent( Link<void*,void>( pEv, ContextMenuEventLink ) ); } else bRet = ! ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL, true, &aChildPos ); @@ -1772,7 +1770,7 @@ static void ImplActivateFloatingWindows( vcl::Window* pWindow, bool bActive ) } } -IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl) +IMPL_LINK_NOARG_TYPED(vcl::Window, ImplAsyncFocusHdl, void*, void) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; @@ -1877,8 +1875,6 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl) if ( ImplGetWindowImpl()->mpFrameData->mbStartFocusState != bHasFocus ) ImplActivateFloatingWindows( this, bHasFocus ); } - - return 0; } static void ImplHandleGetFocus( vcl::Window* pWindow ) @@ -1933,7 +1929,7 @@ struct DelayedCloseEvent ImplDelData aDelData; }; -static sal_IntPtr DelayedCloseEventLink( void* pCEvent, void* ) +static void DelayedCloseEventLink( void* pCEvent, void* ) { DelayedCloseEvent* pEv = static_cast<DelayedCloseEvent*>(pCEvent); @@ -1947,8 +1943,6 @@ static sal_IntPtr DelayedCloseEventLink( void* pCEvent, void* ) static_cast<DockingWindow*>(pEv->pWindow.get())->Close(); } delete pEv; - - return 0; } void ImplHandleClose( vcl::Window* pWindow ) @@ -2002,7 +1996,7 @@ void ImplHandleClose( vcl::Window* pWindow ) DelayedCloseEvent* pEv = new DelayedCloseEvent; pEv->pWindow = pWin; pWin->ImplAddDel( &pEv->aDelData ); - Application::PostUserEvent( Link<>( pEv, DelayedCloseEventLink ) ); + Application::PostUserEvent( Link<void*,void>( pEv, DelayedCloseEventLink ) ); } } @@ -2015,15 +2009,14 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) if ( pSVEvent->mpWindow ) { pSVEvent->mpWindow->ImplRemoveDel( &(pSVEvent->maDelData) ); - pSVEvent->mpLink->Call( pSVEvent->mpData ); + pSVEvent->maLink.Call( pSVEvent->mpData ); } else { - pSVEvent->mpLink->Call( pSVEvent->mpData ); + pSVEvent->maLink.Call( pSVEvent->mpData ); } } - delete pSVEvent->mpLink; delete pSVEvent; } } diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 42056ce2335b..c3ae8e0b9354 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -92,7 +92,7 @@ class XIMStatusWindow : public StatusWindow void layout(); bool checkLastParent() const; - DECL_LINK( DelayedShowHdl, void* ); + DECL_LINK_TYPED( DelayedShowHdl, void*, void ); public: explicit XIMStatusWindow( bool bOn ); virtual ~XIMStatusWindow(); @@ -258,7 +258,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl) +IMPL_LINK_NOARG_TYPED(XIMStatusWindow, DelayedShowHdl, void*, void) { m_nDelayedEvent = 0; const SystemEnvData* pData = GetSystemData(); @@ -276,7 +276,6 @@ IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl) XRaiseWindow( static_cast<Display*>(pData->pDisplay), (::Window)pData->aShellWindow ); } - return 0; } void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason eReason ) diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 8627fdeab94b..057ff0d05fa0 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -238,7 +238,7 @@ bool SessionManagerClient::checkDocumentsSaved() return m_bDocSaveDone; } -IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal ) +IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); @@ -277,11 +277,9 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal ) } else saveDone(); - - return 0; } -IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl ) +IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -289,11 +287,9 @@ IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl ) SalSessionInteractionEvent aEvent( true ); m_pSession->CallCallback( &aEvent ); } - - return 0; } -IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl ) +IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -301,8 +297,6 @@ IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl ) SalSessionShutdownCancelEvent aEvent; m_pSession->CallCallback( &aEvent ); } - - return 0; } void SessionManagerClient::SaveYourselfProc( @@ -343,7 +337,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl ) +IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownHdl, void*, void ) { if( m_pSession ) { @@ -355,7 +349,6 @@ IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl ) SAL_INFO("vcl.sm", (!rFrames.empty() ? "shutdown on first frame" : "shutdown event but no frame")); if( !rFrames.empty() ) rFrames.front()->CallCallback( SALEVENT_SHUTDOWN, 0 ); - return 0; } void SessionManagerClient::DieProc( |