summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
-rw-r--r--accessibility/inc/accessibility/extended/textwindowaccessibility.hxx4
-rw-r--r--basctl/source/basicide/bastype3.hxx12
-rw-r--r--basctl/source/basicide/bastypes.cxx4
-rw-r--r--basctl/source/inc/baside3.hxx2
-rw-r--r--basic/qa/cppunit/basictest.hxx2
-rw-r--r--basic/source/classes/sb.cxx6
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/inc/sbintern.hxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx22
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx8
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_Titles.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx4
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx2
-rw-r--r--chart2/source/controller/inc/res_LegendPosition.hxx4
-rw-r--r--chart2/source/controller/inc/res_Titles.hxx2
-rw-r--r--chart2/source/inc/ModifyListenerCallBack.hxx2
-rw-r--r--chart2/source/tools/ModifyListenerCallBack.cxx8
-rw-r--r--cui/source/customize/acccfg.cxx8
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/dialogs/SpellDialog.cxx4
-rw-r--r--cui/source/dialogs/colorpicker.cxx10
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx2
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx6
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx22
-rw-r--r--cui/source/dialogs/hlinettp.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx4
-rw-r--r--cui/source/dialogs/scriptdlg.cxx2
-rw-r--r--cui/source/dialogs/zoom.cxx8
-rw-r--r--cui/source/factory/dlgfact.cxx46
-rw-r--r--cui/source/factory/dlgfact.hxx46
-rw-r--r--cui/source/inc/SpellDialog.hxx6
-rw-r--r--cui/source/inc/autocdlg.hxx4
-rw-r--r--cui/source/inc/cfg.hxx10
-rw-r--r--cui/source/inc/cuifmsearch.hxx12
-rw-r--r--cui/source/inc/cuigaldlg.hxx4
-rw-r--r--cui/source/inc/cuigrfflt.hxx12
-rw-r--r--cui/source/inc/dlgname.hxx8
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx26
-rw-r--r--cui/source/inc/labdlg.hxx4
-rw-r--r--cui/source/inc/numfmt.hxx4
-rw-r--r--cui/source/inc/optdict.hxx4
-rw-r--r--cui/source/inc/postdlg.hxx12
-rw-r--r--cui/source/inc/selector.hxx6
-rw-r--r--cui/source/inc/swpossizetabpage.hxx4
-rw-r--r--cui/source/inc/transfrm.hxx4
-rw-r--r--cui/source/options/connpooloptions.cxx4
-rw-r--r--cui/source/options/doclinkdialog.hxx6
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/optasian.cxx2
-rw-r--r--cui/source/options/optcolor.cxx20
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optgenrl.cxx2
-rw-r--r--cui/source/options/optinet2.cxx2
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/optsave.cxx2
-rw-r--r--cui/source/tabpages/align.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx12
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/labdlg.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx4
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--cui/source/tabpages/page.cxx2
-rw-r--r--cui/source/tabpages/paragrph.cxx6
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx2
-rw-r--r--cui/source/tabpages/tabstpge.cxx2
-rw-r--r--cui/source/tabpages/textanim.cxx2
-rw-r--r--cui/source/tabpages/textattr.cxx2
-rw-r--r--cui/source/tabpages/tparea.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx2
-rw-r--r--cui/source/tabpages/tphatch.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx8
-rw-r--r--cui/source/tabpages/tplnedef.cxx2
-rw-r--r--cui/source/tabpages/tpshadow.cxx2
-rw-r--r--cui/source/tabpages/transfrm.cxx2
-rw-r--r--dbaccess/source/ui/browser/AsynchronousLink.cxx2
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx6
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.hxx6
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx2
-rw-r--r--dbaccess/source/ui/control/ScrollHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx14
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx8
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx2
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx6
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx16
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx14
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx6
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.hxx4
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx8
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx4
-rw-r--r--dbaccess/source/ui/inc/ScrollHelper.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx36
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx12
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx6
-rw-r--r--dbaccess/source/ui/inc/marktree.hxx4
-rw-r--r--dbaccess/source/ui/inc/sqledit.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.hxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx2
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx12
-rw-r--r--editeng/source/editeng/editdoc.hxx6
-rw-r--r--editeng/source/editeng/editeng.cxx32
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--editeng/source/editeng/impedit.hxx40
-rw-r--r--editeng/source/editeng/impedit5.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx4
-rw-r--r--editeng/source/outliner/outleeng.hxx2
-rw-r--r--editeng/source/outliner/outlin2.cxx12
-rw-r--r--editeng/source/outliner/outliner.cxx8
-rw-r--r--editeng/source/outliner/outlvw.cxx2
-rw-r--r--editeng/source/outliner/paralist.hxx6
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx2
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/bibliography/toolbar.cxx2
-rw-r--r--extensions/source/bibliography/toolbar.hxx4
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx12
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx2
-rw-r--r--extensions/source/propctrlr/browserview.hxx6
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx6
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx6
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.hxx4
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx8
-rw-r--r--extensions/source/scanner/sane.hxx8
-rw-r--r--extensions/source/scanner/sanedlg.hxx2
-rw-r--r--extensions/source/scanner/scanwin.cxx6
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx4
-rw-r--r--filter/source/svg/svgfilter.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--forms/source/component/imgprod.hxx6
-rw-r--r--forms/source/richtext/richtextviewport.hxx4
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx42
-rw-r--r--formula/source/ui/dlg/formula.cxx2
-rw-r--r--formula/source/ui/dlg/funcpage.hxx12
-rw-r--r--formula/source/ui/dlg/funcutl.cxx6
-rw-r--r--formula/source/ui/dlg/parawin.cxx2
-rw-r--r--formula/source/ui/dlg/parawin.hxx18
-rw-r--r--formula/source/ui/dlg/structpg.hxx6
-rw-r--r--fpicker/source/office/PlacesListBox.cxx4
-rw-r--r--fpicker/source/office/PlacesListBox.hxx4
-rw-r--r--fpicker/source/office/iodlg.cxx4
-rw-r--r--fpicker/source/office/iodlg.hxx32
-rw-r--r--fpicker/source/office/iodlgimp.hxx4
-rw-r--r--framework/inc/classes/fwktabwindow.hxx4
-rw-r--r--framework/source/classes/fwktabwindow.cxx4
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx6
-rw-r--r--framework/source/uielement/toolbarmanager.cxx6
-rw-r--r--include/basic/sbstar.hxx18
-rw-r--r--include/dbaccess/AsynchronousLink.hxx4
-rw-r--r--include/editeng/brushitem.hxx2
-rw-r--r--include/editeng/editeng.hxx34
-rw-r--r--include/editeng/editview.hxx4
-rw-r--r--include/editeng/edtdlg.hxx18
-rw-r--r--include/editeng/outliner.hxx112
-rw-r--r--include/sfx2/app.hxx6
-rw-r--r--include/sfx2/basedlgs.hxx2
-rw-r--r--include/sfx2/dinfdlg.hxx4
-rw-r--r--include/sfx2/docfile.hxx4
-rw-r--r--include/sfx2/docinsert.hxx4
-rw-r--r--include/sfx2/filedlghelper.hxx4
-rw-r--r--include/sfx2/genlink.hxx4
-rw-r--r--include/sfx2/linksrc.hxx2
-rw-r--r--include/sfx2/lnkbase.hxx2
-rw-r--r--include/sfx2/sfxdlg.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx4
-rw-r--r--include/sfx2/tbxctrl.hxx4
-rw-r--r--include/sfx2/templateabstractview.hxx8
-rw-r--r--include/sfx2/thumbnailview.hxx4
-rw-r--r--include/sfx2/thumbnailviewitem.hxx4
-rw-r--r--include/sfx2/titledockwin.hxx10
-rw-r--r--include/svl/svdde.hxx48
-rw-r--r--include/svl/urihelper.hxx6
-rw-r--r--include/svl/zforlist.hxx4
-rw-r--r--include/svtools/ServerDetailsControls.hxx4
-rw-r--r--include/svtools/asynclink.hxx8
-rw-r--r--include/svtools/calendar.hxx36
-rw-r--r--include/svtools/cliplistener.hxx4
-rw-r--r--include/svtools/dialogclosedlistener.hxx4
-rw-r--r--include/svtools/editbrowsebox.hxx26
-rw-r--r--include/svtools/editimplementation.hxx2
-rw-r--r--include/svtools/filectrl.hxx6
-rw-r--r--include/svtools/fileview.hxx8
-rw-r--r--include/svtools/grfmgr.hxx6
-rw-r--r--include/svtools/headbar.hxx36
-rw-r--r--include/svtools/htmlcfg.hxx1
-rw-r--r--include/svtools/hyperlabel.hxx6
-rw-r--r--include/svtools/inettbc.hxx6
-rw-r--r--include/svtools/ivctrl.hxx10
-rw-r--r--include/svtools/menuoptions.hxx6
-rw-r--r--include/svtools/miscopt.hxx6
-rw-r--r--include/svtools/prnsetup.hxx2
-rw-r--r--include/svtools/ruler.hxx36
-rw-r--r--include/svtools/simptabl.hxx18
-rw-r--r--include/svtools/stdmenu.hxx24
-rw-r--r--include/svtools/svlbitm.hxx6
-rw-r--r--include/svtools/svparser.hxx2
-rw-r--r--include/svtools/tabbar.hxx12
-rw-r--r--include/svtools/toolbarmenu.hxx2
-rw-r--r--include/svtools/toolpanelopt.hxx1
-rw-r--r--include/svtools/transfer.hxx4
-rw-r--r--include/svtools/treelist.hxx12
-rw-r--r--include/svtools/treelistbox.hxx46
-rw-r--r--include/svtools/valueset.hxx16
-rw-r--r--include/svtools/wizdlg.hxx12
-rw-r--r--include/svx/charmap.hxx24
-rw-r--r--include/svx/ctredlin.hxx78
-rw-r--r--include/svx/dialcontrol.hxx6
-rw-r--r--include/svx/dlgctl3d.hxx24
-rw-r--r--include/svx/fmshell.hxx2
-rw-r--r--include/svx/fmsrcimp.hxx12
-rw-r--r--include/svx/frmsel.hxx4
-rw-r--r--include/svx/galctrl.hxx4
-rw-r--r--include/svx/galtheme.hxx2
-rw-r--r--include/svx/graphctl.hxx24
-rw-r--r--include/svx/gridctrl.hxx8
-rw-r--r--include/svx/passwd.hxx4
-rw-r--r--include/svx/rubydialog.hxx8
-rw-r--r--include/svx/sdrundomanager.hxx4
-rw-r--r--include/svx/svdedxv.hxx2
-rw-r--r--include/svx/svdetc.hxx23
-rw-r--r--include/svx/svdhdl.hxx6
-rw-r--r--include/svx/svdmodel.hxx12
-rw-r--r--include/svx/svdobj.hxx10
-rw-r--r--include/svx/svxdlg.hxx18
-rw-r--r--include/tools/line.hxx2
-rw-r--r--include/tools/link.hxx69
-rw-r--r--include/unotools/syslocaleoptions.hxx4
-rw-r--r--include/vcl/abstdlg.hxx4
-rw-r--r--include/vcl/accel.hxx18
-rw-r--r--include/vcl/animate.hxx8
-rw-r--r--include/vcl/bitmap.hxx24
-rw-r--r--include/vcl/bitmapex.hxx2
-rw-r--r--include/vcl/btndlg.hxx6
-rw-r--r--include/vcl/button.hxx24
-rw-r--r--include/vcl/combobox.hxx12
-rw-r--r--include/vcl/ctrl.hxx14
-rw-r--r--include/vcl/cvtgrf.hxx6
-rw-r--r--include/vcl/dialog.hxx2
-rw-r--r--include/vcl/edit.hxx10
-rw-r--r--include/vcl/evntpost.hxx4
-rw-r--r--include/vcl/field.hxx12
-rw-r--r--include/vcl/fixedhyper.hxx6
-rw-r--r--include/vcl/floatwin.hxx6
-rw-r--r--include/vcl/gdimtf.hxx6
-rw-r--r--include/vcl/graph.hxx4
-rw-r--r--include/vcl/graphicfilter.hxx2
-rw-r--r--include/vcl/idle.hxx6
-rw-r--r--include/vcl/layout.hxx6
-rw-r--r--include/vcl/lstbox.hxx12
-rw-r--r--include/vcl/menu.hxx54
-rw-r--r--include/vcl/menubtn.hxx12
-rw-r--r--include/vcl/print.hxx8
-rw-r--r--include/vcl/scrbar.hxx12
-rw-r--r--include/vcl/slider.hxx12
-rw-r--r--include/vcl/spin.hxx12
-rw-r--r--include/vcl/spinfld.hxx24
-rw-r--r--include/vcl/split.hxx18
-rw-r--r--include/vcl/splitwin.hxx36
-rw-r--r--include/vcl/status.hxx12
-rw-r--r--include/vcl/svapp.hxx27
-rw-r--r--include/vcl/syswin.hxx4
-rw-r--r--include/vcl/tabctrl.hxx12
-rw-r--r--include/vcl/timer.hxx6
-rw-r--r--include/vcl/toolbox.hxx60
-rw-r--r--include/vcl/vclevent.hxx16
-rw-r--r--include/vcl/vclmedit.hxx10
-rw-r--r--include/vcl/window.hxx10
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx4
-rw-r--r--reportdesign/source/ui/inc/ColorListener.hxx4
-rw-r--r--rsc/inc/rsctree.hxx2
-rw-r--r--rsc/source/tools/rsctree.cxx2
-rw-r--r--sc/inc/arealink.hxx2
-rw-r--r--sc/inc/cellsuno.hxx4
-rw-r--r--sc/inc/chgtrack.hxx6
-rw-r--r--sc/inc/dbdata.hxx6
-rw-r--r--sc/inc/externalrefmgr.hxx2
-rw-r--r--sc/inc/optutil.hxx4
-rw-r--r--sc/inc/refreshtimer.hxx2
-rw-r--r--sc/inc/tablink.hxx2
-rw-r--r--sc/source/core/data/poolhelp.cxx2
-rw-r--r--sc/source/core/tool/optutil.cxx2
-rw-r--r--sc/source/core/tool/refreshtimer.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/rtf/rtfparse.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx16
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/SamplingDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx2
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx4
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx2
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx2
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx6
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/sortkeydlg.cxx2
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx2
-rw-r--r--sc/source/ui/docshell/arealink.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx2
-rw-r--r--sc/source/ui/docshell/tablink.cxx4
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx6
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx2
-rw-r--r--sc/source/ui/inc/csvcontrol.hxx6
-rw-r--r--sc/source/ui/inc/csvtablebox.hxx12
-rw-r--r--sc/source/ui/inc/funcpage.hxx12
-rw-r--r--sc/source/ui/inc/optsolver.hxx6
-rw-r--r--sc/source/ui/inc/privsplt.hxx6
-rw-r--r--sc/source/ui/inc/reffact.hxx6
-rw-r--r--sc/source/ui/inc/simpref.hxx14
-rw-r--r--sc/source/ui/inc/tphfedit.hxx10
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx2
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx10
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx10
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx2
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx10
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx2
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx2
-rw-r--r--sc/source/ui/optdlg/tpview.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx4
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.cxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.cxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx2
-rw-r--r--sc/source/ui/view/cellsh2.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx2
-rw-r--r--sc/source/ui/view/reffact.cxx6
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx2
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx4
-rw-r--r--sd/inc/sdobjfac.hxx8
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx52
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx4
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx8
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx4
-rw-r--r--sd/source/ui/dlg/dlgass.cxx10
-rw-r--r--sd/source/ui/dlg/present.cxx2
-rw-r--r--sd/source/ui/dlg/prntopts.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx2
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx4
-rw-r--r--sd/source/ui/func/fuinsfil.cxx26
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx2
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/EventMultiplexer.hxx7
-rw-r--r--sd/source/ui/inc/MasterPageObserver.hxx4
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx4
-rw-r--r--sd/source/ui/inc/docprev.hxx6
-rw-r--r--sd/source/ui/inc/futext.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx4
-rw-r--r--sd/source/ui/inc/tools/SlotStateListener.hxx6
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx10
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx22
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageObserver.cxx18
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx2
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx4
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx12
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx6
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsFocusManager.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx6
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx8
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx4
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx2
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx14
-rw-r--r--sd/source/ui/tools/SlotStateListener.cxx6
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx2
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/FormShellManager.cxx6
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
-rw-r--r--sd/source/ui/view/drviews4.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx6
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx4
-rw-r--r--sfx2/inc/srchdlg.hxx8
-rw-r--r--sfx2/source/appl/fileobj.cxx6
-rw-r--r--sfx2/source/appl/fileobj.hxx4
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx4
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/appl/impldde.hxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx6
-rw-r--r--sfx2/source/appl/newhelp.cxx12
-rw-r--r--sfx2/source/appl/newhelp.hxx30
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/control/itemdel.cxx2
-rw-r--r--sfx2/source/control/shell.cxx4
-rw-r--r--sfx2/source/control/templateabstractview.cxx4
-rw-r--r--sfx2/source/control/templatesearchview.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx4
-rw-r--r--sfx2/source/dialog/mgetempl.cxx4
-rw-r--r--sfx2/source/dialog/passwd.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx4
-rw-r--r--sfx2/source/doc/docinsert.cxx2
-rw-r--r--sfx2/source/doc/templatedlg.cxx16
-rw-r--r--sfx2/source/inc/templatesearchview.hxx4
-rw-r--r--sfx2/source/inc/templdgi.hxx8
-rw-r--r--sfx2/source/menu/mnuitem.cxx2
-rw-r--r--sfx2/source/sidebar/AsynchronousCall.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx12
-rw-r--r--sfx2/source/view/viewprn.cxx2
-rw-r--r--sot/source/sdstor/stg.cxx2
-rw-r--r--sot/source/sdstor/stgio.cxx6
-rw-r--r--sot/source/sdstor/stgio.hxx4
-rw-r--r--starmath/inc/dialog.hxx16
-rw-r--r--starmath/source/accessibility.cxx4
-rw-r--r--starmath/source/edit.cxx6
-rw-r--r--svl/source/misc/urihelper.cxx8
-rw-r--r--svl/source/numbers/zforlist.cxx2
-rw-r--r--svtools/inc/roadmap.hxx4
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx10
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/config/htmlcfg.cxx4
-rw-r--r--svtools/source/config/menuoptions.cxx20
-rw-r--r--svtools/source/config/miscopt.cxx18
-rw-r--r--svtools/source/contnr/fileview.cxx24
-rw-r--r--svtools/source/contnr/imivctl1.cxx8
-rw-r--r--svtools/source/contnr/treelistbox.cxx14
-rw-r--r--svtools/source/control/roadmap.cxx14
-rw-r--r--svtools/source/control/tabbar.cxx2
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx2
-rw-r--r--svtools/source/control/valueset.cxx2
-rw-r--r--svtools/source/dialogs/prnsetup.cxx2
-rw-r--r--svtools/source/graphic/grfcache.cxx2
-rw-r--r--svtools/source/graphic/grfmgr.cxx4
-rw-r--r--svtools/source/misc/cliplistener.cxx4
-rw-r--r--svtools/source/misc/dialogclosedlistener.cxx2
-rw-r--r--svtools/source/misc/transfer2.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx6
-rw-r--r--svtools/source/table/tabledatawindow.hxx6
-rw-r--r--svtools/source/uno/unoiface.cxx4
-rw-r--r--svx/inc/svdibrow.hxx12
-rw-r--r--svx/source/dialog/contwnd.hxx12
-rw-r--r--svx/source/dialog/ctredlin.cxx8
-rw-r--r--svx/source/dialog/dialcontrol.cxx6
-rw-r--r--svx/source/dialog/fontwork.cxx2
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/dialog/imapwnd.hxx6
-rw-r--r--svx/source/dialog/optgrid.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx8
-rw-r--r--svx/source/dialog/srchdlg.cxx4
-rw-r--r--svx/source/engine3d/float3d.cxx4
-rw-r--r--svx/source/fmcomp/gridcell.cxx12
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/form/fmexch.cxx2
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx4
-rw-r--r--svx/source/form/fmsrcimp.cxx4
-rw-r--r--svx/source/gallery2/galbrws2.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx2
-rw-r--r--svx/source/inc/delayedevent.hxx4
-rw-r--r--svx/source/inc/fmexch.hxx6
-rw-r--r--svx/source/inc/fmpgeimp.hxx6
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/inc/fmtextcontrolshell.hxx4
-rw-r--r--svx/source/inc/frmselimpl.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx6
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx4
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx2
-rw-r--r--svx/source/svdraw/sdrundomanager.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx12
-rw-r--r--svx/source/svdraw/svdetc.cxx16
-rw-r--r--svx/source/svdraw/svdobj.cxx8
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx12
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdoutlinercache.cxx4
-rw-r--r--svx/source/table/tablertfimporter.cxx2
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx2
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx4
-rw-r--r--svx/source/tbxctrls/itemwin.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/unodraw/unoshtxt.cxx2
-rw-r--r--svx/source/unogallery/unogaltheme.cxx2
-rw-r--r--svx/workben/msview/msview.cxx12
-rw-r--r--sw/inc/crsrsh.hxx18
-rw-r--r--sw/inc/doc.hxx8
-rw-r--r--sw/source/core/crsr/findattr.cxx4
-rw-r--r--sw/source/core/crsr/findcoll.cxx4
-rw-r--r--sw/source/core/crsr/findtxt.cxx4
-rw-r--r--sw/source/core/doc/DocumentDrawModelManager.cxx2
-rw-r--r--sw/source/core/doc/docbasic.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx4
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx8
-rw-r--r--sw/source/filter/basflt/shellio.cxx6
-rw-r--r--sw/source/filter/html/htmlcss1.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx4
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/htmlnumreader.cxx2
-rw-r--r--sw/source/filter/html/htmlsect.cxx4
-rw-r--r--sw/source/filter/html/htmltab.cxx2
-rw-r--r--sw/source/filter/html/svxcss1.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx4
-rw-r--r--sw/source/ui/config/optpage.cxx14
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx8
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx18
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx12
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx6
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx8
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx4
-rw-r--r--sw/source/ui/envelp/envfmt.cxx2
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/changedb.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx4
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx4
-rw-r--r--sw/source/ui/frmdlg/cption.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx24
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx6
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx2
-rw-r--r--sw/source/ui/misc/pggrid.cxx8
-rw-r--r--sw/source/ui/misc/srtdlg.cxx2
-rw-r--r--sw/source/ui/misc/titlepage.cxx2
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx10
-rw-r--r--sw/source/ui/table/tautofmt.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/app/docshini.cxx2
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx2
-rw-r--r--sw/source/uibase/dbui/dbui.cxx2
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx12
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx2
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx2
-rw-r--r--sw/source/uibase/inc/actctrl.hxx10
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx2
-rw-r--r--sw/source/uibase/inc/dbui.hxx2
-rw-r--r--sw/source/uibase/inc/docfnote.hxx2
-rw-r--r--sw/source/uibase/inc/hyp.hxx2
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx4
-rw-r--r--sw/source/uibase/inc/mailmergewizard.hxx2
-rw-r--r--sw/source/uibase/inc/popbox.hxx12
-rw-r--r--sw/source/uibase/inc/prcntfld.hxx8
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx4
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx8
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx2
-rw-r--r--sw/source/uibase/inc/unotools.hxx4
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx8
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx2
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.cxx2
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx2
-rw-r--r--sw/source/uibase/utlui/unotools.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh3.cxx2
-rw-r--r--toolkit/source/awt/scrollabledialog.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx4
-rw-r--r--unotools/source/config/syslocaleoptions.cxx8
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx4
-rw-r--r--uui/source/iahndl.cxx4
-rw-r--r--uui/source/nameclashdlg.cxx2
-rw-r--r--vcl/inc/idlemgr.hxx4
-rw-r--r--vcl/inc/ilstbox.hxx74
-rw-r--r--vcl/inc/impgraph.hxx4
-rw-r--r--vcl/inc/osx/a11yfocustracker.hxx2
-rw-r--r--vcl/inc/svdata.hxx4
-rw-r--r--vcl/inc/toolbox.h4
-rw-r--r--vcl/source/app/idlemgr.cxx6
-rw-r--r--vcl/source/app/svapp.cxx26
-rw-r--r--vcl/source/app/vclevent.cxx26
-rw-r--r--vcl/source/control/button.cxx2
-rw-r--r--vcl/source/control/ctrl.cxx2
-rw-r--r--vcl/source/control/ilstbox.cxx2
-rw-r--r--vcl/source/edit/textdata.cxx4
-rw-r--r--vcl/source/filter/graphicfilter.cxx4
-rw-r--r--vcl/source/gdi/animate.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx4
-rw-r--r--vcl/source/gdi/bitmap4.cxx18
-rw-r--r--vcl/source/gdi/bitmapex.cxx2
-rw-r--r--vcl/source/gdi/graph.cxx4
-rw-r--r--vcl/source/gdi/impgraph.cxx6
-rw-r--r--vcl/source/gdi/impvect.cxx4
-rw-r--r--vcl/source/gdi/impvect.hxx4
-rw-r--r--vcl/source/gdi/print3.cxx4
-rw-r--r--vcl/source/helper/evntpost.cxx2
-rw-r--r--vcl/source/window/dialog.cxx8
-rw-r--r--vcl/source/window/event.cxx12
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/menu.cxx8
-rw-r--r--vcl/source/window/menubarwindow.cxx4
-rw-r--r--vcl/source/window/menubarwindow.hxx8
-rw-r--r--vcl/source/window/menuwindow.hxx6
-rw-r--r--vcl/source/window/syswin.cxx6
-rw-r--r--vcl/source/window/toolbox2.cxx6
-rw-r--r--vcl/source/window/winproc.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx6
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx4
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx2
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx2
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.hxx8
679 files changed, 2382 insertions, 2330 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index d64254608271..30963bf4da73 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -86,7 +86,7 @@ private:
class WindowListenerGuard
{
public:
- inline WindowListenerGuard(::Link const & rListener):
+ inline WindowListenerGuard(::Link<> const & rListener):
m_aListener(rListener), m_pNotifier(0) {}
inline ~WindowListenerGuard() { endListening(); }
@@ -98,7 +98,7 @@ public:
void endListening();
private:
- ::Link m_aListener;
+ ::Link<> m_aListener;
VclPtr<vcl::Window> m_pNotifier;
};
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 43ad48511504..afc685b8ba60 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -30,9 +30,9 @@ class ExtendedEdit : public Edit
{
private:
Accelerator aAcc;
- Link aAccHdl;
- Link aGotFocusHdl;
- Link aLoseFocusHdl;
+ Link<> aAccHdl;
+ Link<> aGotFocusHdl;
+ Link<> aLoseFocusHdl;
protected:
DECL_LINK( EditAccHdl, Accelerator * );
@@ -42,9 +42,9 @@ protected:
public:
ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
- void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; }
- void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; }
- void SetGotFocusHdl( const Link& rLink ) { aGotFocusHdl = rLink; }
+ void SetAccHdl( const Link<>& rLink ) { aAccHdl = rLink; }
+ void SetLoseFocusHdl( const Link<>& rLink ) { aLoseFocusHdl = rLink; }
+ void SetGotFocusHdl( const Link<>& rLink ) { aGotFocusHdl = rLink; }
Accelerator& GetAccelerator() { return aAcc; }
};
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 278ac2f00f0d..8f9fd1717d41 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -62,9 +62,9 @@ BaseWindow::~BaseWindow()
void BaseWindow::dispose()
{
if ( pShellVScrollBar )
- pShellVScrollBar->SetScrollHdl( Link() );
+ pShellVScrollBar->SetScrollHdl( Link<>() );
if ( pShellHScrollBar )
- pShellHScrollBar->SetScrollHdl( Link() );
+ pShellHScrollBar->SetScrollHdl( Link<>() );
pShellVScrollBar.clear();
pShellHScrollBar.clear();
vcl::Window::dispose();
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 7afe56da3c3b..2f229c20e069 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -58,7 +58,7 @@ private:
DialogWindowLayout& rLayout;
boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
- Link aOldNotifyUndoActionHdl;
+ Link<> aOldNotifyUndoActionHdl;
OUString aCurPath;
protected:
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 8bb5992705dc..c866de077559 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -139,7 +139,7 @@ class MacroSnippet
void ResetError()
{
- StarBASIC::SetGlobalErrorHdl( Link() );
+ StarBASIC::SetGlobalErrorHdl( Link<>() );
mbError = false;
}
};
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c63c03eabef5..559cb3cb36f9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1838,17 +1838,17 @@ bool StarBASIC::ErrorHdl()
return aErrorHdl.IsSet() && aErrorHdl.Call( this );
}
-Link StarBASIC::GetGlobalErrorHdl()
+Link<> StarBASIC::GetGlobalErrorHdl()
{
return GetSbData()->aErrHdl;
}
-void StarBASIC::SetGlobalErrorHdl( const Link& rLink )
+void StarBASIC::SetGlobalErrorHdl( const Link<>& rLink )
{
GetSbData()->aErrHdl = rLink;
}
-void StarBASIC::SetGlobalBreakHdl( const Link& rLink )
+void StarBASIC::SetGlobalBreakHdl( const Link<>& rLink )
{
GetSbData()->aBreakHdl = rLink;
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0d4395c866ba..96b6fa4df2b2 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1725,7 +1725,7 @@ bool SbModule::ExceedsLegacyModuleSize()
class ErrorHdlResetter
{
- Link mErrHandler;
+ Link<> mErrHandler;
bool mbError;
public:
ErrorHdlResetter() : mbError( false )
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index e36873d1c20b..a82674ed5527 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -91,8 +91,8 @@ struct SbiGlobals
SbModule* pMod; // currently active module
SbModule* pCompMod; // currently compiled module
short nInst; // number of BASICs
- Link aErrHdl; // global error handler
- Link aBreakHdl; // global break handler
+ Link<> aErrHdl; // global error handler
+ Link<> aBreakHdl; // global break handler
SbError nCode;
sal_Int32 nLine;
sal_Int32 nCol1,nCol2; // from... to...
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 7c7b8f30deec..1d2eebca3d5f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -171,9 +171,9 @@ public:
*/
void applyChanges();
- void SetGetFocusHdl( const Link& rLink );
+ void SetGetFocusHdl( const Link<>& rLink );
- void SetEditChangedHdl( const Link & rLink );
+ void SetEditChangedHdl( const Link<> & rLink );
bool HasFocus() const;
@@ -182,7 +182,7 @@ private:
VclPtr< SeriesHeaderEdit > m_spSeriesName;
VclPtr< FixedText > m_spColorBar;
VclPtr< OutputDevice> m_pDevice;
- Link m_aChangeLink;
+ Link<> m_aChangeLink;
void notifyChanges();
DECL_LINK( SeriesNameChanged, void * );
@@ -316,7 +316,7 @@ void SeriesHeader::Hide()
m_spColorBar->Hide();
}
-void SeriesHeader::SetEditChangedHdl( const Link & rLink )
+void SeriesHeader::SetEditChangedHdl( const Link<> & rLink )
{
m_aChangeLink = rLink;
}
@@ -333,7 +333,7 @@ IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited)
return 0;
}
-void SeriesHeader::SetGetFocusHdl( const Link& rLink )
+void SeriesHeader::SetGetFocusHdl( const Link<>& rLink )
{
m_spSeriesName->SetGetFocusHdl( rLink );
}
@@ -585,8 +585,8 @@ void DataBrowser::RenewTable()
// fill series headers
clearHeaders();
const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders());
- Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
- Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
+ Link<> aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
+ Link<> aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
@@ -745,7 +745,7 @@ void DataBrowser::CursorMoved()
m_aCursorMovedHdlLink.Call( this );
}
-void DataBrowser::SetCellModifiedHdl( const Link& rLink )
+void DataBrowser::SetCellModifiedHdl( const Link<>& rLink )
{
m_aCellModifiedLink = rLink;
}
@@ -965,7 +965,7 @@ void DataBrowser::SwapRow()
}
}
-void DataBrowser::SetCursorMovedHdl( const Link& rLink )
+void DataBrowser::SetCursorMovedHdl( const Link<>& rLink )
{
m_aCursorMovedHdlLink = rLink;
}
@@ -1223,8 +1223,8 @@ void DataBrowser::RenewSeriesHeaders()
clearHeaders();
DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
- Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
- Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
+ Link<> aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
+ Link<> aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 8a721c428067..948fa30dd949 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -127,9 +127,9 @@ public:
void SwapRow();
void SwapColumn();
- void SetCursorMovedHdl( const Link& rLink );
+ void SetCursorMovedHdl( const Link<>& rLink );
- void SetCellModifiedHdl( const Link& rLink );
+ void SetCellModifiedHdl( const Link<>& rLink );
/// confirms all pending changes to be ready to be closed
bool EndEditing();
@@ -173,8 +173,8 @@ private:
/// note: m_aTextEditField must precede this member!
::svt::CellControllerRef m_rTextEditController;
- Link m_aCursorMovedHdlLink;
- Link m_aCellModifiedLink;
+ Link<> m_aCursorMovedHdlLink;
+ Link<> m_aCellModifiedLink;
void clearHeaders();
void RenewTable();
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 725b2cc5d82b..dd3db5ea65c6 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -28,7 +28,7 @@ BarGeometryResources::BarGeometryResources(VclBuilderContainer* pWindow)
pWindow->get(m_pLB_Geometry, "shape");
}
-void BarGeometryResources::SetSelectHdl( const Link& rLink )
+void BarGeometryResources::SetSelectHdl( const Link<>& rLink )
{
m_pLB_Geometry->SetSelectHdl( rLink );
}
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index 7a9eeb8c17f8..a14cf4a59fa7 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -38,7 +38,7 @@ public:
sal_Int32 GetSelectEntryPos() const;
void SelectEntryPos(sal_Int32 nPos);
- void SetSelectHdl( const Link& rLink );
+ void SetSelectHdl( const Link<>& rLink );
private:
VclPtr<FixedText> m_pFT_Geometry;
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index fe05befe5fa1..ce21c1c31c88 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -237,7 +237,7 @@ IMPL_LINK( LegendPositionResources, PositionChangeHdl, RadioButton*, pRadio )
return 0;
}
-void LegendPositionResources::SetChangeHdl( const Link& rLink )
+void LegendPositionResources::SetChangeHdl( const Link<>& rLink )
{
m_aChangeLink = rLink;
}
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index a00cae54bd7b..5186acf1ddcd 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -54,7 +54,7 @@ TitleResources::~TitleResources()
{
}
-void TitleResources::SetUpdateDataHdl( const Link& rLink )
+void TitleResources::SetUpdateDataHdl( const Link<>& rLink )
{
sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 74ea1b2656c1..acc8d0872502 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -69,7 +69,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
pTabPage->get(m_pFI_MovingAverage,"imageMovingAverage");
FillValueSets();
- Link aLink = LINK(this, TrendlineResources, SelectTrendLine );
+ Link<> aLink = LINK(this, TrendlineResources, SelectTrendLine );
m_pRB_Linear->SetClickHdl( aLink );
m_pRB_Logarithmic->SetClickHdl( aLink );
m_pRB_Exponential->SetClickHdl( aLink );
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index e3988f975ebf..7c76e18a6e12 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -100,8 +100,8 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
m_pMFZRotation->SetValue(m_nZRotation);
const sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
- Link aAngleChangedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleChanged ));
- Link aAngleEditedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleEdited ));
+ Link<> aAngleChangedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleChanged ));
+ Link<> aAngleEditedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleEdited ));
m_pMFXRotation->EnableUpdateData( nTimeout );
m_pMFXRotation->SetUpdateDataHdl( aAngleChangedLink );
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 8ad9fc95525d..0119c3d033c6 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -122,7 +122,7 @@ private:
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE;
- Link m_aOriginalOKClickHdl;
+ Link<> m_aOriginalOKClickHdl;
DECL_LINK( OKPressed, void * );
public:
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index 7801895a6308..b9f6dfec702b 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -48,7 +48,7 @@ public:
void initFromItemSet( const SfxItemSet& rInAttrs );
void writeToItemSet( SfxItemSet& rOutAttrs ) const;
- void SetChangeHdl( const Link& rLink );
+ void SetChangeHdl( const Link<>& rLink );
DECL_LINK( PositionEnableHdl, void* );
DECL_LINK( PositionChangeHdl, RadioButton* );
@@ -67,7 +67,7 @@ private:
VclPtr<RadioButton> m_pRbtTop;
VclPtr<RadioButton> m_pRbtBottom;
- Link m_aChangeLink;
+ Link<> m_aChangeLink;
};
} //namespace chart
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index 396c87af598f..05e22efd4e35 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -35,7 +35,7 @@ public:
void writeToResources( const TitleDialogData& rInput );
void readFromResources( TitleDialogData& rOutput );
- void SetUpdateDataHdl( const Link& rLink );
+ void SetUpdateDataHdl( const Link<>& rLink );
bool IsModified();
void ClearModifyFlag();
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index e992d7d11db0..8f5b6c54afbe 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -36,7 +36,7 @@ class ModifyListenerCallBack_impl;
class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack
{
public:
- explicit ModifyListenerCallBack( const Link& rCallBack );
+ explicit ModifyListenerCallBack( const Link<>& rCallBack );
virtual ~ModifyListenerCallBack();
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
index fe5e0c73c6ae..240eb3e168bc 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -35,7 +35,7 @@ class ModifyListenerCallBack_impl
, public ModifyListenerCallBack_Base
{
public:
- explicit ModifyListenerCallBack_impl( const Link& rCallBack );
+ explicit ModifyListenerCallBack_impl( const Link<>& rCallBack );
virtual ~ModifyListenerCallBack_impl();
void stopListening();
@@ -49,11 +49,11 @@ public:
using ::cppu::WeakComponentImplHelperBase::disposing;
private:
- Link m_aLink;//will be callef on modify
+ Link<> m_aLink;//will be callef on modify
Reference< util::XModifyBroadcaster > m_xBroadcaster;//broadcaster to listen at
};
-ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link& rCallBack )
+ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link<>& rCallBack )
: ModifyListenerCallBack_Base( m_aMutex )
, m_aLink( rCallBack )
, m_xBroadcaster(0)
@@ -85,7 +85,7 @@ void ModifyListenerCallBack_impl::stopListening()
}
}
-ModifyListenerCallBack::ModifyListenerCallBack( const Link& rCallBack )
+ModifyListenerCallBack::ModifyListenerCallBack( const Link<>& rCallBack )
: pModifyListener_impl( new ModifyListenerCallBack_impl(rCallBack) )
, m_xModifyListener( pModifyListener_impl )
{
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 40360a67a398..9fbd9516a908 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1094,7 +1094,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;
}
@@ -1109,7 +1109,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
(pEntry->m_sCommand).clear();
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;
}
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
if ( pEntry )
m_pGroupLBox->Select( pEntry );
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 1L;
}
@@ -1438,7 +1438,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") );
m_pFileDlg->SetCurrentFilter( aFilterCfgStr );
- Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
+ Link<> aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
: LINK( this, SfxAcceleratorConfigPage, LoadHdl );
m_pFileDlg->StartExecuteModal( aDlgClosedLink );
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 9ca5201839d4..cd7e84d75ecf 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -723,7 +723,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
m_xModifiable = xModifiable;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link<> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
if( mpImpl->pAssignComponentPB )
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index dc55f899db19..9f3e149545a4 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -90,7 +90,7 @@ namespace svx{
class SpellUndoAction_Impl : public SfxUndoAction
{
sal_uInt16 m_nId;
- const Link& m_rActionLink;
+ const Link<>& m_rActionLink;
//undo of button enabling
bool m_bEnableChangePB;
bool m_bEnableChangeAllPB;
@@ -107,7 +107,7 @@ class SpellUndoAction_Impl : public SfxUndoAction
long m_nOffset;
public:
- SpellUndoAction_Impl(sal_uInt16 nId, const Link& rActionLink) :
+ SpellUndoAction_Impl(sal_uInt16 nId, const Link<>& rActionLink) :
m_nId(nId),
m_rActionLink( rActionLink),
m_bEnableChangePB(false),
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 23ec6c06cceb..bad1390a024f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -331,10 +331,10 @@ public:
void KeyMove( int dx, int dy );
- void SetModifyHdl( Link& rLink ) { maModifyHdl = rLink; }
+ void SetModifyHdl( Link<>& rLink ) { maModifyHdl = rLink; }
private:
- Link maModifyHdl;
+ Link<> maModifyHdl;
ColorMode meMode;
Color maColor;
double mdX;
@@ -728,12 +728,12 @@ public:
void KeyMove( int dy );
- void SetModifyHdl( Link& rLink ) { maModifyHdl = rLink; }
+ void SetModifyHdl( Link<>& rLink ) { maModifyHdl = rLink; }
sal_Int16 GetLevel() const { return mnLevel; }
private:
- Link maModifyHdl;
+ Link<> maModifyHdl;
Color maColor;
ColorMode meMode;
Bitmap* mpBitmap;
@@ -1059,7 +1059,7 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa
set_width_request(aDialogSize.Width() + 50);
set_height_request(aDialogSize.Height() + 30);
- Link aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
+ Link<> aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
mpColorField->SetModifyHdl( aLink );
mpColorSlider->SetModifyHdl( aLink );
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 0e11f72b8ccd..f7a063979589 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -75,7 +75,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
}
FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
- const Link& lnkContextSupplier)
+ const Link<>& lnkContextSupplier)
:ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
,m_pPreSearchFocus( NULL )
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 549d21054447..a4e9ea50b114 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -269,7 +269,7 @@ short SearchProgress::Execute()
-void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
+void SearchProgress::StartExecuteModal( const Link<>& rEndDialogHdl )
{
assert(!maSearchThread.is());
maSearchThread = new SearchThread(
@@ -447,7 +447,7 @@ short TakeProgress::Execute()
-void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
+void TakeProgress::StartExecuteModal( const Link<>& rEndDialogHdl )
{
assert(!maTakeThread.is());
maTakeThread = new TakeThread(
@@ -1100,7 +1100,7 @@ void TPGalleryThemeProperties::TakeFiles()
pTakeProgress->Update();
pTakeProgress->StartExecuteModal(
- Link() /* no postprocessing needed, pTakeProgress
+ Link<>() /* no postprocessing needed, pTakeProgress
will be disposed in TakeProgress::CleanupHdl */ );
}
}
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cf039ed1a678..8e55edafedc5 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -496,7 +496,7 @@ namespace svx
return 0L;
}
- void SuggestionDisplay::SetSelectHdl( const Link& rLink )
+ void SuggestionDisplay::SetSelectHdl( const Link<>& rLink )
{
m_aSelectLink = rLink;
}
@@ -656,43 +656,43 @@ namespace svx
}
- void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link<>& _rHdl )
{
m_aOptionsChangedLink = _rHdl;
}
- void HangulHanjaConversionDialog::SetIgnoreHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<>& _rHdl )
{
m_pIgnore->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<>& _rHdl )
{
m_pIgnoreAll->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetChangeHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetChangeHdl( const Link<>& _rHdl )
{
m_pReplace->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetChangeAllHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<>& _rHdl )
{
m_pReplaceAll->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetFindHdl( const Link<>& _rHdl )
{
m_pFind->SetClickHdl( _rHdl );
}
- void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<>& _rHdl )
{
m_pSimpleConversion->SetClickHdl( _rHdl );
m_pHangulBracketed->SetClickHdl( _rHdl );
@@ -704,7 +704,7 @@ namespace svx
}
- void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link& _rHdl )
+ void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<>& _rHdl )
{
m_aClickByCharacterLink = _rHdl;
}
@@ -1408,7 +1408,7 @@ namespace svx
void SuggestionEdit::DoJump( bool _bUp )
{
- const Link& rLoseFocusHdl = GetLoseFocusHdl();
+ const Link<>& rLoseFocusHdl = GetLoseFocusHdl();
if( rLoseFocusHdl.IsSet() )
rLoseFocusHdl.Call( this );
m_pScrollBar->SetThumbPos( m_pScrollBar->GetThumbPos() + ( _bUp? -1 : 1 ) );
@@ -1815,7 +1815,7 @@ namespace svx
#error number of suggestions should not under-run the value of 5
#endif
- Link aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
+ Link<> aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
m_aScrollSB->SetScrollHdl( aScrLk );
m_aScrollSB->SetEndScrollHdl( aScrLk );
m_aScrollSB->SetRangeMin( 0 );
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index e6cb7c0a4b31..860fa291d06c 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
// set handlers
- Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
+ Link<> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
m_pRbtLinktypInternet->SetClickHdl( aLink );
m_pRbtLinktypFTP->SetClickHdl ( aLink );
m_pCbAnonymous->SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b256fa40a468..00ca41532978 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -181,7 +181,7 @@ SvInsertOleDlg::SvInsertOleDlg
get(m_pCbFilelink, "linktofile");
m_pLbObjecttype->SetDoubleClickHdl( LINK( this, SvInsertOleDlg, DoubleClickHdl ) );
m_pBtnFilepath->SetClickHdl( LINK( this, SvInsertOleDlg, BrowseHdl ) );
- Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
+ Link<> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
m_pRbNewObject->SetClickHdl( aLink );
m_pRbObjectFromfile->SetClickHdl( aLink );
m_pRbNewObject->Check( true );
@@ -553,7 +553,7 @@ void SfxInsertFloatingFrameDialog::Init()
get(m_pNMMarginHeight, "height");
get(m_pCBMarginHeightDefault, "defaultheight");
- Link aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+ Link<> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
m_pCBMarginWidthDefault->SetClickHdl( aLink );
m_pCBMarginHeightDefault->SetClickHdl( aLink );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 98a97d0e8656..a1fead79e130 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -510,7 +510,7 @@ SvxScriptOrgDialog::~SvxScriptOrgDialog()
void SvxScriptOrgDialog::dispose()
{
// clear the SelectHdl so that it isn't called during the dtor
- m_pScriptsBox->SetSelectHdl( Link() );
+ m_pScriptsBox->SetSelectHdl( Link<>() );
m_pScriptsBox.clear();
m_pRunButton.clear();
m_pCloseButton.clear();
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 2465369cbc9b..85dc0d2881ec 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -151,22 +151,22 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
get(m_pColumnsEdit, "columnssb");
get(m_pBookModeChk, "bookmode");
get(m_pOKBtn, "ok");
- Link aLink = LINK(this, SvxZoomDialog, UserHdl);
+ Link<> aLink = LINK(this, SvxZoomDialog, UserHdl);
m_p100Btn->SetClickHdl(aLink);
m_pOptimalBtn->SetClickHdl(aLink);
m_pPageWidthBtn->SetClickHdl(aLink);
m_pWholePageBtn->SetClickHdl(aLink);
m_pUserBtn->SetClickHdl(aLink);
- Link aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
+ Link<> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
m_pAutomaticBtn->SetClickHdl(aViewLayoutLink);
m_pSingleBtn->SetClickHdl(aViewLayoutLink);
m_pColumnsBtn->SetClickHdl(aViewLayoutLink);
- Link aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
+ Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink);
- Link aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
+ Link<> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
m_pBookModeChk->SetClickHdl(aViewLayoutCheckLink);
m_pOKBtn->SetClickHdl(LINK(this, SvxZoomDialog, OKHdl));
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9b682d5d4ac3..c6079c396994 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -159,7 +159,7 @@ VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl()
}
// virtual
-void VclAbstractDialog2_Impl::StartExecuteModal( const Link& rEndDialogHdl )
+void VclAbstractDialog2_Impl::StartExecuteModal( const Link<>& rEndDialogHdl )
{
m_aEndDlgHdl = rEndDialogHdl;
m_pDlg->StartExecuteModal(
@@ -180,7 +180,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg )
}
m_aEndDlgHdl.Call( this );
- m_aEndDlgHdl = Link();
+ m_aEndDlgHdl = Link<>();
return 0L;
}
@@ -271,41 +271,41 @@ void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( editeng::Han
pDlg->SetConversionFormat(_eType);
}
-void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link<>& _rHdl )
{
pDlg->SetOptionsChangedHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<>& _rHdl )
{
pDlg->SetIgnoreHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<>& _rHdl )
{
pDlg->SetIgnoreAllHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<>& _rHdl )
{
pDlg->SetChangeHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<>& _rHdl )
{
pDlg->SetChangeAllHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<>& _rHdl )
{
pDlg->SetClickByCharacterHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<>& _rHdl )
{
pDlg->SetConversionFormatChangedHdl(_rHdl );
}
-void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<>& _rHdl )
{
pDlg->SetFindHdl(_rHdl );
}
@@ -647,7 +647,7 @@ OUString AbstractSvxTransformTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rLink )
+void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
@@ -686,7 +686,7 @@ OUString AbstractSvxCaptionDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
+void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
@@ -717,13 +717,13 @@ void AbstractSvxNameDialog_Impl::GetName(OUString& rName)
pDlg->GetName( rName );
}
-void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheckImmediately )
+void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately )
{
aCheckNameHdl = rLink;
if( rLink.IsSet() )
pDlg->SetCheckNameHdl( LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl), bCheckImmediately );
else
- pDlg->SetCheckNameHdl( Link(), bCheckImmediately );
+ pDlg->SetCheckNameHdl( Link<>(), bCheckImmediately );
}
void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId)
{
@@ -749,7 +749,7 @@ void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
pDlg->GetName(rName);
}
-void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool bCheckImmediately)
+void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately)
{
aCheckNameHdl = rLink;
@@ -759,7 +759,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool b
}
else
{
- pDlg->SetCheckNameHdl(Link(), bCheckImmediately);
+ pDlg->SetCheckNameHdl(Link<>(), bCheckImmediately);
}
}
@@ -829,11 +829,11 @@ bool AbstractSvxHpLinkDlg_Impl::QueryClose()
}
-void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk)
+void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link<>& lnk)
{
pDlg->SetFoundHandler(lnk);
}
-void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link& lnk)
+void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link<>& lnk)
{
pDlg->SetCanceledNotFoundHdl(lnk);
}
@@ -922,21 +922,21 @@ bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
{
return pDlg->IsOkEnabled();
}
-void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link& rLink )
+void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink )
{
aNextHdl = rLink;
if( rLink.IsSet() )
pDlg->SetNextHdl( LINK(this, AbstractSvxPostItDialog_Impl, NextHdl ) );
else
- pDlg->SetNextHdl( Link() );
+ pDlg->SetNextHdl( Link<>() );
}
-void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link& rLink )
+void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink )
{
aPrevHdl = rLink;
if( rLink.IsSet() )
pDlg->SetPrevHdl( LINK(this, AbstractSvxPostItDialog_Impl, PrevHdl ) );
else
- pDlg->SetPrevHdl( Link() );
+ pDlg->SetPrevHdl( Link<>() );
}
IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl)
{
@@ -1452,7 +1452,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
- const Link& lnkContextSupplier)
+ const Link<>& lnkContextSupplier)
{
VclPtrInstance<FmSearchDialog> pDlg( pParent, strInitialText, _rContexts,
nInitialContext, lnkContextSupplier );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 69ecf5fb7e0c..4a4dbcd1cc10 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -83,11 +83,11 @@ short Class::Execute() \
class VclAbstractDialog2_Impl : public VclAbstractDialog2
{
ScopedVclPtr<Dialog> m_pDlg;
- Link m_aEndDlgHdl;
+ Link<> m_aEndDlgHdl;
public:
VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {}
virtual ~VclAbstractDialog2_Impl();
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
virtual long GetResult() SAL_OVERRIDE;
private:
DECL_LINK( EndDialogHdl, Dialog* );
@@ -145,14 +145,14 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver
virtual void SetByCharacter( bool _bByCharacter ) SAL_OVERRIDE ;
virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE;
virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE;
- virtual void SetOptionsChangedHdl( const Link& _rHdl ) SAL_OVERRIDE;
- virtual void SetIgnoreHdl( const Link& _rHdl ) SAL_OVERRIDE;
- virtual void SetIgnoreAllHdl( const Link& _rHdl ) SAL_OVERRIDE ;
- virtual void SetChangeHdl( const Link& _rHdl ) SAL_OVERRIDE ;
- virtual void SetChangeAllHdl( const Link& _rHdl ) SAL_OVERRIDE ;
- virtual void SetClickByCharacterHdl( const Link& _rHdl ) SAL_OVERRIDE ;
- virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) SAL_OVERRIDE ;
- virtual void SetFindHdl( const Link& _rHdl ) SAL_OVERRIDE;
+ virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
+ virtual void SetIgnoreHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
+ virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetChangeHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetChangeAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+ virtual void SetFindHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
virtual bool GetUseBothDirections( ) const SAL_OVERRIDE;
virtual editeng::HangulHanjaConversion::ConversionDirection
GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE;
@@ -311,7 +311,7 @@ class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDial
class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
- virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE;
+ virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
@@ -324,7 +324,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
- virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE;
+ virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
@@ -354,13 +354,13 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
{
DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
virtual void GetName( OUString& rName ) SAL_OVERRIDE ;
- virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ;
+ virtual void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ;
virtual void SetEditHelpId(const OString&) SAL_OVERRIDE ;
//from class Window
virtual void SetHelpId( const OString& ) SAL_OVERRIDE ;
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ;
private:
- Link aCheckNameHdl;
+ Link<> aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *);
};
@@ -371,10 +371,10 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
{
DECL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl, SvxObjectNameDialog)
virtual void GetName(OUString& rName) SAL_OVERRIDE ;
- virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) SAL_OVERRIDE;
+ virtual void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) SAL_OVERRIDE;
private:
- Link aCheckNameHdl;
+ Link<> aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *);
};
@@ -422,8 +422,8 @@ class FmSearchDialog;
class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
{
DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog)
- virtual void SetFoundHandler(const Link& lnk) SAL_OVERRIDE ;
- virtual void SetCanceledNotFoundHdl(const Link& lnk) SAL_OVERRIDE;
+ virtual void SetFoundHandler(const Link<>& lnk) SAL_OVERRIDE ;
+ virtual void SetCanceledNotFoundHdl(const Link<>& lnk) SAL_OVERRIDE;
virtual void SetActiveField(const OUString& strField) SAL_OVERRIDE;
};
@@ -478,8 +478,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; //From class Window
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
- virtual void SetPrevHdl( const Link& rLink ) SAL_OVERRIDE ;
- virtual void SetNextHdl( const Link& rLink ) SAL_OVERRIDE ;
+ virtual void SetPrevHdl( const Link<>& rLink ) SAL_OVERRIDE ;
+ virtual void SetNextHdl( const Link<>& rLink ) SAL_OVERRIDE ;
virtual void EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ;
virtual OUString GetNote() SAL_OVERRIDE ;
virtual void SetNote(const OUString& rTxt) SAL_OVERRIDE ;
@@ -490,8 +490,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
virtual bool IsOkEnabled() const SAL_OVERRIDE;
virtual vcl::Window * GetWindow() SAL_OVERRIDE;
private:
- Link aNextHdl;
- Link aPrevHdl;
+ Link<> aNextHdl;
+ Link<> aPrevHdl;
DECL_LINK(NextHdl, void *);
DECL_LINK(PrevHdl, void *);
};
@@ -646,7 +646,7 @@ public:
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
- const Link& lnkContextSupplier) SAL_OVERRIDE;
+ const Link<>& lnkContextSupplier) SAL_OVERRIDE;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent,
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 411df36dd123..6f8b3161cd26 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -66,7 +66,7 @@ private:
sal_uInt16 m_nErrorEnd;
bool m_bIsUndoEditMode;
- Link m_aModifyLink;
+ Link<> m_aModifyLink;
void CallModifyLink() {m_aModifyLink.Call(this);}
@@ -77,7 +77,7 @@ protected:
public:
SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits);
- void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;}
+ void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;}
void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
void SetText( const OUString& rStr ) SAL_OVERRIDE;
@@ -159,7 +159,7 @@ private:
OUString m_sTitleSpelling;
OUString m_sTitleSpellingGrammar;
- Link aDialogUndoLink;
+ Link<> aDialogUndoLink;
bool bModified;
bool bFocusLocked;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d56700e45e7a..fa2224a45802 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -181,7 +181,7 @@ public:
class AutoCorrEdit : public Edit
{
- Link aActionLink;
+ Link<> aActionLink;
bool bSpaces;
public:
@@ -190,7 +190,7 @@ class AutoCorrEdit : public Edit
AutoCorrEdit(vcl::Window* pParent) :
Edit(pParent), bSpaces(false){}
- void SetActionHdl( const Link& rLink )
+ void SetActionHdl( const Link<>& rLink )
{ aActionLink = rLink;}
void SetSpaces(bool bSet)
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 759b1406d3e6..3038b4b80d57 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -531,7 +531,7 @@ public:
class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
{
Size m_aCheckBoxImageSizePixel;
- Link m_aChangedListener;
+ Link<> m_aChangedListener;
SvLBoxButtonData* m_pButtonData;
VclPtr<SvxConfigPage> pPage;
@@ -551,10 +551,10 @@ public:
virtual ~SvxToolbarEntriesListBox();
virtual void dispose() SAL_OVERRIDE;
- void SetChangedListener( const Link& aChangedListener )
+ void SetChangedListener( const Link<>& aChangedListener )
{ m_aChangedListener = aChangedListener; }
- const Link& GetChangedListener() const { return m_aChangedListener; }
+ const Link<>& GetChangedListener() const { return m_aChangedListener; }
Size GetCheckBoxPixelSize() const
{ return m_aCheckBoxImageSizePixel; }
@@ -672,7 +672,7 @@ private:
VclPtr<Edit> m_pEdtName;
VclPtr<OKButton> m_pBtnOK;
- Link aCheckNameHdl;
+ Link<> aCheckNameHdl;
DECL_LINK(ModifyHdl, Edit*);
@@ -688,7 +688,7 @@ public:
return m_pEdtName->GetText();
}
- void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
+ void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false )
{
aCheckNameHdl = rLink;
if ( bCheckImmediately )
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index d56c9d5ee2a4..f0717aa758e2 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -78,10 +78,10 @@ class FmSearchDialog : public ModalDialog
VclPtr<vcl::Window> m_pPreSearchFocus;
- Link m_lnkFoundHandler; ///< Handler for "found"
- Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors
+ Link<> m_lnkFoundHandler; ///< Handler for "found"
+ Link<> m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors
- Link m_lnkContextSupplier; ///< for search in contexts
+ Link<> m_lnkContextSupplier; ///< for search in contexts
/// memorize the currently selected field for every context
::std::vector<OUString> m_arrContextFields;
@@ -108,7 +108,7 @@ public:
arrFields of the context)
*/
FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
- const Link& lnkContextSupplier);
+ const Link<>& lnkContextSupplier);
virtual ~FmSearchDialog();
virtual void dispose() SAL_OVERRIDE;
@@ -119,7 +119,7 @@ public:
This handler MUST be set.
Furthermore, it should be considered, that during the handler the search-dialog is still modal.
*/
- void SetFoundHandler(const Link& lnk) { m_lnkFoundHandler = lnk; }
+ void SetFoundHandler(const Link<>& lnk) { m_lnkFoundHandler = lnk; }
/**
If the search has been cancelled or has been finished without success, the current data set is always displayed in the
search dialog. This handler exists to make this synchronous with the possible display of the caller (it does not
@@ -127,7 +127,7 @@ public:
The pointer that is passed to the handler points to a FmFoundRecordInformation-structure, for which aPosition and
possibly (in a search with contexts) nContext are valid.
*/
- void SetCanceledNotFoundHdl(const Link& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
+ void SetCanceledNotFoundHdl(const Link<>& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
inline void SetActiveField(const OUString& strField);
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index a1855b1a1fdd..e58997fb5d93 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -99,7 +99,7 @@ public:
DECL_LINK( CleanUpHdl, void* );
virtual short Execute() SAL_OVERRIDE;
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
void SetFileType( const OUString& rType ) { m_pFtSearchType->SetText( rType ); }
void SetDirectory( const INetURLObject& rURL ) { m_pFtSearchDir->SetText( GetReducedString( rURL, 30 ) ); }
};
@@ -146,7 +146,7 @@ public:
void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); }
virtual short Execute() SAL_OVERRIDE;
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
};
class ActualizeProgress : public ModalDialog
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 888060e2ecf3..0f2048862526 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -36,7 +36,7 @@ class GraphicPreviewWindow : public Control
{
private:
const Graphic* mpOrigGraphic;
- Link maModifyHdl;
+ Link<> maModifyHdl;
Graphic maScaledOrig;
Graphic maPreview;
double mfScaleX;
@@ -51,7 +51,7 @@ private:
public:
GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle);
- void init(const Graphic* pOrigGraphic, const Link& rLink)
+ void init(const Graphic* pOrigGraphic, const Link<>& rLink)
{
mpOrigGraphic = pOrigGraphic;
maModifyHdl = rLink;
@@ -69,7 +69,7 @@ class GraphicFilterDialog : public ModalDialog
private:
Timer maTimer;
- Link maModifyHdl;
+ Link<> maModifyHdl;
Size maSizePixel;
bool bIsBitmap;
@@ -79,7 +79,7 @@ private:
protected:
VclPtr<GraphicPreviewWindow> mpPreview;
- const Link& GetModifyHdl() const { return maModifyHdl; }
+ const Link<>& GetModifyHdl() const { return maModifyHdl; }
const Size& GetGraphicSizePixel() const { return maSizePixel; }
public:
@@ -202,14 +202,14 @@ public:
class EmbossControl : public SvxRectCtl
{
private:
- Link maModifyHdl;
+ Link<> maModifyHdl;
virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
public:
EmbossControl(vcl::Window* pParent)
: SvxRectCtl(pParent) {}
- void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
+ void SetModifyHdl( const Link<>& rHdl ) { maModifyHdl = rHdl; }
};
class GraphicFilterEmboss : public GraphicFilterDialog
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 8615477f6618..644b441db613 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -34,7 +34,7 @@ private:
VclPtr<Edit> pEdtName;
VclPtr<OKButton> pBtnOK;
- Link aCheckNameHdl;
+ Link<> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *);
@@ -60,7 +60,7 @@ public:
@todo Remove the parameter bCheckImmediately and incorporate the 'true'
behaviour as default.
*/
- void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
+ void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false )
{
aCheckNameHdl = rLink;
if ( bCheckImmediately )
@@ -83,7 +83,7 @@ private:
VclPtr<OKButton> pBtnOK;
// callback link for name uniqueness
- Link aCheckNameHdl;
+ Link<> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *);
@@ -97,7 +97,7 @@ public:
void GetName(OUString& rName) {rName = pEdtName->GetText(); }
// set handler
- void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false)
+ void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false)
{
aCheckNameHdl = rLink;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 2aa203c85319..3e7f38339cc9 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -58,7 +58,7 @@ namespace svx
void DisplayListBox( bool bDisplayListBox );
- void SetSelectHdl( const Link& rLink );
+ void SetSelectHdl( const Link<>& rLink );
void Clear();
void InsertEntry( const OUString& rStr );
@@ -92,7 +92,7 @@ namespace svx
VclPtr<SuggestionSet> m_aValueSet;
VclPtr<ListBox> m_aListBox;
- Link m_aSelectLink;
+ Link<> m_aSelectLink;
bool m_bInSelectionUpdate;
};
@@ -131,8 +131,8 @@ namespace svx
the document anymore. Some functionality must be disabled then */
bool m_bDocumentMode;
- Link m_aOptionsChangedLink;
- Link m_aClickByCharacterLink;
+ Link<> m_aOptionsChangedLink;
+ Link<> m_aClickByCharacterLink;
public:
HangulHanjaConversionDialog(
@@ -142,15 +142,15 @@ namespace svx
virtual void dispose() SAL_OVERRIDE;
public:
- void SetOptionsChangedHdl( const Link& _rHdl );
- void SetIgnoreHdl( const Link& _rHdl );
- void SetIgnoreAllHdl( const Link& _rHdl );
- void SetChangeHdl( const Link& _rHdl );
- void SetChangeAllHdl( const Link& _rHdl );
-
- void SetClickByCharacterHdl( const Link& _rHdl );
- void SetConversionFormatChangedHdl( const Link& _rHdl );
- void SetFindHdl( const Link& _rHdl );
+ void SetOptionsChangedHdl( const Link<>& _rHdl );
+ void SetIgnoreHdl( const Link<>& _rHdl );
+ void SetIgnoreAllHdl( const Link<>& _rHdl );
+ void SetChangeHdl( const Link<>& _rHdl );
+ void SetChangeAllHdl( const Link<>& _rHdl );
+
+ void SetClickByCharacterHdl( const Link<>& _rHdl );
+ void SetConversionFormatChangedHdl( const Link<>& _rHdl );
+ void SetFindHdl( const Link<>& _rHdl );
OUString GetCurrentString( ) const;
void SetCurrentString(
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 610c63b2f2f9..7995287a00ec 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -102,7 +102,7 @@ private:
sal_uInt16 m_nPositionSizePageId;
sal_uInt16 m_nCaptionPageId;
- Link aValidateLink;
+ Link<> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -111,7 +111,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
/// link for the Writer to validate positions
- void SetValidateFramePosLink( const Link& rLink );
+ void SetValidateFramePosLink( const Link<>& rLink );
};
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 78ce3f200d41..dae84fea1d13 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -85,7 +85,7 @@ public:
void SetNumberFormatList( const SvxNumberInfoItem& rItem )
{ SetInfoItem( rItem ); }
- void SetOkHdl( const Link& rOkHandler );
+ void SetOkHdl( const Link<>& rOkHandler );
void HideLanguage(bool nFlag=true);
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -123,7 +123,7 @@ private:
SvxNumberInfoItem* pNumItem;
SvxNumberFormatShell* pNumFmtShell;
sal_uLong nInitFormat;
- Link fnOkHdl;
+ Link<> fnOkHdl;
bool bNumItemFlag; ///< for handling with DocShell
bool bOneAreaFlag;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 3bdffc3f0edd..398a1998ac81 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -78,7 +78,7 @@ public:
class SvxDictEdit : public Edit
{
- Link aActionLink;
+ Link<> aActionLink;
bool bSpaces;
public:
@@ -87,7 +87,7 @@ class SvxDictEdit : public Edit
SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
Edit(pParent, aWB), bSpaces(false){}
- void SetActionHdl( const Link& rLink )
+ void SetActionHdl( const Link<>& rLink )
{ aActionLink = rLink;}
void SetSpaces(bool bSet)
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 170e00692379..0c98b22ca2bd 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -51,11 +51,11 @@ public:
static const sal_uInt16* GetRanges();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
- Link GetPrevHdl() const { return aPrevHdlLink; }
- void SetPrevHdl( const Link& rLink )
+ Link<> GetPrevHdl() const { return aPrevHdlLink; }
+ void SetPrevHdl( const Link<>& rLink )
{ aPrevHdlLink = rLink; }
- Link GetNextHdl() const { return aNextHdlLink; }
- void SetNextHdl( const Link& rLink )
+ Link<> GetNextHdl() const { return aNextHdlLink; }
+ void SetNextHdl( const Link<>& rLink )
{ aNextHdlLink = rLink; }
void EnableTravel(bool bNext, bool bPrev);
@@ -103,8 +103,8 @@ private:
const SfxItemSet& rSet;
SfxItemSet* pOutSet;
- Link aPrevHdlLink;
- Link aNextHdlLink;
+ Link<> aPrevHdlLink;
+ Link<> aNextHdlLink;
DECL_LINK(Stamp, void *);
DECL_LINK(OKHdl, void *);
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index c1ac1e3f6b62..7f17f842c009 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -189,7 +189,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
VclPtr<VclMultiLineEdit> m_pDescriptionText;
OUString m_sDefaultDesc;
bool m_bShowSlots;
- Link m_aAddHdl;
+ Link<> m_aAddHdl;
DECL_LINK( ClickHdl, Button * );
DECL_LINK( SelectHdl, Control* );
@@ -208,8 +208,8 @@ public:
virtual ~SvxScriptSelectorDialog();
virtual void dispose() SAL_OVERRIDE;
- void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; }
- const Link& GetAddHdl() const { return m_aAddHdl; }
+ void SetAddHdl( const Link<>& rLink ) { m_aAddHdl = rLink; }
+ const Link<>& GetAddHdl() const { return m_aAddHdl; }
void SetImageProvider(ImageProvider* provider)
{
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index e1db4048acc7..3be2b26fe0cd 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -68,7 +68,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
VclPtr<SvxSwFrameExample> m_pExampleWN;
- Link m_aValidateLink;
+ Link<> m_aValidateLink;
//'string provider'
SvxSwFramePosString m_aFramePosString;
@@ -136,7 +136,7 @@ public:
void EnableAnchorTypes(sal_uInt16 nAnchorEnable);
- void SetValidateFramePosLink( const Link& rLink )
+ void SetValidateFramePosLink( const Link<>& rLink )
{m_aValidateLink = rLink;}
void SetView( const SdrView* pSdrView );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 52489521102e..2945d28e494c 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -53,7 +53,7 @@ private:
const SdrView* pView;
sal_uInt16 nAnchorCtrls;
- Link aValidateLink;
+ Link<> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -64,7 +64,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
//link for the Writer to validate positions
- void SetValidateFramePosLink( const Link& rLink );
+ void SetValidateFramePosLink( const Link<>& rLink );
};
/*************************************************************************
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b162898bc97c..d6e32b4e0441 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -42,7 +42,7 @@ namespace offapp
OUString m_sYes;
OUString m_sNo;
- Link m_aRowChangeHandler;
+ Link<> m_aRowChangeHandler;
public:
DriverListControl(vcl::Window* _pParent);
@@ -53,7 +53,7 @@ namespace offapp
// the handler will be called with a DriverPoolingSettings::const_iterator as parameter,
// or NULL if no valid current row exists
- void SetRowChangeHandler(const Link& _rHdl) { m_aRowChangeHandler = _rHdl; }
+ void SetRowChangeHandler(const Link<>& _rHdl) { m_aRowChangeHandler = _rHdl; }
DriverPooling* getCurrentRow();
void updateCurrentRow();
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index f4be898c5685..ea56e8eb10ba 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -47,7 +47,7 @@ namespace svx
bool m_bCreatingNew;
- Link m_aNameValidator;
+ Link<> m_aNameValidator;
public:
ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew );
@@ -57,8 +57,8 @@ namespace svx
// name validation has to be done by an external instance
// the validator link gets a pointer to a String, and should return 0 if the string is not
// acceptable
- void setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; }
- Link getNameValidator( ) const { return m_aNameValidator; }
+ void setNameValidator( const Link<>& _rValidator ) { m_aNameValidator = _rValidator; }
+ Link<> getNameValidator( ) const { return m_aNameValidator; }
void setLink( const OUString& _rName, const OUString& _rURL );
void getLink( OUString& _rName, OUString& _rURL ) const;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 4276de7311b7..86b7ae073114 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -88,7 +88,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
m_pCheckLB->setColSizes();
aTextColor = m_pCheckLB->GetTextColor();
- Link aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+ Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
m_pCheckLB->SetSelectHdl(aLink);
m_pUseTableCB->SetClickHdl(aLink);
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index fd637a9b96b5..81d9a39266fc 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -142,7 +142,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet&
LanguageHdl(m_pLanguageLB);
m_pLanguageLB->SetSelectHdl(LINK(this, SvxAsianLayoutPage, LanguageHdl));
m_pStandardCB->SetClickHdl(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl));
- Link aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
+ Link<> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
m_pStartED->SetModifyHdl(aLk);
m_pEndED->SetModifyHdl(aLk);
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index a8e8c8e9bed8..cbb8a5f6916d 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -178,7 +178,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
public:
- void SetLinks (Link const&, Link const&, Link const&);
+ void SetLinks (Link<> const&, Link<> const&, Link<> const&);
unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); }
void Update (EditableColorConfig const*, EditableExtendedColorConfig const*);
void ScrollHdl(const ScrollBar&);
@@ -219,7 +219,7 @@ private:
void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList);
void SetTextColor (Color C) { m_pText->SetTextColor(C); }
public:
- void SetLinks (Link const&, Link const&, Link const&);
+ void SetLinks (Link<> const&, Link<> const&, Link<> const&);
void Update (ColorConfigEntry, ColorConfigValue const&);
void Update (ExtendedColorConfigValue const&);
void ColorChanged (ColorConfigEntry, ColorConfigValue&);
@@ -409,8 +409,8 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(
// SetLinks()
void ColorConfigWindow_Impl::Entry::SetLinks(
- Link const& aCheckLink, Link const& aColorLink,
- Link const& aGetFocusLink)
+ Link<> const& aCheckLink, Link<> const& aColorLink,
+ Link<> const& aGetFocusLink)
{
m_pColorList->SetSelectHdl(aColorLink);
m_pColorList->SetGetFocusHdl(aGetFocusLink);
@@ -680,7 +680,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB)
// SetLinks()
void ColorConfigWindow_Impl::SetLinks (
- Link const& aCheckLink, Link const& aColorLink, Link const& aGetFocusLink
+ Link<> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
) {
for (unsigned i = 0; i != vEntries.size(); ++i)
vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -886,13 +886,13 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
m_pScrollWindow->set_expand(true);
m_pScrollWindow->set_fill(true);
- Link aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl);
+ Link<> aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl);
m_pVScroll->SetScrollHdl(aScrollLink);
m_pVScroll->SetEndScrollHdl(aScrollLink);
- Link aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
- Link aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
- Link aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
+ Link<> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
+ Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
+ Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
m_pHeaderHB->Show();
@@ -1060,7 +1060,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
get<vcl::Window>("preview")->GetText());
m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
- Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
+ Link<> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
m_pSaveSchemePB->SetClickHdl(aLk);
m_pDeleteSchemePB->SetClickHdl(aLk);
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 0949203066d1..c4f84c496e28 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -294,7 +294,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
m_aStrDateInfo = m_pToYearFT->GetText();
m_pYearValueField->SetModifyHdl( LINK( this, OfaMiscTabPage, TwoFigureHdl ) );
- Link aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl );
+ Link<> aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl );
m_pYearValueField->SetDownHdl( aLink );
m_pYearValueField->SetUpHdl( aLink );
m_pYearValueField->SetLoseFocusHdl( aLink );
@@ -1225,7 +1225,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) );
m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) );
- Link aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
+ Link<> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
m_pAsianSupportCB->SetClickHdl( aLink );
m_pCTLSupportCB->SetClickHdl( aLink );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index babda6a7ce8e..27052c736ebd 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -293,7 +293,7 @@ void SvxGeneralTabPage::InitControls ()
void SvxGeneralTabPage::SetLinks ()
{
// link for updating the initials
- Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
+ Link<> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
Row& rNameRow = *vRows[nNameRow];
for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
vFields[i]->pEdit->SetModifyHdl(aLink);
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 48e2626a31ec..ad149150abd7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -189,7 +189,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pNoProxyForED, "noproxy");
get(m_pNoProxyDescFT, "noproxydesc");
- Link aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl );
+ Link<> aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl );
m_pHttpPortED->SetLoseFocusHdl( aLink );
m_pHttpsPortED->SetLoseFocusHdl( aLink );
m_pFtpPortED->SetLoseFocusHdl( aLink );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 468f56eeed0e..218f814e97fb 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -206,7 +206,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pPathCtrl, "paths");
m_pStandardBtn->SetClickHdl(LINK(this, SvxPathTabPage, StandardHdl_Impl));
- Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
+ Link<> aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
m_pPathBtn->SetClickHdl( aLink );
Size aControlSize(236 , 147);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a57f3e0dca35..f6c5741dadb0 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -118,7 +118,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW) );
aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH) );
- Link aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
+ Link<> aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
aAutoSaveCB->SetClickHdl( aLink );
aAutoSaveEdit->SetMaxTextLen( 2 );
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 8d7329fe19b1..0f19eefbd00d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -203,7 +203,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
// windows to be disabled, if stacked text is turned OFF
m_pOrientHlp->AddDependentWindow( *m_pCbAsianMode, TRISTATE_FALSE );
- Link aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl );
+ Link<> aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl );
m_pLbHorAlign->SetSelectHdl( aLink );
m_pBtnWrap->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index dfc5ba5ad107..c2a24866e812 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -424,7 +424,7 @@ void SvxCharNamePage::Initialize()
// to handle the changes of the other pages
SetExchangeSupport();
- Link aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
+ Link<> aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
m_pWestFontNameLB->SetModifyHdl( aLink );
m_pWestFontStyleLB->SetModifyHdl( aLink );
m_pWestFontSizeLB->SetModifyHdl( aLink );
@@ -1474,7 +1474,7 @@ void SvxCharEffectsPage::Initialize()
m_pFontColorLB->SetSelectHdl( LINK( this, SvxCharEffectsPage, ColorBoxSelectHdl_Impl ) );
// handler
- Link aLink = LINK( this, SvxCharEffectsPage, SelectHdl_Impl );
+ Link<> aLink = LINK( this, SvxCharEffectsPage, SelectHdl_Impl );
m_pUnderlineLB->SetSelectHdl( aLink );
m_pUnderlineColorLB->SetSelectHdl( aLink );
m_pOverlineLB->SetSelectHdl( aLink );
@@ -2696,7 +2696,7 @@ void SvxCharPositionPage::Initialize()
m_pKerningLB->SelectEntryPos( 0 );
KerningSelectHdl_Impl( NULL );
- Link aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
+ Link<> aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
m_pHighPosBtn->SetClickHdl( aLink );
m_pNormalPosBtn->SetClickHdl( aLink );
m_pLowPosBtn->SetClickHdl( aLink );
@@ -3182,8 +3182,8 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
m_pScalingAndRotationFT->Show();
m_pScalingFT->Hide();
- Link aOldLink( m_pFitToLineCB->GetClickHdl() );
- m_pFitToLineCB->SetClickHdl( Link() );
+ Link<> aOldLink( m_pFitToLineCB->GetClickHdl() );
+ m_pFitToLineCB->SetClickHdl( Link<>() );
if( eState >= SfxItemState::DEFAULT )
{
const SvxCharRotateItem& rItem =
@@ -3432,7 +3432,7 @@ void SvxCharTwoLinesPage::Initialize()
m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) );
- Link aLink = LINK( this, SvxCharTwoLinesPage, CharacterMapHdl_Impl );
+ Link<> aLink = LINK( this, SvxCharTwoLinesPage, CharacterMapHdl_Impl );
m_pStartBracketLB->SetSelectHdl( aLink );
m_pEndBracketLB->SetSelectHdl( aLink );
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 66b493516fc1..21fa98fa7fc2 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -120,7 +120,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI
// disable 3D border
m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
- Link aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) );
+ Link<> aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) );
m_pMtrFldHorz1->SetModifyHdl( aLink );
m_pMtrFldVert1->SetModifyHdl( aLink );
m_pMtrFldHorz2->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 47350ce2ecee..035ddab252c1 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -88,7 +88,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
SetFieldUnit( *m_pTopMF , eMetric );
SetFieldUnit( *m_pBottomMF, eMetric );
- Link aLk = LINK(this, SvxGrfCropPage, SizeHdl);
+ Link<> aLk = LINK(this, SvxGrfCropPage, SizeHdl);
m_pWidthMF->SetModifyHdl( aLk );
m_pHeightMF->SetModifyHdl( aLk );
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1f053174161f..3e0ae6245af1 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -571,7 +571,7 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
}
-void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink )
+void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<>& rLink )
{
aValidateLink = rLink;
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 9c384f04800d..0cb8a54cd527 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -369,7 +369,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 0f4213da4a2d..0e83582080fe 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -135,7 +135,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
m_pCtlPreview->SetBackground ( rStyles.GetWindowColor() );
m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
- Link aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) );
+ Link<> aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) );
m_pMtrFldLineDist->SetModifyHdl( aLink );
m_pMtrFldHelplineOverhang->SetModifyHdl( aLink );
m_pMtrFldHelplineDist->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9ddc402a6291..be2ab716a598 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -336,7 +336,7 @@ void SvxNumberFormatTabPage::Init_Impl()
m_pCbSourceFormat->Disable();
m_pCbSourceFormat->Hide();
- Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
+ Link<> aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
m_pLbCategory->SetSelectHdl( aLink );
m_pLbFormat->SetSelectHdl( aLink );
@@ -1689,7 +1689,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
#*
#************************************************************************/
-void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler )
+void SvxNumberFormatTabPage::SetOkHdl( const Link<>& rOkHandler )
{
fnOkHdl = rOkHandler;
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7ef25525ffeb..c638187edb52 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2719,7 +2719,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
}
m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() );
- Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
+ Link<> aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
m_pDistBorderMF->SetUpHdl(aLk);
m_pDistBorderMF->SetDownHdl(aLk);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df8eb1032ac2..590676cffb09 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -423,7 +423,7 @@ void SvxPageDescPage::Init_Impl()
m_pLandscapeBtn->SetClickHdl( LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
m_pPortraitBtn->SetClickHdl( LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
- Link aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
+ Link<> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
m_pLeftMarginEdit->SetModifyHdl( aLink );
m_pRightMarginEdit->SetModifyHdl( aLink );
m_pTopMarginEdit->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0d2dc16b4992..72c80d8506a6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -834,7 +834,7 @@ void SvxStdParagraphTabPage::Init_Impl()
m_pLineDist->SetSelectHdl(
LINK( this, SvxStdParagraphTabPage, LineDistHdl_Impl ) );
- Link aLink = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl );
+ Link<> aLink = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl );
m_pFLineIndent->SetLoseFocusHdl( aLink );
m_pLeftIndent->SetLoseFocusHdl( aLink );
m_pRightIndent->SetLoseFocusHdl( aLink );
@@ -1018,7 +1018,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
if ( m_pLastLineLB->GetEntryCount() == LASTLINECOUNT_NEW )
m_pLastLineLB->RemoveEntry( nLastLinePos );
- Link aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
+ Link<> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
m_pLeft->SetClickHdl( aLink );
m_pRight->SetClickHdl( aLink );
m_pCenter->SetClickHdl( aLink );
@@ -2171,7 +2171,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
get(m_pHangingPunctCB,"checkHangPunct");
get(m_pScriptSpaceCB,"checkApplySpacing");
- Link aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
+ Link<> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
m_pHangingPunctCB->SetClickHdl( aLink );
m_pScriptSpaceCB->SetClickHdl( aLink );
m_pForbiddenRulesCB->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 64c9085f0a35..2b5652759297 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -558,7 +558,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
SetExchangeSupport();
- Link aLk = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl);
+ Link<> aLk = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl);
m_pWidthMF->SetLoseFocusHdl( aLk );
m_pHeightMF->SetLoseFocusHdl( aLk );
m_pHoriByMF->SetLoseFocusHdl( aLk );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 30f2f71dc353..1014873898ef 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -160,7 +160,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet
m_pDelBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) );
m_pDelAllBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) );
- Link aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
+ Link<> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
m_pLeftTab->SetClickHdl( aLink );
m_pRightTab->SetClickHdl( aLink );
m_pDezTab->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index b2f2980de258..eb58430b65b1 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -115,7 +115,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS
m_pTsbAuto->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) );
m_pTsbPixel->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) );
- Link aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
+ Link<> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
m_pBtnUp->SetClickHdl( aLink );
m_pBtnLeft->SetClickHdl( aLink );
m_pBtnRight->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 9d7a3af424f9..645b2472f8ac 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -87,7 +87,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr
SetFieldUnit( *m_pMtrFldTop, eFUnit );
SetFieldUnit( *m_pMtrFldBottom, eFUnit );
- Link aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
+ Link<> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
m_pTsbAutoGrowWidth->SetClickHdl( aLink );
m_pTsbAutoGrowHeight->SetClickHdl( aLink );
m_pTsbFitToSize->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1b73f2c0dcad..a0a7abbf0db2 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -301,7 +301,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
m_pMtrTrgrEndValue->SetValue( 100 );
m_pMtrTrgrStartValue->SetValue( 0 );
m_pLbTrgrGradientType->SetSelectHdl(LINK(this, SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl));
- Link aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl);
+ Link<> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl);
m_pLbTrgrGradientType->SetSelectHdl( aLink );
m_pMtrTrgrCenterX->SetModifyHdl( aLink );
m_pMtrTrgrCenterY->SetModifyHdl( aLink );
@@ -755,7 +755,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
- Link aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
+ Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
m_pTsbTile->SetClickHdl( aLink );
m_pTsbStretch->SetClickHdl( aLink );
m_pTsbOriginal->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 61f10283f2b6..048e4585e931 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -376,7 +376,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
m_pLbColorModel->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorModelHdl_Impl ) );
- Link aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
+ Link<> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
m_pR->SetModifyHdl( aLink );
m_pG->SetModifyHdl( aLink );
m_pB->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 81ce6469117e..00d434055158 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -117,7 +117,7 @@ SvxGradientTabPage::SvxGradientTabPage
m_pBtnDelete->SetClickHdl(
LINK( this, SvxGradientTabPage, ClickDeleteHdl_Impl ) );
- Link aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl );
+ Link<> aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl );
m_pLbGradientType->SetSelectHdl( aLink );
m_pMtrCenterX->SetModifyHdl( aLink );
m_pMtrCenterY->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 4e1200e963ad..e4ee4544b4cc 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -118,7 +118,7 @@ SvxHatchTabPage::SvxHatchTabPage
m_pLbHatchings->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl_Impl ) );
- Link aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl );
+ Link<> aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl );
m_pMtrDistance->SetModifyHdl( aLink );
m_pMtrAngle->SetModifyHdl( aLink );
m_pLbLineType->SetSelectHdl( aLink );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index bdc91ac2793f..184d428732a1 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -189,8 +189,8 @@ SvxLineTabPage::SvxLineTabPage
m_pMtrLineWidth->SetModifyHdl( LINK( this, SvxLineTabPage, ChangePreviewHdl_Impl ) );
m_pMtrTransparent->SetModifyHdl( LINK( this, SvxLineTabPage, ChangeTransparentHdl_Impl ) );
- Link aStart = LINK( this, SvxLineTabPage, ChangeStartHdl_Impl );
- Link aEnd = LINK( this, SvxLineTabPage, ChangeEndHdl_Impl );
+ Link<> aStart = LINK( this, SvxLineTabPage, ChangeStartHdl_Impl );
+ Link<> aEnd = LINK( this, SvxLineTabPage, ChangeEndHdl_Impl );
m_pLbStartStyle->SetSelectHdl( aStart );
m_pLbEndStyle->SetSelectHdl( aEnd );
m_pMtrStartWidth->SetModifyHdl( aStart );
@@ -199,11 +199,11 @@ SvxLineTabPage::SvxLineTabPage
m_pTsbCenterEnd->SetClickHdl( aEnd );
// #116827#
- Link aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl );
+ Link<> aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl );
m_pLBEdgeStyle->SetSelectHdl( aEdgeStyle );
// LineCaps
- Link aCapStyle = LINK( this, SvxLineTabPage, ChangeCapStyleHdl_Impl );
+ Link<> aCapStyle = LINK( this, SvxLineTabPage, ChangeCapStyleHdl_Impl );
m_pLBCapStyle->SetSelectHdl( aCapStyle );
// Symbols on a line (eg star charts), MB-handler set
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index c2448b280d57..8bac22399f6b 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -143,7 +143,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
m_pCbxSynchronize->SetClickHdl( LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
// preview must be updated when there's something changed
- Link aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
+ Link<> aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
m_pLbType1->SetSelectHdl( aLink );
m_pLbType2->SetSelectHdl( aLink );
aLink = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl );
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 55d66b3b75ab..10c0d0cf8aba 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -159,7 +159,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
//aCtlXRectPreview.SetFillAttr( aXFillAttr );
m_pTsbShowShadow->SetClickHdl( LINK( this, SvxShadowTabPage, ClickShadowHdl_Impl ) );
- Link aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
+ Link<> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
m_pLbShadowColor->SetSelectHdl( aLink );
m_pMtrTransparent->SetModifyHdl( aLink );
m_pMtrDistance->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 2da50ac83e69..950a4b244827 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
-void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
+void SvxTransformTabDialog::SetValidateFramePosLink(const Link<>& rLink)
{
aValidateLink = rLink;
}
diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx
index 6986a79b8452..8dd872f30ca8 100644
--- a/dbaccess/source/ui/browser/AsynchronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx
@@ -23,7 +23,7 @@
// OAsynchronousLink
using namespace dbaui;
-OAsynchronousLink::OAsynchronousLink( const Link& _rHandler )
+OAsynchronousLink::OAsynchronousLink( const Link<>& _rHandler )
:m_aHandler(_rHandler)
,m_aEventSafety()
,m_aDestructionSafety()
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index bc0b44194983..6d8feddfcf7e 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -63,12 +63,12 @@ void DBTreeView::dispose()
vcl::Window::dispose();
}
-void DBTreeView::SetPreExpandHandler(const Link& _rHdl)
+void DBTreeView::SetPreExpandHandler(const Link<>& _rHdl)
{
m_pTreeListBox->SetPreExpandHandler(_rHdl);
}
-void DBTreeView::setCopyHandler(const Link& _rHdl)
+void DBTreeView::setCopyHandler(const Link<>& _rHdl)
{
m_pTreeListBox->setCopyHandler(_rHdl);
}
@@ -86,7 +86,7 @@ void DBTreeView::setModel(SvTreeList* _pTreeModel)
m_pTreeListBox->SetModel(_pTreeModel);
}
-void DBTreeView::setSelChangeHdl( const Link& _rHdl )
+void DBTreeView::setSelChangeHdl( const Link<>& _rHdl )
{
m_pTreeListBox->SetSelChangeHdl( _rHdl );
}
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index 5313583fc061..a3d237dc8351 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -46,13 +46,13 @@ namespace dbaui
<p>When calling the link, the parameter is an SvTreeListEntry marking the entry to be expanded.
</p>
*/
- void SetPreExpandHandler(const Link& _rHdl);
+ void SetPreExpandHandler(const Link<>& _rHdl);
/// gets the currently set NodeExpansionHandler
- void setCopyHandler(const Link& _rHdl);
+ void setCopyHandler(const Link<>& _rHdl);
void setModel(SvTreeList* _pTreeModel);
- void setSelChangeHdl(const Link& _rHdl);
+ void setSelChangeHdl(const Link<>& _rHdl);
DBTreeListBox& getListBox() const { return *m_pTreeListBox; }
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index f011e060a719..b7bdad487f80 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -460,7 +460,7 @@ namespace dbaui
lateUIInit();
- Link aLink(LINK(this, OTableListBoxControl, OnTableChanged));
+ Link<> aLink(LINK(this, OTableListBoxControl, OnTableChanged));
m_pLeftTable->SetSelectHdl(aLink);
m_pRightTable->SetSelectHdl(aLink);
}
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
index a15fb7693d25..e463262b51b6 100644
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@ -37,7 +37,7 @@ namespace dbaui
Rectangle aScrollArea( Point(0, _rOutputSize.Height() - LISTBOX_SCROLLING_AREA),
Size(_rOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
- Link aToCall;
+ Link<> aToCall;
// if pointer in bottom area begin scroll
if( aScrollArea.IsInside(_rPoint) )
aToCall = m_aUpScroll;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index c457c962c8fa..b01a1bb6a95a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -374,7 +374,7 @@ using namespace ::com::sun::star;
OnModified( NULL );
}
- Link MySQLNativeSetupPage::getControlModifiedLink()
+ Link<> MySQLNativeSetupPage::getControlModifiedLink()
{
return LINK( this, MySQLNativeSetupPage, OnModified );
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 109c3f3c93d3..0f2c026a12ea 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -86,7 +86,7 @@ namespace dbaui
OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
virtual ~OLDAPConnectionPageSetup();
virtual void dispose() SAL_OVERRIDE;
- virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
+ virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
@@ -127,7 +127,7 @@ namespace dbaui
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
- virtual Link getControlModifiedLink() SAL_OVERRIDE;
+ virtual Link<> getControlModifiedLink() SAL_OVERRIDE;
private:
DECL_LINK( OnModified, Edit* );
@@ -154,7 +154,7 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
- virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
+ virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
@@ -217,9 +217,9 @@ namespace dbaui
static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet );
ConnectionType getMySQLMode();
- Link maClickHdl;
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
+ Link<> maClickHdl;
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
protected:
@@ -285,7 +285,7 @@ namespace dbaui
void enableTableWizardCheckBox( bool _bSupportsTableCreation);
/// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
- Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); }
+ Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); }
DECL_LINK(OnOpenSelected, CheckBox*);
protected:
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 56610e6e615b..c847fe4aee83 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -44,7 +44,7 @@ namespace dbaui
{
OTextConnectionHelper();
- Link m_aModifiedHandler; /// to be called if something on the page has been modified
+ Link<> m_aModifiedHandler; /// to be called if something on the page has been modified
public:
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
@@ -75,13 +75,13 @@ namespace dbaui
OUString m_aTextSeparatorList;
OUString m_aTextNone;
OUString m_aOldExtension;
- Link m_aGetExtensionHandler; /// to be called if a new type is selected
+ Link<> m_aGetExtensionHandler; /// to be called if a new type is selected
short m_nAvailableSections;
protected:
void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); }
- Link getControlModifiedLink() { return LINK(this, OTextConnectionHelper, OnControlModified); }
+ Link<> getControlModifiedLink() { return LINK(this, OTextConnectionHelper, OnControlModified); }
DECL_LINK(OnSetExtensionHdl,RadioButton*);
DECL_LINK(OnControlModified,Control*);
DECL_LINK(OnEditModified,Edit*);
@@ -95,7 +95,7 @@ namespace dbaui
void implInitControls(const SfxItemSet& _rSet, bool _bValid);
void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
- void SetClickHandler(const Link& _rHandler) { m_aGetExtensionHandler = _rHandler; }
+ void SetClickHandler(const Link<>& _rHandler) { m_aGetExtensionHandler = _rHandler; }
OUString GetExtension();
bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething );
bool prepareLeave();
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index a4ff866067d7..a869c8220785 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -125,7 +125,7 @@ namespace dbaui
};
// MySQLNativeSettings
- MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink )
+ MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink )
:TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" )
{
get(m_pDatabaseNameLabel, "dbnamelabel");
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index 544ef8b89a24..c4e805cd6fc2 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -52,7 +52,7 @@ namespace dbaui
m_aControlDependencies;
public:
- MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink );
+ MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink );
virtual ~MySQLNativeSettings();
virtual void dispose() SAL_OVERRIDE;
void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 3572cd860055..74cc29c3d39c 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -93,7 +93,7 @@ namespace dbaui
,public ::svt::IWizardPageController
{
private:
- Link m_aModifiedHandler; /// to be called if something on the page has been modified
+ Link<> m_aModifiedHandler; /// to be called if something on the page has been modified
bool m_abEnableRoadmap;
protected:
IDatabaseSettingsDialog* m_pAdminDialog;
@@ -104,7 +104,7 @@ namespace dbaui
public:
OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet);
/// set a handler which gets called every time something on the page has been modified
- void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; }
+ void SetModifiedHandler(const Link<>& _rHandler) { m_aModifiedHandler = _rHandler; }
/** Sets the ParentDialog
@param _pAdminDialog
@@ -234,7 +234,7 @@ namespace dbaui
DECL_LINK(OnTestConnectionClickHdl, PushButton*);
/// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
- virtual Link getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
+ virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
};
// ControlRelation
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 6c5d3294f749..1750b4188c26 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -49,7 +49,7 @@ namespace dbaui
};
SPECIAL_MESSAGE m_eLastMessage;
- Link m_aTypeSelectHandler; /// to be called if a new type is selected
+ Link<> m_aTypeSelectHandler; /// to be called if a new type is selected
bool m_bDisplayingInvalid : 1; /// the currently displayed data source is deleted
bool m_bInitTypeList : 1;
bool approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName );
@@ -69,7 +69,7 @@ namespace dbaui
virtual void dispose() SAL_OVERRIDE;
/// set a handler which gets called every time the user selects a new type
- void SetTypeSelectHandler( const Link& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
+ void SetTypeSelectHandler( const Link<>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
/// get the currently selected datasource type
OUString GetSelectedType() const { return m_eCurrentSelection; }
@@ -151,9 +151,9 @@ namespace dbaui
DocumentDescriptor m_aBrowsedDocument;
CreationMode m_eOriginalCreationMode;
- Link m_aCreationModeHandler; /// to be called if a new type is selected
- Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
- Link m_aChooseDocumentHandler; /// to be called when a recent document has been definitely chosen
+ Link<> m_aCreationModeHandler; /// to be called if a new type is selected
+ Link<> m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
+ Link<> m_aChooseDocumentHandler; /// to be called when a recent document has been definitely chosen
::svt::ControlDependencyManager
m_aControlDependencies;
@@ -162,11 +162,11 @@ namespace dbaui
void insertEmbeddedDBTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
public:
- void SetCreationModeHandler( const Link& _rHandler ) { m_aCreationModeHandler = _rHandler; }
+ void SetCreationModeHandler( const Link<>& _rHandler ) { m_aCreationModeHandler = _rHandler; }
CreationMode GetDatabaseCreationMode() const;
- void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
- void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
+ void SetDocumentSelectionHandler( const Link<>& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
+ void SetChooseDocumentHandler( const Link<>& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
DocumentDescriptor GetSelectedDocument() const;
protected:
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index a236e46ea7dc..67e2811d6848 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -40,8 +40,8 @@ namespace dbaui
class DbaMouseDownListBoxController : public ListBoxCellController
{
protected:
- Link m_aOriginalModifyHdl;
- Link m_aAdditionalModifyHdl;
+ Link<> m_aOriginalModifyHdl;
+ Link<> m_aAdditionalModifyHdl;
public:
DbaMouseDownListBoxController(ListBoxControl* _pParent)
@@ -49,24 +49,24 @@ namespace dbaui
{
}
- void SetAdditionalModifyHdl(const Link& _rHdl);
+ void SetAdditionalModifyHdl(const Link<>& _rHdl);
protected:
virtual bool WantMouseEvent() const SAL_OVERRIDE { return true; }
- virtual void SetModifyHdl(const Link& _rHdl) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& _rHdl) SAL_OVERRIDE;
private:
void implCheckLinks();
DECL_LINK( OnMultiplexModify, void* );
};
- void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link& _rHdl)
+ void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<>& _rHdl)
{
m_aAdditionalModifyHdl = _rHdl;
implCheckLinks();
}
- void DbaMouseDownListBoxController::SetModifyHdl(const Link& _rHdl)
+ void DbaMouseDownListBoxController::SetModifyHdl(const Link<>& _rHdl)
{
m_aOriginalModifyHdl = _rHdl;
implCheckLinks();
@@ -86,7 +86,7 @@ namespace dbaui
if (m_aAdditionalModifyHdl.IsSet() || m_aOriginalModifyHdl.IsSet())
ListBoxCellController::SetModifyHdl(LINK(this, DbaMouseDownListBoxController, OnMultiplexModify));
else
- ListBoxCellController::SetModifyHdl(Link());
+ ListBoxCellController::SetModifyHdl(Link<>());
}
// IndexFieldsControl
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index d563161e7214..ace45b3f3875 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -241,10 +241,10 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames)
class ProcessTerminationWait : public ::osl::Thread
{
oslProcess m_hProcessHandle;
- Link m_aFinishHdl;
+ Link<> m_aFinishHdl;
public:
- ProcessTerminationWait( oslProcess _hProcessHandle, const Link& _rFinishHdl )
+ ProcessTerminationWait( oslProcess _hProcessHandle, const Link<>& _rFinishHdl )
:m_hProcessHandle( _hProcessHandle )
,m_aFinishHdl( _rFinishHdl )
{
@@ -262,7 +262,7 @@ protected:
};
// OOdbcManagement
-OOdbcManagement::OOdbcManagement(const Link& rAsyncFinishCallback)
+OOdbcManagement::OOdbcManagement(const Link<>& rAsyncFinishCallback)
: m_aAsyncFinishCallback(rAsyncFinishCallback)
{
}
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 36ee36dccad7..1631b714be6c 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<> m_aAsyncFinishCallback;
public:
- OOdbcManagement( const Link& _rAsyncFinishCallback );
+ OOdbcManagement( const Link<>& _rAsyncFinishCallback );
~OOdbcManagement();
bool manageDataSources_async();
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index c0425048091a..30f898773fd7 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -213,9 +213,9 @@ namespace dbaui
if (m_pCancelBtn == pButton)
{
// no interpreting of the given values anymore ....
- m_pParam->SetLoseFocusHdl(Link()); // no direct call from the control anymore ...
+ m_pParam->SetLoseFocusHdl(Link<>()); // no direct call from the control anymore ...
m_bNeedErrorOnCurrent = false; // in case of any indirect calls -> no error message
- m_pCancelBtn->SetClickHdl(Link());
+ m_pCancelBtn->SetClickHdl(Link<>());
m_pCancelBtn->Click();
}
else if (m_pOKBtn == pButton)
@@ -253,7 +253,7 @@ namespace dbaui
}
// to close the dialog (which is more code than a simple EndDialog)
- m_pOKBtn->SetClickHdl(Link());
+ m_pOKBtn->SetClickHdl(Link<>());
m_pOKBtn->Click();
}
else if (m_pTravelNext == pButton)
@@ -349,7 +349,7 @@ namespace dbaui
Selection aSel;
if (pOldFocus == m_pParam)
{
- m_pParam->SetLoseFocusHdl(Link());
+ m_pParam->SetLoseFocusHdl(Link<>());
aSel = m_pParam->GetSelection();
}
m_pTravelNext->GrabFocus();
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index 3b8d74618bd9..d4dcde17ed5c 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -41,7 +41,7 @@ namespace dbaui
class OQueryTableView : public OJoinTableView
{
- Link m_lnkTabWinsChangeHandler;
+ Link<> m_lnkTabWinsChangeHandler;
protected:
virtual void ConnDoubleClicked(OTableConnection* pConnection) SAL_OVERRIDE;
@@ -114,7 +114,7 @@ namespace dbaui
void NotifyTabConnection(const OQueryTableConnection& rNewConn, bool _bCreateUndoAction = true);
/// @note the Handler receives a pointer to a TabWinsChangeNotification struct
- Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; }
+ Link<> SetTabWinsChangeHandler(const Link<>& lnk) { Link<> lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; }
bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const;
diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx
index cf27cba19276..f709bb3092e7 100644
--- a/dbaccess/source/ui/inc/ScrollHelper.hxx
+++ b/dbaccess/source/ui/inc/ScrollHelper.hxx
@@ -27,8 +27,8 @@ namespace dbaui
{
class OScrollHelper
{
- Link m_aUpScroll;
- Link m_aDownScroll;
+ Link<> m_aUpScroll;
+ Link<> m_aDownScroll;
public:
/** default constructor
*/
@@ -40,7 +40,7 @@ namespace dbaui
@param _rUpScroll
the method to set
*/
- inline void setUpScrollMethod( const Link& _rUpScroll )
+ inline void setUpScrollMethod( const Link<>& _rUpScroll )
{
m_aUpScroll = _rUpScroll;
}
@@ -49,7 +49,7 @@ namespace dbaui
@param _rDownScroll
the method to set
*/
- inline void setDownScrollMethod( const Link& _rDownScroll )
+ inline void setDownScrollMethod( const Link<>& _rDownScroll )
{
m_aDownScroll = _rDownScroll;
}
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index cbeb1b6e540f..4dfd3c84a713 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -60,15 +60,15 @@ namespace dbaui
IContextMenuProvider*
m_pContextMenuProvider;
- Link m_aPreExpandHandler; // handler to be called before a node is expanded
- Link m_aSelChangeHdl; // handlet to be called (asynchronously) when the selection changes in any way
- Link m_aCutHandler; // called when someone press CTRL+X
- Link m_aCopyHandler; // called when someone press CTRL+C
- Link m_aPasteHandler; // called when someone press CTRL+V
- Link m_aDeleteHandler; // called when someone press DELETE Key
- Link m_aEditingHandler; // called before someone will edit an entry
- Link m_aEditedHandler; // called after someone edited an entry
- Link m_aEnterKeyHdl;
+ Link<> m_aPreExpandHandler; // handler to be called before a node is expanded
+ Link<> m_aSelChangeHdl; // handlet to be called (asynchronously) when the selection changes in any way
+ Link<> m_aCutHandler; // called when someone press CTRL+X
+ Link<> m_aCopyHandler; // called when someone press CTRL+C
+ Link<> m_aPasteHandler; // called when someone press CTRL+V
+ Link<> m_aDeleteHandler; // called when someone press DELETE Key
+ Link<> m_aEditingHandler; // called before someone will edit an entry
+ Link<> m_aEditedHandler; // called after someone edited an entry
+ Link<> m_aEnterKeyHdl;
bool m_bHandleEnterKey;
@@ -89,14 +89,14 @@ namespace dbaui
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; }
- void SetPreExpandHandler(const Link& _rHdl) { m_aPreExpandHandler = _rHdl; }
- void SetSelChangeHdl( const Link& _rHdl ) { m_aSelChangeHdl = _rHdl; }
- void setCutHandler(const Link& _rHdl) { m_aCutHandler = _rHdl; }
- void setCopyHandler(const Link& _rHdl) { m_aCopyHandler = _rHdl; }
- void setPasteHandler(const Link& _rHdl) { m_aPasteHandler = _rHdl; }
- void setDeleteHandler(const Link& _rHdl) { m_aDeleteHandler = _rHdl; }
- void setEditingHandler(const Link& _rHdl) { m_aEditingHandler = _rHdl; }
- void setEditedHandler(const Link& _rHdl) { m_aEditedHandler = _rHdl; }
+ void SetPreExpandHandler(const Link<>& _rHdl) { m_aPreExpandHandler = _rHdl; }
+ void SetSelChangeHdl( const Link<>& _rHdl ) { m_aSelChangeHdl = _rHdl; }
+ void setCutHandler(const Link<>& _rHdl) { m_aCutHandler = _rHdl; }
+ void setCopyHandler(const Link<>& _rHdl) { m_aCopyHandler = _rHdl; }
+ void setPasteHandler(const Link<>& _rHdl) { m_aPasteHandler = _rHdl; }
+ void setDeleteHandler(const Link<>& _rHdl) { m_aDeleteHandler = _rHdl; }
+ void setEditingHandler(const Link<>& _rHdl) { m_aEditingHandler = _rHdl; }
+ void setEditedHandler(const Link<>& _rHdl) { m_aEditedHandler = _rHdl; }
// modified the given entry so that the expand handler is called whenever the entry is expanded
// (normally, the expand handler is called only once)
@@ -121,7 +121,7 @@ namespace dbaui
virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE;
virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE;
- void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;}
+ void SetEnterKeyHdl(const Link<>& rNewHdl) {m_aEnterKeyHdl = rNewHdl;}
void clearCurrentSelection() { m_aSelectedEntries.clear(); }
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index bd595e012263..a1928d4acd99 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -43,18 +43,18 @@ namespace dbaui
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- Link m_aSelectHdl;
- Link m_aEndEditHdl;
+ Link<> m_aSelectHdl;
+ Link<> m_aEndEditHdl;
bool m_bSuspendSelectHdl;
public:
DbaIndexList(vcl::Window* _pParent, WinBits nWinBits);
- void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; }
- Link GetSelectHdl() const { return m_aSelectHdl; }
+ void SetSelectHdl(const Link<>& _rHdl) { m_aSelectHdl = _rHdl; }
+ Link<> GetSelectHdl() const { return m_aSelectHdl; }
- void SetEndEditHdl(const Link& _rHdl) { m_aEndEditHdl = _rHdl; }
- Link GetEndEditHdl() const { return m_aEndEditHdl; }
+ void SetEndEditHdl(const Link<>& _rHdl) { m_aEndEditHdl = _rHdl; }
+ Link<> GetEndEditHdl() const { return m_aEndEditHdl; }
virtual bool Select(SvTreeListEntry* pEntry, bool bSelect) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 787f897dc9bf..2a0519872e60 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -38,7 +38,7 @@ namespace dbaui
IndexFields m_aFields; // !! order matters !!
IndexFields::const_iterator m_aSeekRow; // !!
- Link m_aModifyHdl;
+ Link<> m_aModifyHdl;
VclPtr< ::svt::ListBoxControl> m_pSortingCell;
VclPtr< ::svt::ListBoxControl> m_pFieldNameCell;
@@ -65,8 +65,8 @@ namespace dbaui
const IndexFields& GetSavedValue() const { return m_aSavedValue; }
void SaveValue() { m_aSavedValue = m_aFields; }
- void SetModifyHdl(const Link& _rHdl) { m_aModifyHdl = _rHdl; }
- Link GetModifyHdl() const { return m_aModifyHdl; }
+ void SetModifyHdl(const Link<>& _rHdl) { m_aModifyHdl = _rHdl; }
+ Link<> GetModifyHdl() const { return m_aModifyHdl; }
virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const SAL_OVERRIDE;
protected:
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index 06d9c8aeba62..889716f641ed 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -35,7 +35,7 @@ namespace dbaui
class OMarkableTreeListBox : public DBTreeListBox
{
SvLBoxButtonData* m_pCheckButton;
- Link m_aCheckButtonHandler;
+ Link<> m_aCheckButtonHandler;
public:
OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 );
@@ -47,7 +47,7 @@ public:
void CheckButtons(); // make the button states consistent (bottom-up)
/// the handler given is called whenever the check state of one or more items changed
- void SetCheckHandler(const Link& _rHdl) { m_aCheckButtonHandler = _rHdl; }
+ void SetCheckHandler(const Link<>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 2e5ac221ee65..81695cc21f72 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -41,7 +41,7 @@ namespace dbaui
Timer m_timerInvalidate;
Timer m_timerUndoActionCreation;
- Link m_lnkTextModifyHdl;
+ Link<> m_lnkTextModifyHdl;
OUString m_strOrigText; // is restored on undo
VclPtr<OQueryTextView> m_pView;
bool m_bAccelAction; // is set on cut, copy, paste
@@ -80,7 +80,7 @@ namespace dbaui
// To prevent this, SlotExec in View can call this function.
bool IsInAccelAct() { return m_bAccelAction; }
- void SetTextModifyHdl(const Link& lnk) { m_lnkTextModifyHdl = lnk; }
+ void SetTextModifyHdl(const Link<>& lnk) { m_lnkTextModifyHdl = lnk; }
// please don't use SetModifyHdl, I need it for myself, this here is called from the handler set with that
// the link gets a pointer-to-string, which is invalid after the link
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 60c9db1ee306..976481251c19 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -659,7 +659,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
return true;
}
-void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
+void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller )
{
if ( m_nEventID )
Application::RemoveUserEvent( m_nEventID );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 2f6052be71af..8a130ff8ee8d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -66,7 +66,7 @@ public:
void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const;
Dialog* getWindow() const { return m_pVCLWindow; };
- void PostUserEvent( const Link& rLink, void* pCaller );
+ void PostUserEvent( const Link<>& rLink, void* pCaller );
void clearEventID() { m_nEventID = 0; }
virtual void showProgress( bool bStart ) = 0;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index f669ac129d3c..85b9e41d7c27 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1234,7 +1234,7 @@ void ExtensionBox_Impl::checkEntries()
}
-void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
+void ExtensionBox_Impl::SetScrollHdl( const Link<>& rLink )
{
if ( m_pScrollBar )
m_pScrollBar->SetScrollHdl( rLink );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 0a9a204a1ed3..d1a634203bb1 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -132,7 +132,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
Image m_aLockedImage;
Image m_aWarningImage;
Image m_aDefaultImage;
- Link m_aClickHdl;
+ Link<> m_aClickHdl;
VclPtr<ScrollBar> m_pScrollBar;
@@ -196,9 +196,9 @@ public:
Rectangle GetEntryRect( const long nPos ) const;
bool HasActive() { return m_bHasActive; }
long PointToPos( const Point& rPos );
- void SetScrollHdl( const Link& rLink );
+ void SetScrollHdl( const Link<>& rLink );
void DoScroll( long nDelta );
- void SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }
+ void SetHyperlinkHdl( const Link<>& rLink ){ m_aClickHdl = rLink; }
virtual void RecalcAll();
void RemoveUnlocked();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 8e75bd04b42a..2663e22a56fd 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -925,7 +925,7 @@ void UpdateDialog::initDescription()
m_pReleaseNotesLabel->Hide();
m_pReleaseNotesLink->Hide();
- Link aLink = LINK( this, UpdateDialog, hyperlink_clicked );
+ Link<> aLink = LINK( this, UpdateDialog, hyperlink_clicked );
m_pPublisherLink->SetClickHdl( aLink );
m_pReleaseNotesLink->SetClickHdl( aLink );
}
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 710052f3180f..45074279813c 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -51,8 +51,8 @@ namespace dp_gui {
class LicenseView : public MultiLineEdit, public SfxListener
{
bool mbEndReached;
- Link maEndReachedHdl;
- Link maScrolledHdl;
+ Link<> maEndReachedHdl;
+ Link<> maScrolledHdl;
public:
LicenseView( vcl::Window* pParent, WinBits nStyle );
@@ -64,9 +64,9 @@ public:
bool IsEndReached() const;
bool EndReached() const { return mbEndReached; }
- void SetEndReachedHdl( const Link& rHdl ) { maEndReachedHdl = rHdl; }
+ void SetEndReachedHdl( const Link<>& rHdl ) { maEndReachedHdl = rHdl; }
- void SetScrolledHdl( const Link& rHdl ) { maScrolledHdl = rHdl; }
+ void SetScrolledHdl( const Link<>& rHdl ) { maScrolledHdl = rHdl; }
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
@@ -143,8 +143,8 @@ LicenseView::~LicenseView()
void LicenseView::dispose()
{
- maEndReachedHdl = Link();
- maScrolledHdl = Link();
+ maEndReachedHdl = Link<>();
+ maScrolledHdl = Link<>();
EndListeningAll();
MultiLineEdit::dispose();
}
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 136d94d04dfd..503b91a86b98 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -749,7 +749,7 @@ private:
boost::ptr_vector<ContentNode> maContents;
SfxItemPool* pItemPool;
- Link aModifyHdl;
+ Link<> aModifyHdl;
SvxFont aDefFont; //faster than ever from the pool!!
sal_uInt16 nDefTab;
@@ -771,8 +771,8 @@ public:
bool IsModified() const { return bModified; }
void SetModified( bool b );
- void SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; }
- Link GetModifyHdl() const { return aModifyHdl; }
+ void SetModifyHdl( const Link<>& rLink ) { aModifyHdl = rLink; }
+ Link<> GetModifyHdl() const { return aModifyHdl; }
void CreateDefFont( bool bUseStyles );
const SvxFont& GetDefFont() { return aDefFont; }
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1b760958dba2..dd631be58fc4 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1502,53 +1502,53 @@ void EditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
pImpEditEngine->ShowParagraph( nParagraph, bShow );
}
-void EditEngine::SetNotifyHdl( const Link& rLink )
+void EditEngine::SetNotifyHdl( const Link<>& rLink )
{
pImpEditEngine->SetNotifyHdl( rLink );
}
-Link EditEngine::GetNotifyHdl() const
+Link<> EditEngine::GetNotifyHdl() const
{
return pImpEditEngine->GetNotifyHdl();
}
-void EditEngine::SetStatusEventHdl( const Link& rLink )
+void EditEngine::SetStatusEventHdl( const Link<>& rLink )
{
pImpEditEngine->SetStatusEventHdl( rLink );
}
-Link EditEngine::GetStatusEventHdl() const
+Link<> EditEngine::GetStatusEventHdl() const
{
return pImpEditEngine->GetStatusEventHdl();
}
-void EditEngine::SetImportHdl( const Link& rLink )
+void EditEngine::SetImportHdl( const Link<>& rLink )
{
pImpEditEngine->aImportHdl = rLink;
}
-Link EditEngine::GetImportHdl() const
+Link<> EditEngine::GetImportHdl() const
{
return pImpEditEngine->aImportHdl;
}
-void EditEngine::SetBeginMovingParagraphsHdl( const Link& rLink )
+void EditEngine::SetBeginMovingParagraphsHdl( const Link<>& rLink )
{
pImpEditEngine->aBeginMovingParagraphsHdl = rLink;
}
-void EditEngine::SetEndMovingParagraphsHdl( const Link& rLink )
+void EditEngine::SetEndMovingParagraphsHdl( const Link<>& rLink )
{
pImpEditEngine->aEndMovingParagraphsHdl = rLink;
}
-void EditEngine::SetBeginPasteOrDropHdl( const Link& rLink )
+void EditEngine::SetBeginPasteOrDropHdl( const Link<>& rLink )
{
pImpEditEngine->aBeginPasteOrDropHdl = rLink;
}
-void EditEngine::SetEndPasteOrDropHdl( const Link& rLink )
+void EditEngine::SetEndPasteOrDropHdl( const Link<>& rLink )
{
pImpEditEngine->aEndPasteOrDropHdl = rLink;
}
@@ -1609,12 +1609,12 @@ OUString EditEngine::GetText( sal_Int32 nPara ) const
return aStr;
}
-void EditEngine::SetModifyHdl( const Link& rLink )
+void EditEngine::SetModifyHdl( const Link<>& rLink )
{
pImpEditEngine->SetModifyHdl( rLink );
}
-Link EditEngine::GetModifyHdl() const
+Link<> EditEngine::GetModifyHdl() const
{
return pImpEditEngine->GetModifyHdl();
}
@@ -2703,23 +2703,23 @@ bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::su
}
/** sets a link that is called at the beginning of a drag operation at an edit view */
-void EditEngine::SetBeginDropHdl( const Link& rLink )
+void EditEngine::SetBeginDropHdl( const Link<>& rLink )
{
pImpEditEngine->SetBeginDropHdl( rLink );
}
-Link EditEngine::GetBeginDropHdl() const
+Link<> EditEngine::GetBeginDropHdl() const
{
return pImpEditEngine->GetBeginDropHdl();
}
/** sets a link that is called at the end of a drag operation at an edit view */
-void EditEngine::SetEndDropHdl( const Link& rLink )
+void EditEngine::SetEndDropHdl( const Link<>& rLink )
{
pImpEditEngine->SetEndDropHdl( rLink );
}
-Link EditEngine::GetEndDropHdl() const
+Link<> EditEngine::GetEndDropHdl() const
{
return pImpEditEngine->GetEndDropHdl();
}
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 4d96e64c8a4b..a1db68fca13e 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -760,7 +760,7 @@ bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWron
return pImpEditView->IsWrongSpelledWord( aPaM , bMarkIfWrong );
}
-void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
+void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack )
{
Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 301b6f92ea08..35fbc7ada465 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -485,16 +485,16 @@ private:
// If it is detected at one point that the StatusHdl has to be called, but
// this should not happen immediately (critical section):
Timer aStatusTimer;
- Link aStatusHdlLink;
- Link aNotifyHdl;
- Link aImportHdl;
- Link aBeginMovingParagraphsHdl;
- Link aEndMovingParagraphsHdl;
- Link aBeginPasteOrDropHdl;
- Link aEndPasteOrDropHdl;
- Link aModifyHdl;
- Link maBeginDropHdl;
- Link maEndDropHdl;
+ Link<> aStatusHdlLink;
+ Link<> aNotifyHdl;
+ Link<> aImportHdl;
+ Link<> aBeginMovingParagraphsHdl;
+ Link<> aEndMovingParagraphsHdl;
+ Link<> aBeginPasteOrDropHdl;
+ Link<> aEndPasteOrDropHdl;
+ Link<> aModifyHdl;
+ Link<> maBeginDropHdl;
+ Link<> maEndDropHdl;
rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
@@ -827,8 +827,8 @@ public:
bool IsModified() const { return aEditDoc.IsModified(); }
void SetModifyFlag( bool b ) { aEditDoc.SetModified( b ); }
- void SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; }
- Link GetModifyHdl() const { return aModifyHdl; }
+ void SetModifyHdl( const Link<>& rLink ) { aModifyHdl = rLink; }
+ Link<> GetModifyHdl() const { return aModifyHdl; }
bool IsInSelectionMode() { return bInSelection; }
@@ -844,11 +844,11 @@ public:
EditPaM InsertParagraph( sal_Int32 nPara );
EditSelection* SelectParagraph( sal_Int32 nPara );
- void SetStatusEventHdl( const Link& rLink ) { aStatusHdlLink = rLink; }
- Link GetStatusEventHdl() const { return aStatusHdlLink; }
+ void SetStatusEventHdl( const Link<>& rLink ) { aStatusHdlLink = rLink; }
+ Link<> GetStatusEventHdl() const { return aStatusHdlLink; }
- void SetNotifyHdl( const Link& rLink ) { aNotifyHdl = rLink; }
- Link GetNotifyHdl() const { return aNotifyHdl; }
+ void SetNotifyHdl( const Link<>& rLink ) { aNotifyHdl = rLink; }
+ Link<> GetNotifyHdl() const { return aNotifyHdl; }
void FormatAndUpdate( EditView* pCurView = 0 );
inline void IdleFormatAndUpdate( EditView* pCurView = 0 );
@@ -1016,12 +1016,12 @@ public:
static void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; }
- Link GetBeginDropHdl() const { return maBeginDropHdl; }
+ void SetBeginDropHdl( const Link<>& rLink ) { maBeginDropHdl = rLink; }
+ Link<> GetBeginDropHdl() const { return maBeginDropHdl; }
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link& rLink ) { maEndDropHdl = rLink; }
- Link GetEndDropHdl() const { return maEndDropHdl; }
+ void SetEndDropHdl( const Link<>& rLink ) { maEndDropHdl = rLink; }
+ Link<> GetEndDropHdl() const { return maEndDropHdl; }
/// specifies if auto-correction should capitalize the first word or not (default is on)
void SetFirstWordCapitalization( bool bCapitalize ) { bFirstWordCapitalization = bCapitalize; }
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 2a822cb0322f..eedcc4e81064 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -802,7 +802,7 @@ void IdleFormattter::ForceTimeout()
if ( IsActive() )
{
Stop();
- ((Link&)GetIdleHdl()).Call( this );
+ ((Link<>&)GetIdleHdl()).Call( this );
}
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 32ccb2cc7a4e..508230231fad 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3315,7 +3315,7 @@ public:
GraphicObject* pGraphicObject;
sal_Int8 nGraphicTransparency; //contains a percentage value which is
//copied to the GraphicObject when necessary
- Link aDoneLink;
+ Link<> aDoneLink;
SvStream* pStream;
SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
@@ -3323,7 +3323,7 @@ public:
-void SvxBrushItem::SetDoneLink( const Link& rLink )
+void SvxBrushItem::SetDoneLink( const Link<>& rLink )
{
pImpl->aDoneLink = rLink;
}
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index a802eedf1fb8..09eebfacf62e 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -81,7 +81,7 @@ public:
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
// belongs into class Outliner, move there before incompatible update!
- Link aOutlinerNotifyHdl;
+ Link<> aOutlinerNotifyHdl;
NotifyList aNotifyCache;
};
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 18a27e1c5826..549f6456cfc6 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -108,33 +108,33 @@ sal_uLong Outliner::GetTextHeight() const
return pEditEngine->GetTextHeight();
}
-void Outliner::SetModifyHdl( const Link& rLink )
+void Outliner::SetModifyHdl( const Link<>& rLink )
{
pEditEngine->SetModifyHdl( rLink );
}
-Link Outliner::GetModifyHdl() const
+Link<> Outliner::GetModifyHdl() const
{
return pEditEngine->GetModifyHdl();
}
-void Outliner::SetNotifyHdl( const Link& rLink )
+void Outliner::SetNotifyHdl( const Link<>& rLink )
{
pEditEngine->aOutlinerNotifyHdl = rLink;
if ( rLink.IsSet() )
pEditEngine->SetNotifyHdl( LINK( this, Outliner, EditEngineNotifyHdl ) );
else
- pEditEngine->SetNotifyHdl( Link() );
+ pEditEngine->SetNotifyHdl( Link<>() );
}
-void Outliner::SetStatusEventHdl( const Link& rLink )
+void Outliner::SetStatusEventHdl( const Link<>& rLink )
{
pEditEngine->SetStatusEventHdl( rLink );
}
-Link Outliner::GetStatusEventHdl() const
+Link<> Outliner::GetStatusEventHdl() const
{
return pEditEngine->GetStatusEventHdl();
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index cecf2b2f3f0d..8f704bb192bf 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2044,25 +2044,25 @@ IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, pNotify )
}
/** sets a link that is called at the beginning of a drag operation at an edit view */
-void Outliner::SetBeginDropHdl( const Link& rLink )
+void Outliner::SetBeginDropHdl( const Link<>& rLink )
{
pEditEngine->SetBeginDropHdl( rLink );
}
/** sets a link that is called at the end of a drag operation at an edit view */
-void Outliner::SetEndDropHdl( const Link& rLink )
+void Outliner::SetEndDropHdl( const Link<>& rLink )
{
pEditEngine->SetEndDropHdl( rLink );
}
/** sets a link that is called before a drop or paste operation. */
-void Outliner::SetBeginPasteOrDropHdl( const Link& rLink )
+void Outliner::SetBeginPasteOrDropHdl( const Link<>& rLink )
{
maBeginPasteOrDropHdl = rLink;
}
/** sets a link that is called after a drop or paste operation. */
-void Outliner::SetEndPasteOrDropHdl( const Link& rLink )
+void Outliner::SetEndPasteOrDropHdl( const Link<>& rLink )
{
maEndPasteOrDropHdl = rLink;
}
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index a41059595a5b..7e5450d7be28 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1376,7 +1376,7 @@ bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIf
return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
}
-void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
+void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link<>* pStartDlg )
{
pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
}
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index a19e42233bdb..fb3311d8f89b 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -66,12 +66,12 @@ public:
void Expand( Paragraph* pParent );
void Collapse( Paragraph* pParent );
- void SetVisibleStateChangedHdl( const Link& rLink ) { aVisibleStateChangedHdl = rLink; }
- Link GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; }
+ void SetVisibleStateChangedHdl( const Link<>& rLink ) { aVisibleStateChangedHdl = rLink; }
+ Link<> GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; }
private:
- Link aVisibleStateChangedHdl;
+ Link<> aVisibleStateChangedHdl;
std::vector<Paragraph*> maEntries;
};
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 2617e35d7f6a..9dd84a1a0041 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -188,7 +188,7 @@ namespace abp
implCleanup();
// reset the click hdl
- m_pCancel->SetClickHdl( Link() );
+ m_pCancel->SetClickHdl( Link<>() );
// simulate the click again - this time, the default handling of the button will strike ....
m_pCancel->Click();
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index f93957962ff9..a282abe51e7c 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -133,7 +133,7 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) );
m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) );
- Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+ Link<> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index b6681c756320..8f5871cd1549 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -348,7 +348,7 @@ MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMa
aListBoxes[0]->InsertEntry(pNames[nField]);
}
- Link aLnk = LINK(this, MappingDialog_Impl, ListBoxSelectHdl);
+ Link<> aLnk = LINK(this, MappingDialog_Impl, ListBoxSelectHdl);
aListBoxes[0]->SelectEntryPos(0);
aListBoxes[0]->SetSelectHdl(aLnk);
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index f6db18010275..717591d65f3f 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<> 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 f7eef64155bd..8e36b56026b9 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<> 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<> aLink, WinBits nStyle = WB_3DLOOK );
virtual ~BibToolBar();
virtual void dispose() SAL_OVERRIDE;
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 7681831adbc6..ee4787c3994a 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -98,8 +98,8 @@ protected:
// will be constantly increased with each message sent
bool m_bValid;
- Link m_aConnectionLostHdl;
- Link m_aNewMessageHdl;
+ Link<> m_aConnectionLostHdl;
+ Link<> m_aNewMessageHdl;
public:
Mediator( int nSocket );
virtual ~Mediator();
@@ -132,16 +132,16 @@ public:
MediatorMessage* GetNextMessage( bool bWait = false );
- Link SetConnectionLostHdl( const Link& rLink )
+ Link<> SetConnectionLostHdl( const Link<>& rLink )
{
- Link aRet = m_aConnectionLostHdl;
+ Link<> aRet = m_aConnectionLostHdl;
m_aConnectionLostHdl = rLink;
return aRet;
}
- Link SetNewMessageHdl( const Link& rLink )
+ Link<> SetNewMessageHdl( const Link<>& rLink )
{
- Link aRet = m_aNewMessageHdl;
+ Link<> aRet = m_aNewMessageHdl;
m_aNewMessageHdl = rLink;
return aRet;
}
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index cec4fe7d1a05..59eb02798d13 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -399,7 +399,7 @@ int main( int argc, char **argv)
#endif
pConnector = new PluginConnector( nSocket );
- pConnector->SetConnectionLostHdl( Link( NULL, GlobalConnectionLostHdl ) );
+ pConnector->SetConnectionLostHdl( Link<>( NULL, GlobalConnectionLostHdl ) );
XtSetLanguageProc( NULL, NULL, NULL );
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 9ae97d364295..59e687149a89 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -39,7 +39,7 @@ namespace pcr
{
VclPtr<OPropertyEditor> m_pPropBox;
sal_uInt16 m_nActivePage;
- Link m_aPageActivationHandler;
+ Link<> m_aPageActivationHandler;
protected:
virtual void Resize() SAL_OVERRIDE;
@@ -58,8 +58,8 @@ namespace pcr
sal_uInt16 getActivaPage() const { return m_nActivePage; }
void activatePage(sal_uInt16 _nPage);
- void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
- Link getPageActivationHandler() const { return m_aPageActivationHandler; }
+ void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; }
+ Link<> getPageActivationHandler() const { return m_aPageActivationHandler; }
::com::sun::star::awt::Size getMinimumSize();
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index a13fd939a3dc..63744f858d1a 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -567,7 +567,7 @@ namespace pcr
else
{
INetURLObject aDocURL( impl_getDocumentURL_nothrow() );
- aPropertyValue <<= URIHelper::SmartRel2Abs( aDocURL, sControlValue, Link(), false, true, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
+ aPropertyValue <<= URIHelper::SmartRel2Abs( aDocURL, sControlValue, Link<>(), false, true, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
}
}
break;
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 3689a775c961..18219bfdf60c 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -68,14 +68,14 @@ namespace pcr
VclPtr<ComboBox> m_pDetailColumn;
VclPtr<ComboBox> m_pMasterColumn;
- Link m_aLinkChangeHandler;
+ Link<> m_aLinkChangeHandler;
public:
FieldLinkRow( vcl::Window* _pParent );
virtual ~FieldLinkRow();
virtual void dispose() SAL_OVERRIDE;
- inline void SetLinkChangeHandler( const Link& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
+ inline void SetLinkChangeHandler( const Link<>& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
enum LinkParticipant
{
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 3a868386d7b0..cd519b8c2ff2 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -57,7 +57,7 @@ namespace pcr
IPropertyLineListener* m_pListener;
IPropertyControlObserver* m_pObserver;
sal_uInt16 m_nNextId;
- Link m_aPageActivationHandler;
+ Link<> m_aPageActivationHandler;
bool m_bHasHelpSection;
sal_Int32 m_nMinHelpLines;
sal_Int32 m_nMaxHelpLines;
@@ -107,8 +107,8 @@ namespace pcr
void RemoveEntry( const OUString& _rName );
void ChangeEntry( const OLineDescriptor& );
- void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
- Link getPageActivationHandler() const { return m_aPageActivationHandler; }
+ void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; }
+ Link<> getPageActivationHandler() const { return m_aPageActivationHandler; }
// #95343# -------------------------------
sal_Int32 getMinimumWidth();
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 43f372deecc1..0d5b30dee61d 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -250,7 +250,7 @@ namespace pcr
if (pData)
m_xSelectedControl = Reference< XPropertySet > (*static_cast<Reference< XPropertySet > *>(pData));
- m_pNoAssignment->SetClickHdl(Link());
+ m_pNoAssignment->SetClickHdl(Link<>());
m_pNoAssignment->Check(pData == NULL);
m_pNoAssignment->SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked));
@@ -286,8 +286,8 @@ namespace pcr
if (m_pLastSelected)
{
- m_pControlTree->SetSelectHdl(Link());
- m_pControlTree->SetDeselectHdl(Link());
+ m_pControlTree->SetSelectHdl(Link<>());
+ m_pControlTree->SetDeselectHdl(Link<>());
m_pControlTree->Select(m_pLastSelected, !m_pNoAssignment->IsChecked());
m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index eca0375a552e..753ab0eea7f9 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -100,7 +100,7 @@ namespace pcr
SQLCommandDesigner::SQLCommandDesigner( const Reference< XComponentContext >& _rxContext,
const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter,
- const ::dbtools::SharedConnection& _rConnection, const Link& _rCloseLink )
+ const ::dbtools::SharedConnection& _rConnection, const Link<>& _rCloseLink )
:m_xContext( _rxContext )
,m_xConnection( _rConnection )
,m_xObjectAdapter( _rxPropertyAdapter )
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index ab1ab945d846..41bb74e5e85f 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -55,7 +55,7 @@ namespace pcr
::dbtools::SharedConnection m_xConnection;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xDesigner;
::rtl::Reference< ISQLCommandAdapter > m_xObjectAdapter;
- Link m_aCloseLink;
+ Link<> m_aCloseLink;
public:
/** creates the instance, and immediately opens the SQL command design frame
@@ -76,7 +76,7 @@ namespace pcr
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter,
const ::dbtools::SharedConnection& _rConnection,
- const Link& _rCloseLink
+ const Link<>& _rCloseLink
);
/** determines whether the SQL Command designer is currently active, i.e.
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 9eb99354abda..aa8e6aff5fd9 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -63,7 +63,7 @@ namespace pcr
{
}
- void SetModifyHdl( const Link& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
+ void SetModifyHdl( const Link<>& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
protected:
bool PreNotify( NotifyEvent& _rNEvt );
@@ -166,7 +166,7 @@ namespace pcr
{
private:
Point m_aMouseButtonDownPos;
- Link m_aClickHandler;
+ Link<> m_aClickHandler;
public:
HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle );
@@ -174,8 +174,8 @@ 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; }
- const Link& GetClickHdl( ) const { return m_aClickHandler; }
+ void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; }
+ const Link<>& GetClickHdl( ) const { return m_aClickHandler; }
protected:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 338e0df2a5aa..06687028a5e8 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -96,7 +96,7 @@ private:
int mnDevice;
SANE_Handle maHandle;
- Link maReloadOptionsLink;
+ Link<> maReloadOptionsLink;
static inline oslGenericFunction
LoadSymbol( const char* );
@@ -168,7 +168,7 @@ public:
bool Start( BitmapTransporter& );
- inline Link SetReloadOptionsHdl( const Link& rLink );
+ inline Link<> SetReloadOptionsHdl( const Link<>& rLink );
};
inline int Sane::GetOptionElements( int n )
@@ -181,9 +181,9 @@ inline int Sane::GetOptionElements( int n )
return 1;
}
-inline Link Sane::SetReloadOptionsHdl( const Link& rLink )
+inline Link<> Sane::SetReloadOptionsHdl( const Link<>& rLink )
{
- Link aRet = maReloadOptionsLink;
+ Link<> aRet = maReloadOptionsLink;
maReloadOptionsLink = rLink;
return aRet;
}
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 6aca2733c3a7..7e689221f037 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -38,7 +38,7 @@ private:
Sane& mrSane;
bool mbScanEnabled;
- Link maOldLink;
+ Link<> maOldLink;
VclPtr<OKButton> mpOKButton;
VclPtr<CancelButton> mpCancelButton;
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 7eb6713bec6b..e6b053dd7ce2 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -83,7 +83,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
ScannerManager& mrMgr;
TW_IDENTITY aAppIdent;
TW_IDENTITY aSrcIdent;
- Link aNotifyLink;
+ Link<> aNotifyLink;
DSMENTRYPROC pDSM;
osl::Module* pMod;
ULONG_PTR nCurState;
@@ -116,7 +116,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
public:
- ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink );
+ ImpTwain( ScannerManager& rMgr, const Link<>& rNotifyLink );
~ImpTwain();
void Destroy();
@@ -150,7 +150,7 @@ LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
}
// #107835# hold reference to ScannerManager, to prevent premature death
-ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
+ImpTwain::ImpTwain( ScannerManager& rMgr, const Link<>& rNotifyLink ) :
mxMgr( uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( &rMgr ), uno::UNO_QUERY) ),
mrMgr( rMgr ),
aNotifyLink( rNotifyLink ),
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index dea223223a1b..fcfd11afbeec 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -135,8 +135,8 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
ResMgr* mpSfxResMgr;
Idle maWaitIdle;
Timer maTimeoutTimer;
- Link maWindowEventHdl;
- Link maApplicationEventHdl;
+ Link<> maWindowEventHdl;
+ Link<> maApplicationEventHdl;
bool mbShowBubble;
bool mbShowMenuIcon;
bool mbBubbleChanged;
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index dfb3763fc5f3..f36d1b0e1ad8 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -244,8 +244,8 @@ private:
XDrawPageSequence mSelectedPages;
XDrawPageSequence mMasterPageTargets;
- Link maOldFieldHdl;
- Link maNewFieldHdl;
+ Link<> maOldFieldHdl;
+ Link<> maNewFieldHdl;
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 3aa472c6e875..6558733c51a1 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -125,7 +125,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
if( !aFileURL.matchIgnoreAsciiCase( OUString("file://") ) )
{
- aFileURL = URIHelper::SmartRel2Abs( INetURLObject(sProgPath), aFileURL, Link(), false );
+ aFileURL = URIHelper::SmartRel2Abs( INetURLObject(sProgPath), aFileURL, Link<>(), false );
}
INetURLObject aURL( aFileURL );
@@ -343,7 +343,7 @@ bool XMLFilterJarHelper::copyFile( Reference< XHierarchicalNameAccess > xIfc, OU
INetURLObject aBaseURL( rTargetURL );
- rURL = URIHelper::SmartRel2Abs( aBaseURL, szPackagePath, Link(), false );
+ rURL = URIHelper::SmartRel2Abs( aBaseURL, szPackagePath, Link<>(), false );
if( !rURL.isEmpty() )
{
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 717463bc5bc5..536e39006127 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -122,7 +122,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox* rURLBox, const OUString& rURL )
else if( !rURL.isEmpty() )
{
OUString aURL( rURL );
- aURL = URIHelper::SmartRel2Abs( INetURLObject(sInstPath), aURL, Link(), false );
+ aURL = URIHelper::SmartRel2Abs( INetURLObject(sInstPath), aURL, Link<>(), false );
osl::FileBase::getSystemPathFromFileURL( aURL, aPath );
rURLBox->SetBaseURL( aURL );
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 6fcdd7d7b67e..3d701f5599ed 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -58,7 +58,7 @@ private:
SvStream* mpStm;
sal_uInt32 mnTransIndex;
bool mbConsInit;
- Link maDoneHdl;
+ Link<> maDoneHdl;
bool ImplImportGraphic( Graphic& rGraphic );
void ImplUpdateData( const Graphic& rGraphic );
@@ -75,8 +75,8 @@ public:
void NewDataAvailable();
- void SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; }
- const Link& GetDoneHdl() const { return maDoneHdl; }
+ void SetDoneHdl( const Link<>& i_rHdl ) { maDoneHdl = i_rHdl; }
+ const Link<>& GetDoneHdl() const { return maDoneHdl; }
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index 6992576793a8..076213da7336 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -30,7 +30,7 @@ namespace frm
{
private:
EditView* m_pView;
- Link m_aInvalidationHandler;
+ Link<> m_aInvalidationHandler;
bool m_bHideInactiveSelection;
public:
@@ -38,7 +38,7 @@ namespace frm
void setView( EditView& _rView );
- inline void setAttributeInvalidationHandler( const Link& _rHandler ) { m_aInvalidationHandler = _rHandler; }
+ inline void setAttributeInvalidationHandler( const Link<>& _rHandler ) { m_aInvalidationHandler = _rHandler; }
void SetHideInactiveSelection( bool _bHide );
bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; }
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index aba773361dcf..dea58d335484 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -30,7 +30,7 @@ class EditBox : public Control
private:
VclPtr<MultiLineEdit> pMEdit;
- Link aSelChangedLink;
+ Link<> aSelChangedLink;
Selection aOldSel;
bool bMouseFlag;
@@ -52,8 +52,8 @@ public:
MultiLineEdit* GetEdit() {return pMEdit;}
- void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; }
- const Link& GetSelChangedHdl() const { return aSelChangedLink; }
+ void SetSelChangedHdl( const Link<>& rLink ) { aSelChangedLink = rLink; }
+ const Link<>& GetSelChangedHdl() const { return aSelChangedLink; }
void UpdateOldSel();
};
@@ -89,12 +89,12 @@ class ArgInput
{
private:
- Link aFxClickLink;
- Link aRefClickLink;
- Link aFxFocusLink;
- Link aRefFocusLink;
- Link aEdFocusLink;
- Link aEdModifyLink;
+ Link<> aFxClickLink;
+ Link<> aRefClickLink;
+ Link<> aFxFocusLink;
+ Link<> aRefFocusLink;
+ Link<> aEdFocusLink;
+ Link<> aEdModifyLink;
VclPtr<FixedText> pFtArg;
VclPtr<PushButton> pBtnFx;
@@ -141,23 +141,23 @@ public:
ArgEdit* GetArgEdPtr() {return pEdArg;}
- void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; }
- const Link& GetFxClickHdl() const { return aFxClickLink; }
+ void SetFxClickHdl( const Link<>& rLink ) { aFxClickLink = rLink; }
+ const Link<>& GetFxClickHdl() const { return aFxClickLink; }
- void SetRefClickHdl( const Link& rLink ) { aRefClickLink = rLink; }
- const Link& GetRefClickHdl() const { return aRefClickLink; }
+ void SetRefClickHdl( const Link<>& rLink ) { aRefClickLink = rLink; }
+ const Link<>& GetRefClickHdl() const { return aRefClickLink; }
- void SetFxFocusHdl( const Link& rLink ) { aFxFocusLink = rLink; }
- const Link& GetFxFocusHdl() const { return aFxFocusLink; }
+ void SetFxFocusHdl( const Link<>& rLink ) { aFxFocusLink = rLink; }
+ const Link<>& GetFxFocusHdl() const { return aFxFocusLink; }
- void SetRefFocusHdl( const Link& rLink ) { aRefFocusLink = rLink; }
- const Link& GetRefFocusHdl() const { return aRefFocusLink; }
+ void SetRefFocusHdl( const Link<>& rLink ) { aRefFocusLink = rLink; }
+ const Link<>& GetRefFocusHdl() const { return aRefFocusLink; }
- void SetEdFocusHdl( const Link& rLink ) { aEdFocusLink = rLink; }
- const Link& GetEdFocusHdl() const { return aEdFocusLink; }
+ void SetEdFocusHdl( const Link<>& rLink ) { aEdFocusLink = rLink; }
+ const Link<>& GetEdFocusHdl() const { return aEdFocusLink; }
- void SetEdModifyHdl( const Link& rLink ) { aEdModifyLink = rLink; }
- const Link& GetEdModifyHdl() const { return aEdModifyLink; }
+ void SetEdModifyHdl( const Link<>& rLink ) { aEdModifyLink = rLink; }
+ const Link<>& GetEdModifyHdl() const { return aEdModifyLink; }
void Hide();
void Show();
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 7f20431ab1bb..1d731535bf1e 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -356,7 +356,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
{
if(aIdle.IsActive())
{
- aIdle.SetIdleHdl(Link());
+ aIdle.SetIdleHdl(Link<>());
aIdle.Stop();
}// if(aIdle.IsActive())
bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus.
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 87a2799dcfac..f49a00dde4d3 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -62,8 +62,8 @@ class FuncPage : public TabPage
{
private:
OModuleClient m_aModuleClient;
- Link aDoubleClickLink;
- Link aSelectionLink;
+ Link<> aDoubleClickLink;
+ Link<> aSelectionLink;
VclPtr<ListBox> m_pLbCategory;
VclPtr<FormulaListBox> m_pLbFunction;
const IFunctionManager*
@@ -100,11 +100,11 @@ public:
const IFunctionDescription* GetFuncDesc( sal_Int32 nPos ) const;
OUString GetSelFunctionName() const;
- void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
- const Link& GetDoubleClickHdl() const { return aDoubleClickLink; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClickLink = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return aDoubleClickLink; }
- void SetSelectHdl( const Link& rLink ) { aSelectionLink = rLink; }
- const Link& GetSelectHdl() const { return aSelectionLink; }
+ void SetSelectHdl( const Link<>& rLink ) { aSelectionLink = rLink; }
+ const Link<>& GetSelectHdl() const { return aSelectionLink; }
};
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 271d8b83cafa..4fe03a17f037 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -133,7 +133,7 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
if ( bDoScroll )
{
pSlider->SetThumbPos( nThumb );
- ((Link&)pSlider->GetEndScrollHdl()).Call( pSlider );
+ ((Link<>&)pSlider->GetEndScrollHdl()).Call( pSlider );
}
else if ( bChangeFocus )
{
@@ -503,7 +503,7 @@ RefEdit::~RefEdit()
void RefEdit::dispose()
{
- aIdle.SetIdleHdl( Link() );
+ aIdle.SetIdleHdl( Link<>() );
aIdle.Stop();
pLabelWidget.clear();
Edit::dispose();
@@ -551,7 +551,7 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel
}
else
{
- aIdle.SetIdleHdl( Link() );
+ aIdle.SetIdleHdl( Link<>() );
aIdle.Stop();
}
}
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 539661b05b1c..f990deae1472 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -228,7 +228,7 @@ void ParaWin::dispose()
{
// #i66422# if the focus changes during destruction of the controls,
// don't call the focus handlers
- Link aEmptyLink;
+ Link<> aEmptyLink;
m_pBtnFx1->SetGetFocusHdl( aEmptyLink );
m_pBtnFx2->SetGetFocusHdl( aEmptyLink );
m_pBtnFx3->SetGetFocusHdl( aEmptyLink );
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 6a83c4d59218..471efa0dfd3c 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -45,9 +45,9 @@ class ParaWin : public TabPage
{
private:
OModuleClient m_aModuleClient;
- Link aScrollLink;
- Link aFxLink;
- Link aArgModifiedLink;
+ Link<> aScrollLink;
+ Link<> aFxLink;
+ Link<> aArgModifiedLink;
::std::vector<sal_uInt16> aVisibleArgMapping;
const IFunctionDescription* pFuncDesc;
@@ -149,14 +149,14 @@ public:
sal_uInt16 GetSliderPos();
void SetSliderPos(sal_uInt16 nSliderPos);
- void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; }
- const Link& GetScrollHdl() const { return aScrollLink; }
+ void SetScrollHdl( const Link<>& rLink ) { aScrollLink = rLink; }
+ const Link<>& GetScrollHdl() const { return aScrollLink; }
- void SetArgModifiedHdl( const Link& rLink ) { aArgModifiedLink = rLink; }
- const Link& GetArgModifiedHdl() const { return aArgModifiedLink; }
+ void SetArgModifiedHdl( const Link<>& rLink ) { aArgModifiedLink = rLink; }
+ const Link<>& GetArgModifiedHdl() const { return aArgModifiedLink; }
- void SetFxHdl( const Link& rLink ) { aFxLink = rLink; }
- const Link& GetFxHdl() const { return aFxLink; }
+ void SetFxHdl( const Link<>& rLink ) { aFxLink = rLink; }
+ const Link<>& GetFxHdl() const { return aFxLink; }
};
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index d0a3b35066e9..250c0f5e12c4 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -71,7 +71,7 @@ class StructPage : public TabPage
{
private:
OModuleClient m_aModuleClient;
- Link aSelLink;
+ Link<> aSelLink;
VclPtr<StructListBox> m_pTlbStruct;
Image maImgEnd;
@@ -100,8 +100,8 @@ public:
virtual OUString GetEntryText(SvTreeListEntry* pEntry) const SAL_OVERRIDE;
virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const SAL_OVERRIDE;
- void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; }
- const Link& GetSelectionHdl() const { return aSelLink; }
+ void SetSelectionHdl( const Link<>& rLink ) { aSelLink = rLink; }
+ const Link<>& GetSelectionHdl() const { return aSelLink; }
};
} // formula
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 5d75edd0e095..b6ae4eb1c492 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -140,12 +140,12 @@ void PlacesListBox::RemoveSelectedPlace() {
RemovePlace(mpImpl->GetCurrRow());
}
-void PlacesListBox::SetAddHdl( const Link& rHdl )
+void PlacesListBox::SetAddHdl( const Link<>& rHdl )
{
mpAddBtn->SetClickHdl( rHdl );
}
-void PlacesListBox::SetDelHdl( const Link& rHdl )
+void PlacesListBox::SetDelHdl( const Link<>& rHdl )
{
mpDelBtn->SetClickHdl( rHdl );
}
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 0cf700d6b142..0d2a4742a958 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -60,8 +60,8 @@ class PlacesListBox : public Control
bool IsUpdated();
const std::vector<PlacePtr>& GetPlaces() { return maPlaces;}
- void SetAddHdl( const Link& rHdl );
- void SetDelHdl( const Link& rHdl );
+ void SetAddHdl( const Link<>& rHdl );
+ void SetDelHdl( const Link<>& rHdl );
void SetDelEnabled( bool enabled );
void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
void updateView( );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 993fd4b88d11..6c6dc7602734 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -426,7 +426,7 @@ void SvtFileDialog::dispose()
makeAny( sUserData ) );
}
- _pFileView->SetSelectHdl( Link() );
+ _pFileView->SetSelectHdl( Link<>() );
// Save bookmarked places
if(_pImp->_pPlaces->IsUpdated()) {
@@ -1752,7 +1752,7 @@ short SvtFileDialog::Execute()
}
-void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
+void SvtFileDialog::StartExecuteModal( const Link<>& rEndDialogHdl )
{
PrepareExecute();
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index d25ce831110e..4f345799fcf0 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -164,9 +164,9 @@ protected:
void EnableInternet( bool bInternet );
// originally from VclFileDialog
- Link _aOKHdl;
- Link _aFileSelectHdl;
- Link _aFilterSelectHdl;
+ Link<> _aOKHdl;
+ Link<> _aFileSelectHdl;
+ Link<> _aFilterSelectHdl;
OUString _aPath;
OUString _aDefExt;
@@ -197,7 +197,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
virtual short Execute() SAL_OVERRIDE;
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
void FileSelect();
void FilterSelect();
@@ -259,12 +259,12 @@ public:
inline void SetDefaultExt( const OUString& rExt );
inline void EraseDefaultExt( sal_Int32 _nIndex = 0 );
inline const OUString& GetDefaultExt() const;
- inline void SetOKHdl( const Link& rLink );
- inline const Link& GetOKHdl() const;
- inline void SetFileSelectHdl( const Link& rLink );
- inline const Link& GetFileSelectHdl() const;
- inline void SetFilterSelectHdl( const Link& rLink );
- inline const Link& GetFilterSelectHdl() const;
+ inline void SetOKHdl( const Link<>& rLink );
+ inline const Link<>& GetOKHdl() const;
+ inline void SetFileSelectHdl( const Link<>& rLink );
+ inline const Link<>& GetFileSelectHdl() const;
+ inline void SetFilterSelectHdl( const Link<>& rLink );
+ inline const Link<>& GetFilterSelectHdl() const;
inline Image GetButtonImage( sal_uInt16 _nButtonId ) const { return m_aImages.GetImage( _nButtonId ); }
@@ -370,7 +370,7 @@ inline const OUString& SvtFileDialog::GetDefaultExt() const
inline void SvtFileDialog::SetOKHdl
(
- const Link& rLink
+ const Link<>& rLink
)
{
_aOKHdl = rLink;
@@ -378,7 +378,7 @@ inline void SvtFileDialog::SetOKHdl
-inline const Link& SvtFileDialog::GetOKHdl() const
+inline const Link<>& SvtFileDialog::GetOKHdl() const
{
return _aOKHdl;
}
@@ -387,7 +387,7 @@ inline const Link& SvtFileDialog::GetOKHdl() const
inline void SvtFileDialog::SetFileSelectHdl
(
- const Link& rLink
+ const Link<>& rLink
)
{
_aFileSelectHdl = rLink;
@@ -395,7 +395,7 @@ inline void SvtFileDialog::SetFileSelectHdl
-inline const Link& SvtFileDialog::GetFileSelectHdl() const
+inline const Link<>& SvtFileDialog::GetFileSelectHdl() const
{
return _aFileSelectHdl;
}
@@ -404,7 +404,7 @@ inline const Link& SvtFileDialog::GetFileSelectHdl() const
inline void SvtFileDialog::SetFilterSelectHdl
(
- const Link& rLink
+ const Link<>& rLink
)
{
_aFilterSelectHdl = rLink;
@@ -412,7 +412,7 @@ inline void SvtFileDialog::SetFilterSelectHdl
-inline const Link& SvtFileDialog::GetFilterSelectHdl() const
+inline const Link<>& SvtFileDialog::GetFilterSelectHdl() const
{
return _aFilterSelectHdl;
}
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 04b986453a21..dd6244b4fe21 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -199,7 +199,7 @@ public:
// access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
Control* GetFilterListControl() { return _pLbFilter; }
const Control* GetFilterListControl() const { return _pLbFilter; }
- inline void SetFilterListSelectHdl( const Link& _rHandler );
+ inline void SetFilterListSelectHdl( const Link<>& _rHandler );
// inits the listbox for the filters from the filter list (_pFilter)
void ClearFilterList( );
@@ -220,7 +220,7 @@ public:
inline void SetCurFilter( SvtFileDialogFilter_Impl* _pFilter );
};
-inline void SvtExpFileDlg_Impl::SetFilterListSelectHdl( const Link& _rHandler )
+inline void SvtExpFileDlg_Impl::SetFilterListSelectHdl( const Link<>& _rHandler )
{
_pLbFilter->SetSelectHdl( _rHandler );
}
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index ed3d82c80e2c..3e39087c2445 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -112,8 +112,8 @@ public:
virtual ~FwkTabWindow();
virtual void dispose() SAL_OVERRIDE;
- void AddEventListener( const Link& rEventListener );
- void RemoveEventListener( const Link& rEventListener );
+ void AddEventListener( const Link<>& rEventListener );
+ void RemoveEventListener( const Link<>& rEventListener );
FwkTabPage* AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< css::beans::NamedValue >& rProperties );
void ActivatePage( sal_Int32 nIndex );
void RemovePage( sal_Int32 nIndex );
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index da2c187e9f68..605b7b18b3cf 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -284,12 +284,12 @@ IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
return 1;
}
-void FwkTabWindow::AddEventListener( const Link& rEventListener )
+void FwkTabWindow::AddEventListener( const Link<>& rEventListener )
{
m_aTabCtrl->AddEventListener( rEventListener );
}
-void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
+void FwkTabWindow::RemoveEventListener( const Link<>& rEventListener )
{
m_aTabCtrl->RemoveEventListener( rEventListener );
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 6ccaf62f89e6..753ca212fd28 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2677,7 +2677,7 @@ throw( uno::RuntimeException, std::exception )
m_bMustDoLayout = true;
if ( !m_aAsyncLayoutTimer.IsActive() )
{
- const Link& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl();
+ const Link<>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl();
if ( aLink.IsSet() )
aLink.Call( &m_aAsyncLayoutTimer );
}
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index a1ab63726d03..bb02d348884c 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -114,7 +114,7 @@ typedef std::vector< SubstituteRule > SubstituteRuleVector;
class SubstitutePathVariables_Impl : public utl::ConfigItem
{
public:
- SubstitutePathVariables_Impl( const Link& aNotifyLink );
+ SubstitutePathVariables_Impl( const Link<>& aNotifyLink );
virtual ~SubstitutePathVariables_Impl();
static OperatingSystem GetOperatingSystemFromString( const OUString& );
@@ -153,7 +153,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
bool m_bHostRetrieved;
OUString m_aHost;
- Link m_aListenerNotify;
+ Link<> m_aListenerNotify;
const OUString m_aSharePointsNodeName;
const OUString m_aDirPropertyName;
const OUString m_aEnvPropertyName;
@@ -395,7 +395,7 @@ EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUStri
return ET_UNKNOWN;
}
-SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyLink ) :
+SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link<>& aNotifyLink ) :
utl::ConfigItem( OUString( "Office.Substitution" )),
m_bYPDomainRetrieved( false ),
m_bDNSDomainRetrieved( false ),
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a517806eb6f4..326d55ea8c3e 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -276,7 +276,7 @@ void ToolBarManager::Destroy()
// #i93173# delete toolbar lazily as we can still be in one of its handlers
m_pToolBar->doLazyDelete();
- Link aEmpty;
+ Link<> aEmpty;
m_pToolBar->SetSelectHdl( aEmpty );
m_pToolBar->SetActivateHdl( aEmpty );
m_pToolBar->SetDeactivateHdl( aEmpty );
@@ -1807,8 +1807,8 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
if (pManagerMenu)
{
// Unlink our listeners again -- see above for why.
- pManagerMenu->SetSelectHdl( Link() );
- pManagerMenu->SetDeactivateHdl( Link() );
+ pManagerMenu->SetSelectHdl( Link<>() );
+ pManagerMenu->SetDeactivateHdl( Link<>() );
}
}
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index c0b84019e1f7..fbe8d1d4e855 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -54,8 +54,8 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener
// Handler-Support:
- Link aErrorHdl; // Error handler
- Link aBreakHdl; // Breakpoint handler
+ Link<> aErrorHdl; // Error handler
+ Link<> aBreakHdl; // Breakpoint handler
bool bNoRtl; // if true: do not search RTL
bool bBreak; // if true: Break, otherwise Step
bool bDocBasic;
@@ -148,14 +148,14 @@ public:
static SbError GetSfxFromVBError( sal_uInt16 nError );
bool IsBreak() const { return bBreak; }
- static Link GetGlobalErrorHdl();
- static void SetGlobalErrorHdl( const Link& rNewHdl );
- Link GetErrorHdl() const { return aErrorHdl; }
- void SetErrorHdl( const Link& r ) { aErrorHdl = r; }
+ static Link<> GetGlobalErrorHdl();
+ static void SetGlobalErrorHdl( const Link<>& rNewHdl );
+ Link<> GetErrorHdl() const { return aErrorHdl; }
+ void SetErrorHdl( const Link<>& r ) { aErrorHdl = r; }
- static void SetGlobalBreakHdl( const Link& rNewHdl );
- Link GetBreakHdl() const { return aBreakHdl; }
- void SetBreakHdl( const Link& r ) { aBreakHdl = r; }
+ static void SetGlobalBreakHdl( const Link<>& rNewHdl );
+ Link<> GetBreakHdl() const { return aBreakHdl; }
+ void SetBreakHdl( const Link<>& r ) { aBreakHdl = r; }
SbxArrayRef getUnoListeners();
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx
index 155630db7e06..789a3fed0d52 100644
--- a/include/dbaccess/AsynchronousLink.hxx
+++ b/include/dbaccess/AsynchronousLink.hxx
@@ -38,7 +38,7 @@ namespace dbaui
*/
class OAsynchronousLink
{
- Link m_aHandler;
+ Link<> m_aHandler;
protected:
::osl::Mutex m_aEventSafety;
@@ -49,7 +49,7 @@ namespace dbaui
/** constructs the object
@param _rHandler The link to be called asynchronously
*/
- OAsynchronousLink( const Link& _rHandler );
+ OAsynchronousLink( const Link<>& _rHandler );
virtual ~OAsynchronousLink();
bool IsRunning() const { return m_nEventId != 0; }
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index b529d318dcd9..0dd5f5c23058 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -98,7 +98,7 @@ public:
Color& GetColor() { return aColor; }
void SetColor( const Color& rCol) { aColor = rCol; }
- void SetDoneLink( const Link& rLink );
+ void SetDoneLink( const Link<>& rLink );
SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 65c57db23329..4ead58f533c9 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -33,6 +33,7 @@
#include <i18nlangtag/lang.h>
#include <tools/lineend.hxx>
+#include <tools/link.hxx>
#include <tools/rtti.hxx>
#include <editeng/eedata.hxx>
@@ -84,7 +85,6 @@ class Size;
class Point;
class Rectangle;
class SvStream;
-class Link;
class OutputDevice;
namespace vcl { class Window; }
class SfxPoolItem;
@@ -345,8 +345,8 @@ public:
void SetModified();
bool IsModified() const;
- void SetModifyHdl( const Link& rLink );
- Link GetModifyHdl() const;
+ void SetModifyHdl( const Link<>& rLink );
+ Link<> GetModifyHdl() const;
bool IsInSelectionMode() const;
@@ -368,14 +368,14 @@ public:
sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
sal_uLong Write( SvStream& rOutput, EETextFormat );
- void SetStatusEventHdl( const Link& rLink );
- Link GetStatusEventHdl() const;
+ void SetStatusEventHdl( const Link<>& rLink );
+ Link<> GetStatusEventHdl() const;
- void SetNotifyHdl( const Link& rLink );
- Link GetNotifyHdl() const;
+ void SetNotifyHdl( const Link<>& rLink );
+ Link<> GetNotifyHdl() const;
- void SetImportHdl( const Link& rLink );
- Link GetImportHdl() const;
+ void SetImportHdl( const Link<>& rLink );
+ Link<> GetImportHdl() const;
// Do not evaluate font formatting => For Outliner
bool IsFlatMode() const;
@@ -464,10 +464,10 @@ public:
CreateTransferable( const ESelection& rSelection ) const;
// MT: Can't create new virtual functions like for ParagraphInserted/Deleted, musst be compatible in SRC638, change later...
- void SetBeginMovingParagraphsHdl( const Link& rLink );
- void SetEndMovingParagraphsHdl( const Link& rLink );
- void SetBeginPasteOrDropHdl( const Link& rLink );
- void SetEndPasteOrDropHdl( const Link& rLink );
+ void SetBeginMovingParagraphsHdl( const Link<>& rLink );
+ void SetEndMovingParagraphsHdl( const Link<>& rLink );
+ void SetBeginPasteOrDropHdl( const Link<>& rLink );
+ void SetEndPasteOrDropHdl( const Link<>& rLink );
virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
virtual void ParagraphInserted( sal_Int32 nNewParagraph );
@@ -519,12 +519,12 @@ public:
static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link& rLink );
- Link GetBeginDropHdl() const;
+ void SetBeginDropHdl( const Link<>& rLink );
+ Link<> GetBeginDropHdl() const;
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link& rLink );
- Link GetEndDropHdl() const;
+ void SetEndDropHdl( const Link<>& rLink );
+ Link<> GetEndDropHdl() const;
/// specifies if auto-correction should capitalize the first word or not (default is on)
void SetFirstWordCapitalization( bool bCapitalize );
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index aec7f03c9939..bb091172c9ba 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -26,6 +26,7 @@
#include <i18nlangtag/lang.h>
#include <tools/color.hxx>
#include <tools/gen.hxx>
+#include <tools/link.hxx>
#include <vcl/cursor.hxx>
#include <editeng/editstat.hxx>
#include <svl/languageoptions.hxx>
@@ -44,7 +45,6 @@ class MouseEvent;
class DropEvent;
class CommandEvent;
class Rectangle;
-class Link;
class Pair;
class Point;
class Range;
@@ -213,7 +213,7 @@ public:
bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false );
bool IsShapeParaFocusable();
bool WrongSpelledBreakPara(sal_Int32 nPara, sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex);
- void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
+ void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 );
void InsertField( const SvxFieldItem& rFld );
const SvxFieldItem* GetFieldUnderMousePointer() const;
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index a767061454cb..01ff1ea7b9a6 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_EDITENG_EDTDLG_HXX
#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
#include <editeng/editengdllapi.h>
#include <i18nlangtag/lang.h>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2
namespace vcl { class Window; }
class ResId;
-class Link;
class SvxSpellWrapper;
class AbstractThesaurusDialog : public VclAbstractDialog
@@ -60,14 +60,14 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
virtual void SetByCharacter( bool _bByCharacter ) = 0;
virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0;
- virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0;
- virtual void SetIgnoreHdl( const Link& _rHdl ) = 0;
- virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0;
- virtual void SetChangeHdl( const Link& _rHdl ) = 0;
- virtual void SetChangeAllHdl( const Link& _rHdl ) = 0;
- virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0;
- virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
- virtual void SetFindHdl( const Link& _rHdl ) = 0;
+ virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetIgnoreHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetChangeHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetChangeAllHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) = 0;
+ virtual void SetFindHdl( const Link<>& _rHdl ) = 0;
virtual bool GetUseBothDirections() const= 0;
virtual editeng::HangulHanjaConversion::ConversionDirection
GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 81fb3561575d..4b47caeb97ec 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -364,7 +364,7 @@ public:
bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false );
bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false );
- void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
+ void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 );
void SetInvalidateMore( sal_uInt16 nPixel );
sal_uInt16 GetInvalidateMore() const;
@@ -589,22 +589,22 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
Paragraph* pHdlParagraph;
sal_Int32 mnFirstSelPage;
- Link aDrawPortionHdl;
- Link aDrawBulletHdl;
- Link aExpandHdl;
- Link aParaInsertedHdl;
- Link aParaRemovingHdl;
- Link aDepthChangedHdl;
- Link aWidthArrReqHdl;
- Link aBeginMovingHdl;
- Link aEndMovingHdl;
- Link aIndentingPagesHdl;
- Link aRemovingPagesHdl;
- Link aFieldClickedHdl;
- Link aCalcFieldValueHdl;
- Link maPaintFirstLineHdl;
- Link maBeginPasteOrDropHdl;
- Link maEndPasteOrDropHdl;
+ Link<> aDrawPortionHdl;
+ Link<> aDrawBulletHdl;
+ Link<> aExpandHdl;
+ Link<> aParaInsertedHdl;
+ Link<> aParaRemovingHdl;
+ Link<> aDepthChangedHdl;
+ Link<> aWidthArrReqHdl;
+ Link<> aBeginMovingHdl;
+ Link<> aEndMovingHdl;
+ Link<> aIndentingPagesHdl;
+ Link<> aRemovingPagesHdl;
+ Link<> aFieldClickedHdl;
+ Link<> aCalcFieldValueHdl;
+ Link<> maPaintFirstLineHdl;
+ Link<> maBeginPasteOrDropHdl;
+ Link<> maEndPasteOrDropHdl;
sal_Int32 nDepthChangedHdlPrevDepth;
ParaFlag mnDepthChangeHdlPrevFlags;
@@ -761,57 +761,57 @@ public:
bool IsExpanding() const { return bIsExpanding; }
void ExpandHdl();
- void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; }
- Link GetExpandHdl() const { return aExpandHdl; }
+ void SetExpandHdl( const Link<>& rLink ) { aExpandHdl = rLink; }
+ Link<> GetExpandHdl() const { return aExpandHdl; }
void ParagraphInsertedHdl();
- void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;}
- Link GetParaInsertedHdl() const { return aParaInsertedHdl; }
+ void SetParaInsertedHdl(const Link<>& rLink){aParaInsertedHdl=rLink;}
+ Link<> GetParaInsertedHdl() const { return aParaInsertedHdl; }
void ParagraphRemovingHdl();
- void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;}
- Link GetParaRemovingHdl() const { return aParaRemovingHdl; }
+ void SetParaRemovingHdl(const Link<>& rLink){aParaRemovingHdl=rLink;}
+ Link<> GetParaRemovingHdl() const { return aParaRemovingHdl; }
void DepthChangedHdl();
- void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;}
- Link GetDepthChangedHdl() const { return aDepthChangedHdl; }
+ void SetDepthChangedHdl(const Link<>& rLink){aDepthChangedHdl=rLink;}
+ Link<> GetDepthChangedHdl() const { return aDepthChangedHdl; }
sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); }
ParaFlag GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
bool RemovingPagesHdl( OutlinerView* );
- void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;}
- Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
+ void SetRemovingPagesHdl(const Link<>& rLink){aRemovingPagesHdl=rLink;}
+ Link<> GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
long IndentingPagesHdl( OutlinerView* );
- void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;}
- Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
+ void SetIndentingPagesHdl(const Link<>& rLink){aIndentingPagesHdl=rLink;}
+ Link<> GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
// valid only in the two upper handlers
sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
// valid only in the two upper handlers
sal_Int32 GetFirstSelPage() const { return mnFirstSelPage; }
- void SetCalcFieldValueHdl(const Link& rLink ) { aCalcFieldValueHdl= rLink; }
- Link GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
+ void SetCalcFieldValueHdl(const Link<>& rLink ) { aCalcFieldValueHdl= rLink; }
+ Link<> GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
- void SetFieldClickedHdl(const Link& rLink ) { aFieldClickedHdl= rLink; }
- Link GetFieldClickedHdl() const { return aFieldClickedHdl; }
+ void SetFieldClickedHdl(const Link<>& rLink ) { aFieldClickedHdl= rLink; }
+ Link<> GetFieldClickedHdl() const { return aFieldClickedHdl; }
- void SetDrawPortionHdl(const Link& rLink){aDrawPortionHdl=rLink;}
- Link GetDrawPortionHdl() const { return aDrawPortionHdl; }
+ void SetDrawPortionHdl(const Link<>& rLink){aDrawPortionHdl=rLink;}
+ Link<> GetDrawPortionHdl() const { return aDrawPortionHdl; }
- void SetDrawBulletHdl(const Link& rLink){aDrawBulletHdl=rLink;}
- Link GetDrawBulletHdl() const { return aDrawBulletHdl; }
+ void SetDrawBulletHdl(const Link<>& rLink){aDrawBulletHdl=rLink;}
+ Link<> GetDrawBulletHdl() const { return aDrawBulletHdl; }
- void SetPaintFirstLineHdl(const Link& rLink) { maPaintFirstLineHdl = rLink; }
- Link GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; }
+ void SetPaintFirstLineHdl(const Link<>& rLink) { maPaintFirstLineHdl = rLink; }
+ Link<> GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; }
- void SetModifyHdl( const Link& rLink );
- Link GetModifyHdl() const;
+ void SetModifyHdl( const Link<>& rLink );
+ Link<> GetModifyHdl() const;
- void SetNotifyHdl( const Link& rLink );
+ void SetNotifyHdl( const Link<>& rLink );
- void SetStatusEventHdl( const Link& rLink );
- Link GetStatusEventHdl() const;
+ void SetStatusEventHdl( const Link<>& rLink );
+ Link<> GetStatusEventHdl() const;
void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
@@ -893,16 +893,16 @@ public:
// Returns an array containing the widths of the Bullet Indentations
// Last value must be -1. Is deleted by the outliner.
- Link GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
- void SetWidthArrReqHdl(const Link& rLink){aWidthArrReqHdl=rLink; }
+ Link<> GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
+ void SetWidthArrReqHdl(const Link<>& rLink){aWidthArrReqHdl=rLink; }
void SetControlWord( EEControlBits nWord );
EEControlBits GetControlWord() const;
- Link GetBeginMovingHdl() const { return aBeginMovingHdl; }
- void SetBeginMovingHdl(const Link& rLink) {aBeginMovingHdl=rLink;}
- Link GetEndMovingHdl() const {return aEndMovingHdl;}
- void SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;}
+ Link<> GetBeginMovingHdl() const { return aBeginMovingHdl; }
+ void SetBeginMovingHdl(const Link<>& rLink) {aBeginMovingHdl=rLink;}
+ Link<> GetEndMovingHdl() const {return aEndMovingHdl;}
+ void SetEndMovingHdl( const Link<>& rLink){aEndMovingHdl=rLink;}
sal_uLong GetLineCount( sal_Int32 nParagraph ) const;
sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const;
@@ -989,18 +989,18 @@ public:
void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link& rLink );
+ void SetBeginDropHdl( const Link<>& rLink );
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link& rLink );
+ void SetEndDropHdl( const Link<>& rLink );
/** sets a link that is called before a drop or paste operation. */
- void SetBeginPasteOrDropHdl( const Link& rLink );
- Link GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; }
+ void SetBeginPasteOrDropHdl( const Link<>& rLink );
+ Link<> GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; }
/** sets a link that is called after a drop or paste operation. */
- void SetEndPasteOrDropHdl( const Link& rLink );
- Link GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; }
+ void SetEndPasteOrDropHdl( const Link<>& rLink );
+ Link<> GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; }
sal_Int16 GetNumberingStartValue( sal_Int32 nPara );
void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue );
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index b9d8d8607773..cf4b02c15bbd 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -94,15 +94,15 @@ namespace sfx2
class SfxLinkItem : public SfxPoolItem
{
- Link aLink;
+ Link<> aLink;
public:
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
{ return new SfxLinkItem( *this ); }
virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
{ return static_cast<const SfxLinkItem&>(rL).aLink == aLink; }
- SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
+ SfxLinkItem( sal_uInt16 nWhichId, const Link<>& rValue ) : SfxPoolItem( nWhichId )
{ aLink = rValue; }
- const Link& GetValue() const { return aLink; }
+ const Link<>& GetValue() const { return aLink; }
};
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 99feed27df20..9d5e507c8d60 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -167,7 +167,7 @@ struct SingleTabDlgImpl
VclPtr<SfxTabPage> m_pSfxPage;
VclPtr<FixedLine> m_pLine;
OUString m_sInfoURL;
- Link m_aInfoLink;
+ Link<> m_aInfoLink;
SingleTabDlgImpl();
};
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index babea564b5df..ff40465676f0 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -438,7 +438,7 @@ private:
SvNumberFormatter m_aNumberFormatter;
Idle m_aEditLoseFocusIdle;
Idle m_aBoxLoseFocusIdle;
- Link m_aRemovedHdl;
+ Link<> m_aRemovedHdl;
DECL_LINK( TypeHdl, CustomPropertiesTypeBox* );
DECL_LINK( RemoveHdl, CustomPropertiesRemoveButton* );
@@ -470,7 +470,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
GetCustomProperties() const;
- void SetRemovedHdl( const Link& rLink ) { m_aRemovedHdl = rLink; }
+ void SetRemovedHdl( const Link<>& rLink ) { m_aRemovedHdl = rLink; }
void InitRemoveButton(const ScrollBar &rScrollBar);
void updateLineWidth();
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index f6f4fb16669c..389829fec857 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -135,8 +135,8 @@ public:
const OUString& GetPhysicalName() const;
SAL_WARN_UNUSED_RESULT bool IsRemote() const;
SAL_WARN_UNUSED_RESULT bool IsOpen() const; // { return aStorage.Is() || pInStream; }
- void Download( const Link& aLink = Link());
- void SetDoneLink( const Link& rLink );
+ void Download( const Link<>& aLink = Link<>());
+ void SetDoneLink( const Link<>& rLink );
sal_uInt32 GetErrorCode() const;
sal_uInt32 GetError() const
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index 62d43deee264..95108a24b8d7 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC DocumentInserter
private:
OUString m_sDocFactory;
OUString m_sFilter;
- Link m_aDialogClosedLink;
+ Link<> m_aDialogClosedLink;
sal_Int64 const m_nDlgFlags;
ErrCode m_nError;
@@ -55,7 +55,7 @@ public:
bool const bEnableMultiSelection = false);
~DocumentInserter();
- void StartExecuteModal( const Link& _rDialogClosedLink );
+ void StartExecuteModal( const Link<>& _rDialogClosedLink );
SfxMedium* CreateMedium();
SfxMediumList* CreateMediumList();
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 6254094fc2a2..53a4fc3fafc5 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -92,7 +92,7 @@ public:
};
private:
- Link m_aDialogClosedLink;
+ Link<> m_aDialogClosedLink;
ErrCode m_nError;
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
@@ -131,7 +131,7 @@ public:
virtual ~FileDialogHelper();
ErrCode Execute();
- void StartExecuteModal( const Link& rEndDialogHdl );
+ void StartExecuteModal( const Link<>& rEndDialogHdl );
inline ErrCode GetError() const { return m_nError; }
sal_Int16 GetDialogType() const;
bool IsPasswordEnabled() const;
diff --git a/include/sfx2/genlink.hxx b/include/sfx2/genlink.hxx
index b9e23e5127e9..5c738e3dd902 100644
--- a/include/sfx2/genlink.hxx
+++ b/include/sfx2/genlink.hxx
@@ -25,13 +25,13 @@ typedef long (*CFuncPtr)(void*);
class GenLink
{
- Link aLink;
+ Link<> aLink;
CFuncPtr pFunc;
public:
GenLink(): pFunc(0) {}
GenLink( CFuncPtr pCFunc ): pFunc(pCFunc) {}
- GenLink( const Link& rLink ): aLink(rLink), pFunc(0) {}
+ GenLink( const Link<>& rLink ): aLink(rLink), pFunc(0) {}
GenLink( const GenLink& rOrig ):
aLink(rOrig.aLink), pFunc(rOrig.pFunc) {}
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index c39e5310ef67..0a2fbc163db3 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -85,7 +85,7 @@ public:
virtual bool IsDataComplete() const;
// Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog
- virtual void Edit( vcl::Window *, SvBaseLink *, const Link& rEndEditHdl );
+ virtual void Edit( vcl::Window *, SvBaseLink *, const Link<>& rEndEditHdl );
void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType,
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 4b04b34eb4a9..3cac2f58934a 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -146,7 +146,7 @@ public:
void Disconnect();
// Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
- virtual void Edit( vcl::Window*, const Link& rEndEditHdl );
+ virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl );
// should the link appear in the dialog? (to the left in the link in the...)
bool IsVisible() const { return bVisible; }
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 799f7b40662e..0c91fab65ccd 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -79,7 +79,7 @@ public:
class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog
{
public:
- virtual void SetApplyHdl( const Link& rLink ) = 0;
+ virtual void SetApplyHdl( const Link<>& rLink ) = 0;
};
class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 88a05b95ea30..6a4f18445159 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -207,14 +207,14 @@ public:
void RemoveStandardButton();
short Execute() SAL_OVERRIDE;
- void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
void Start( bool bShow = true );
const SfxItemSet* GetExampleSet() const { return pExampleSet; }
SfxItemSet* GetExampleSet() { return pExampleSet; }
SfxViewFrame* GetViewFrame() const { return pFrame; }
- void SetApplyHandler(const Link& _rHdl);
+ void SetApplyHandler(const Link<>& _rHdl);
SAL_DLLPRIVATE void Start_Impl();
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 402d0c1df6e6..9de550e2b437 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -104,7 +104,7 @@ class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusList
{
bool m_bFloating;
bool m_bCascading;
- Link m_aDeleteLink;
+ Link<> m_aDeleteLink;
sal_uInt16 m_nId;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
SfxFrameStatusListener* m_pStatusListener;
@@ -157,7 +157,7 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
void StartCascading();
- SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink )
+ SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link<>& rLink )
{
m_aDeleteLink = rLink;
}
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index e7ce608606fd..d85e45a21f52 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -115,9 +115,9 @@ public:
// Check if the root region is visible or not.
bool isNonRootRegionVisible () const { return mnCurRegionId > 0;}
- void setOpenRegionHdl(const Link &rLink);
+ void setOpenRegionHdl(const Link<> &rLink);
- void setOpenTemplateHdl (const Link &rLink);
+ void setOpenTemplateHdl (const Link<> &rLink);
static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
@@ -141,8 +141,8 @@ protected:
VclPtr<PushButton> maAllButton;
VclPtr<FixedText> maFTName;
- Link maOpenRegionHdl;
- Link maOpenTemplateHdl;
+ Link<> maOpenRegionHdl;
+ Link<> maOpenTemplateHdl;
};
#endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 913aed308a34..7a04eb2daef2 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -241,7 +241,7 @@ public:
void sortItems (const boost::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func);
- void setItemStateHdl (const Link &aLink) { maItemStateHdl = aLink; }
+ void setItemStateHdl (const Link<> &aLink) { maItemStateHdl = aLink; }
virtual void Resize() SAL_OVERRIDE;
@@ -329,7 +329,7 @@ protected:
bool mbShowTooltips : 1;
Color maColor;
- Link maItemStateHdl;
+ Link<> maItemStateHdl;
ThumbnailItemAttributes *mpItemAttrs;
drawinglayer::processor2d::BaseProcessor2D *mpProcessor;
boost::function<bool (const ThumbnailViewItem*) > maFilterFunc;
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index a4c7bbcdb920..48238af77081 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -120,7 +120,7 @@ public:
const Point& getPrev1Pos () const { return maPrev1Pos; }
- void setSelectClickHdl (const Link &link);
+ void setSelectClickHdl (const Link<> &link);
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
@@ -136,7 +136,7 @@ protected:
Point maTextPos;
Point maPrev1Pos;
Rectangle maDrawArea;
- Link maClickHdl;
+ Link<> maClickHdl;
bool mbEditTitle;
VclPtr<VclMultiLineEdit> mpTitleED;
Rectangle maTextEditMaxArea;
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index e09884f1954e..f86245c69de6 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -61,13 +61,13 @@ namespace sfx2
@return
the ID of the newly created toolbox item
*/
- sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback )
+ sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback )
{
return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
}
- void SetEndDockingHdl( const Link& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
- const Link& GetEndDockingHdl() const { return m_aEndDockingHdl; }
+ void SetEndDockingHdl( const Link<>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
+ const Link<>& GetEndDockingHdl() const { return m_aEndDockingHdl; }
/** resets the toolbox. Upon return, the only item in the toolbox is the closer.
*/
@@ -111,7 +111,7 @@ namespace sfx2
/** internal version of AddDropDownToolBoxItem
*/
- sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback );
+ sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback );
/** returns the current title.
@@ -131,7 +131,7 @@ namespace sfx2
VclPtr<ToolBox> m_aToolbox;
VclPtr<Window> m_aContentWindow;
- Link m_aEndDockingHdl;
+ Link<> m_aEndDockingHdl;
/** The border that is painted around the inner window. The bevel
shadow lines are part of the border, so where the border is 0 no
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index f272b72b72ca..598aa3d7c384 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -98,8 +98,8 @@ protected:
short nType;
sal_IntPtr nId;
sal_IntPtr nTime;
- Link aData;
- Link aDone;
+ Link<> aData;
+ Link<> aDone;
bool bBusy;
DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 );
@@ -112,11 +112,11 @@ public:
void Execute();
- void SetDataHdl( const Link& rLink ) { aData = rLink; }
- const Link& GetDataHdl() const { return aData; }
+ void SetDataHdl( const Link<>& rLink ) { aData = rLink; }
+ const Link<>& GetDataHdl() const { return aData; }
- void SetDoneHdl( const Link& rLink ) { aDone = rLink; }
- const Link& GetDoneHdl() const { return aDone; }
+ void SetDoneHdl( const Link<>& rLink ) { aDone = rLink; }
+ const Link<>& GetDoneHdl() const { return aDone; }
void SetFormat( SotClipboardFormatId nFmt ) { aDdeData.SetFormat( nFmt ); }
SotClipboardFormatId GetFormat() const { return aDdeData.GetFormat(); }
@@ -138,14 +138,14 @@ private:
class SVL_DLLPUBLIC DdeLink : public DdeTransaction
{
- Link aNotify;
+ Link<> aNotify;
public:
DdeLink( DdeConnection&, const OUString&, long = 0 );
virtual ~DdeLink();
- void SetNotifyHdl( const Link& rLink ) { aNotify = rLink; }
- const Link& GetNotifyHdl() const { return aNotify; }
+ void SetNotifyHdl( const Link<>& rLink ) { aNotify = rLink; }
+ const Link<>& GetNotifyHdl() const { return aNotify; }
virtual void Notify();
};
@@ -310,11 +310,11 @@ private:
DdeString* pName;
OUString aItem;
std::vector<DdeItem*> aItems;
- Link aConnectLink;
- Link aDisconnectLink;
- Link aGetLink;
- Link aPutLink;
- Link aExecLink;
+ Link<> aConnectLink;
+ Link<> aDisconnectLink;
+ Link<> aGetLink;
+ Link<> aPutLink;
+ Link<> aExecLink;
public:
DdeTopic( SAL_UNUSED_PARAMETER const OUString& );
@@ -323,16 +323,16 @@ public:
const OUString GetName() const;
long GetConvId();
- void SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; }
- const Link& GetConnectHdl() const { return aConnectLink; }
- void SetDisconnectHdl( const Link& rLink ) { aDisconnectLink = rLink; }
- const Link& GetDisconnectHdl() const { return aDisconnectLink; }
- void SetGetHdl( const Link& rLink ) { aGetLink = rLink; }
- const Link& GetGetHdl() const { return aGetLink; }
- void SetPutHdl( const Link& rLink ) { aPutLink = rLink; }
- const Link& GetPutHdl() const { return aPutLink; }
- void SetExecuteHdl( const Link& rLink ) { aExecLink = rLink; }
- const Link& GetExecuteHdl() const { return aExecLink; }
+ void SetConnectHdl( const Link<>& rLink ) { aConnectLink = rLink; }
+ const Link<>& GetConnectHdl() const { return aConnectLink; }
+ void SetDisconnectHdl( const Link<>& rLink ) { aDisconnectLink = rLink; }
+ const Link<>& GetDisconnectHdl() const { return aDisconnectLink; }
+ void SetGetHdl( const Link<>& rLink ) { aGetLink = rLink; }
+ const Link<>& GetGetHdl() const { return aGetLink; }
+ void SetPutHdl( const Link<>& rLink ) { aPutLink = rLink; }
+ const Link<>& GetPutHdl() const { return aPutLink; }
+ void SetExecuteHdl( const Link<>& rLink ) { aExecLink = rLink; }
+ const Link<>& GetExecuteHdl() const { return aExecLink; }
void NotifyClient( const OUString& );
bool IsSystemTopic();
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 7bfee23f6638..125234ea9921 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -51,7 +51,7 @@ namespace URIHelper {
*/
SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
OUString const & rTheRelURIRef,
- Link const & rMaybeFileHdl = Link(),
+ Link<> const & rMaybeFileHdl = Link<>(),
bool bCheckFileExists = true,
bool bIgnoreFragment = false,
INetURLObject::EncodeMechanism eEncodeMechanism = INetURLObject::WAS_ENCODED,
@@ -60,9 +60,9 @@ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
bool bRelativeNonURIs = false,
INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
-SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
+SVL_DLLPUBLIC void SetMaybeFileHdl(Link<> const & rTheMaybeFileHdl);
-SVL_DLLPUBLIC Link GetMaybeFileHdl();
+SVL_DLLPUBLIC Link<> GetMaybeFileHdl();
/**
Converts a URI reference to a relative one, ignoring certain differences (for
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index f9a116b26f70..f4888015d6bd 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -338,7 +338,7 @@ public:
~SvNumberFormatter();
/// Set CallBack to ColorTable
- void SetColorLink( const Link& rColorTableCallBack );
+ void SetColorLink( const Link<>& rColorTableCallBack );
/// Do the CallBack to ColorTable
Color* GetUserDefColor(sal_uInt16 nIndex);
@@ -789,7 +789,7 @@ private:
OnDemandNativeNumberWrapper xNatNum; // Native number service loaded on demand
ImpSvNumberInputScan* pStringScanner; // Input string scanner
ImpSvNumberformatScan* pFormatScanner; // Format code string scanner
- Link aColorLink; // User defined color table CallBack
+ Link<> aColorLink; // User defined color table CallBack
sal_uInt32 MaxCLOffset; // Max language/country offset used
sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale
LanguageType IniLnge; // Initialized setting language/country
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 9c17ecea0191..83444ea0788c 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -24,14 +24,14 @@
class DetailsContainer
{
private:
- Link m_aChangeHdl;
+ Link<> m_aChangeHdl;
VclPtr<VclFrame> m_pFrame;
public:
DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame );
virtual ~DetailsContainer( );
- void setChangeHdl( const Link& rLink ) { m_aChangeHdl = rLink; }
+ void setChangeHdl( const Link<>& rLink ) { m_aChangeHdl = rLink; }
virtual void show( bool bShow = true );
virtual INetURLObject getUrl( );
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index fea886db2a4e..070d980964c2 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -32,7 +32,7 @@ namespace svtools {
class SVT_DLLPUBLIC AsynchronLink
{
- Link _aLink;
+ Link<> _aLink;
ImplSVEvent * _nEventId;
Idle* _pIdle;
bool _bInCall;
@@ -44,7 +44,7 @@ class SVT_DLLPUBLIC AsynchronLink
SVT_DLLPRIVATE void Call_Impl( void* pArg );
public:
- AsynchronLink( const Link& rLink )
+ AsynchronLink( const Link<>& rLink )
: _aLink( rLink )
, _nEventId( 0 )
, _pIdle( 0 )
@@ -64,11 +64,11 @@ public:
~AsynchronLink();
void CreateMutex();
- void operator=( const Link& rLink ) { _aLink = rLink; }
+ void operator=( const Link<>& rLink ) { _aLink = rLink; }
void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false );
void ClearPendingCall( );
bool IsSet() const { return _aLink.IsSet(); }
- Link GetLink() const { return _aLink; }
+ Link<> GetLink() const { return _aLink; }
};
}
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index ec6327656110..cc87c68ce50f 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -216,11 +216,11 @@ private:
mbSelLeft:1,
mbAllSel:1,
mbDropPos:1;
- Link maSelectionChangingHdl;
- Link maDateRangeChangedHdl;
- Link maRequestDateInfoHdl;
- Link maDoubleClickHdl;
- Link maSelectHdl;
+ Link<> maSelectionChangingHdl;
+ Link<> maDateRangeChangedHdl;
+ Link<> maRequestDateInfoHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maSelectHdl;
Timer maDragScrollTimer;
sal_uInt16 mnDragScrollHitTest;
@@ -320,16 +320,16 @@ public:
Size CalcWindowSizePixel( long nCalcMonthPerLine = 1,
long nCalcLines = 1 ) const;
- void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; }
- const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
- void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; }
- const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
- void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; }
- const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
+ void SetSelectionChangingHdl( const Link<>& rLink ) { maSelectionChangingHdl = rLink; }
+ const Link<>& GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
+ void SetDateRangeChangedHdl( const Link<>& rLink ) { maDateRangeChangedHdl = rLink; }
+ const Link<>& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
+ void SetRequestDateInfoHdl( const Link<>& rLink ) { maRequestDateInfoHdl = rLink; }
+ const Link<>& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
};
inline const Color& Calendar::GetStandardColor() const
@@ -409,7 +409,7 @@ private:
Date maDefaultDate;
bool mbToday;
bool mbNone;
- Link maSelectHdl;
+ Link<> maSelectHdl;
DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* );
DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* );
@@ -437,8 +437,8 @@ public:
void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; }
WinBits GetCalendarStyle() const { return mnCalendarStyle; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
protected:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx
index 5df3ae5350c0..e9af235b1203 100644
--- a/include/svtools/cliplistener.hxx
+++ b/include/svtools/cliplistener.hxx
@@ -31,11 +31,11 @@ namespace vcl { class Window; }
class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1<
::com::sun::star::datatransfer::clipboard::XClipboardListener >
{
- Link aLink;
+ Link<> aLink;
public:
// Link is called with a TransferableDataHelper pointer
- TransferableClipboardListener( const Link& rCallback );
+ TransferableClipboardListener( const Link<>& rCallback );
virtual ~TransferableClipboardListener();
void AddRemoveListener( vcl::Window* pWin, bool bAdd );
diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx
index 86d5dff1c7c9..8155ffa5fe1e 100644
--- a/include/svtools/dialogclosedlistener.hxx
+++ b/include/svtools/dialogclosedlistener.hxx
@@ -46,12 +46,12 @@ namespace svt
The link must have the type:
DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
*/
- Link m_aDialogClosedLink;
+ Link<> m_aDialogClosedLink;
public:
DialogClosedListener();
- inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; }
+ inline void SetDialogClosedLink( const Link<>& rLink ) { m_aDialogClosedLink = rLink; }
// XDialogClosedListener methods
virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index bd96141dc2f8..5fdfc3758b7b 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -111,7 +111,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const;
- virtual void SetModifyHdl(const Link& rLink) = 0;
+ virtual void SetModifyHdl(const Link<>& rLink) = 0;
virtual bool WantMouseEvent() const;
};
@@ -146,7 +146,7 @@ namespace svt
virtual void SetModified() = 0;
virtual bool IsModified() const = 0;
virtual void ClearModified() = 0;
- virtual void SetModifyHdl( const Link& _rLink ) = 0;
+ virtual void SetModifyHdl( const Link<>& _rLink ) = 0;
};
@@ -182,7 +182,7 @@ namespace svt
virtual void SetModified() SAL_OVERRIDE;
virtual bool IsModified() const SAL_OVERRIDE;
virtual void ClearModified() SAL_OVERRIDE;
- virtual void SetModifyHdl( const Link& _rLink ) SAL_OVERRIDE;
+ virtual void SetModifyHdl( const Link<>& _rLink ) SAL_OVERRIDE;
};
#include <svtools/editimplementation.hxx>
@@ -251,7 +251,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE;
- virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
};
@@ -271,7 +271,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE;
- virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
};
@@ -281,7 +281,7 @@ namespace svt
{
VclPtr<CheckBox> pBox;
Rectangle aFocusRect;
- Link m_aClickLink,m_aModifyLink;
+ Link<> m_aClickLink,m_aModifyLink;
public:
CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0);
@@ -296,11 +296,11 @@ namespace svt
virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
- void SetClickHdl(const Link& rHdl) {m_aClickLink = rHdl;}
- const Link& GetClickHdl() const {return m_aClickLink;}
+ void SetClickHdl(const Link<>& rHdl) {m_aClickLink = rHdl;}
+ const Link<>& GetClickHdl() const {return m_aClickLink;}
- void SetModifyHdl(const Link& rHdl) {m_aModifyLink = rHdl;}
- const Link& GetModifyHdl() const {return m_aModifyLink;}
+ void SetModifyHdl(const Link<>& rHdl) {m_aModifyLink = rHdl;}
+ const Link<>& GetModifyHdl() const {return m_aModifyLink;}
CheckBox& GetBox() {return *pBox;};
@@ -323,7 +323,7 @@ namespace svt
virtual void ClearModified() SAL_OVERRIDE;
protected:
- virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
virtual bool WantMouseEvent() const SAL_OVERRIDE;
};
@@ -357,7 +357,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE;
- virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
};
@@ -391,7 +391,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE;
- virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE;
+ virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
};
diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx
index edf3e8f22369..4140388fcea4 100644
--- a/include/svtools/editimplementation.hxx
+++ b/include/svtools/editimplementation.hxx
@@ -136,7 +136,7 @@ void GenericEditImplementation< EDIT >::ClearModified()
template <class EDIT>
-void GenericEditImplementation< EDIT >::SetModifyHdl( const Link& _rLink )
+void GenericEditImplementation< EDIT >::SetModifyHdl( const Link<>& _rLink )
{
m_rEdit.SetModifyHdl( _rLink );
}
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 20506dbd7b51..bc8c96a58a1a 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -60,7 +60,7 @@ private:
OUString maButtonText;
bool mbOpenDlg;
- Link maDialogCreatedHdl;
+ Link<> maDialogCreatedHdl;
FileControlMode mnFlags;
FileControlMode_Internal mnInternalFlags;
@@ -100,8 +100,8 @@ public:
//use this to manipulate the dialog bevore executing it:
- void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
- const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
+ void SetDialogCreatedHdl( const Link<>& rLink ) { maDialogCreatedHdl = rLink; }
+ const Link<>& GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
};
#endif
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 690efd1aa076..09affbebaf75 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<> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result
FileViewAsyncAction()
{
@@ -157,9 +157,9 @@ public:
void SetNoSelection();
- void SetSelectHdl( const Link& rHdl );
- void SetDoubleClickHdl( const Link& rHdl );
- void SetOpenDoneHdl( const Link& rHdl );
+ void SetSelectHdl( const Link<>& rHdl );
+ void SetDoubleClickHdl( const Link<>& rHdl );
+ void SetOpenDoneHdl( const Link<>& rHdl );
sal_uLong GetSelectionCount() const;
SvTreeListEntry* FirstSelected() const;
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index b4913398d549..0c25f90bf587 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -184,7 +184,7 @@ private:
GraphicType meType;
GraphicManager* mpMgr;
OUString maLink;
- Link* mpSwapStreamHdl;
+ Link<>* mpSwapStreamHdl;
OUString maUserData;
Timer* mpSwapOutTimer;
GrfSimpleCacheObj* mpSimpleCache;
@@ -349,7 +349,7 @@ public:
bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); }
void SetSwapStreamHdl();
- void SetSwapStreamHdl(const Link& rHdl);
+ void SetSwapStreamHdl(const Link<>& rHdl);
sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); }
void FireSwapInRequest();
@@ -425,7 +425,7 @@ public:
bool IsAnimated() const { return mbAnimated; }
bool IsEPS() const { return mbEPS; }
- Link GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); }
+ Link<> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); }
bool SwapOut();
bool SwapOut( SvStream* pOStm );
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 7ca5334044a6..0f411f264780 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -249,12 +249,12 @@ private:
bool mbOutDrag;
bool mbButtonStyle;
bool mbItemMode;
- Link maStartDragHdl;
- Link maDragHdl;
- Link maEndDragHdl;
- Link maSelectHdl;
- Link maDoubleClickHdl;
- Link maCreateAccessibleHdl;
+ Link<> maStartDragHdl;
+ Link<> maDragHdl;
+ Link<> maEndDragHdl;
+ Link<> maSelectHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maCreateAccessibleHdl;
VCLXHeaderBar* m_pVCLXHeaderBar;
@@ -348,18 +348,18 @@ public:
inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); }
inline const OString& GetHelpId() const { return Window::GetHelpId(); }
- inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; }
- inline const Link& GetStartDragHdl() const { return maStartDragHdl; }
- inline void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; }
- inline const Link& GetDragHdl() const { return maDragHdl; }
- inline void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; }
- inline const Link& GetEndDragHdl() const { return maEndDragHdl; }
- inline void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- inline const Link& GetSelectHdl() const { return maSelectHdl; }
- inline void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- inline const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
- inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; }
+ inline void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; }
+ inline const Link<>& GetStartDragHdl() const { return maStartDragHdl; }
+ inline void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; }
+ inline const Link<>& GetDragHdl() const { return maDragHdl; }
+ inline void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; }
+ inline const Link<>& GetEndDragHdl() const { return maEndDragHdl; }
+ inline void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ inline const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ inline void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ inline const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ inline void SetCreateAccessibleHdl( const Link<>& rLink ) { maCreateAccessibleHdl = rLink; }
+ inline const Link<>& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; }
inline bool IsDragable() const { return mbDragable; }
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 272dc98f80bd..156fb23baf25 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -32,7 +32,6 @@
#define HTML_CFG_MAX HTML_CFG_NS40
-class Link;
struct HtmlOptions_Impl;
class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index cdda74067bab..2ee42485b7df 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -38,7 +38,7 @@ namespace svt
{
protected:
HyperLabelImpl* m_pImpl;
- Link maClickHdl;
+ Link<> maClickHdl;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -69,8 +69,8 @@ namespace svt
void ToggleBackgroundColor( const Color& _rGBColor );
void SetInteractive( bool _bInteractive );
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 35a0893ec09f..47217f27e8f8 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -32,7 +32,7 @@ class SVT_DLLPUBLIC SvtURLBox : public ComboBox
{
friend class SvtMatchContext_Impl;
friend class SvtURLBox_Impl;
- Link aOpenHdl;
+ Link<> aOpenHdl;
OUString aBaseURL;
OUString aPlaceHolder;
rtl::Reference< SvtMatchContext_Impl > pCtx;
@@ -67,8 +67,8 @@ public:
void SetBaseURL( const OUString& rURL );
const OUString& GetBaseURL() const { return aBaseURL; }
- void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
- const Link& GetOpenHdl() const { return aOpenHdl; }
+ void SetOpenHdl( const Link<>& rLink ) { aOpenHdl = rLink; }
+ const Link<>& GetOpenHdl() const { return aOpenHdl; }
void SetOnlyDirectories( bool bDir = true );
void SetNoURLSelection( bool bSet = true );
INetProtocol GetSmartProtocol() const { return eSmartProtocol; }
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index a0699e67cbf9..ad8b30a5c278 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -227,9 +227,9 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
{
friend class SvxIconChoiceCtrl_Impl;
- Link _aClickIconHdl;
- Link _aDocRectChangedHdl;
- Link _aVisRectChangedHdl;
+ Link<> _aClickIconHdl;
+ Link<> _aDocRectChangedHdl;
+ Link<> _aVisRectChangedHdl;
KeyEvent* _pCurKeyEvent;
SvxIconChoiceCtrl_Impl* _pImp;
bool _bAutoFontColor;
@@ -278,8 +278,8 @@ public:
void SetFont( const vcl::Font& rFont );
void SetPointFont( const vcl::Font& rFont );
- void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; }
- const Link& GetClickHdl() const { return _aClickIconHdl; }
+ void SetClickHdl( const Link<>& rLink ) { _aClickIconHdl = rLink; }
+ const Link<>& GetClickHdl() const { return _aClickIconHdl; }
using OutputDevice::SetBackground;
void SetBackground( const Wallpaper& rWallpaper );
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 75a44404da1e..064898d80084 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -22,6 +22,7 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
#include <tools/gen.hxx>
+#include <tools/link.hxx>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
@@ -32,7 +33,6 @@
is faster and smaller then a complete implementation!
*//*-*************************************************************************************************************/
-class Link;
class SvtMenuOptions_Impl;
/*-************************************************************************************************************
@@ -58,8 +58,8 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options
SvtMenuOptions();
virtual ~SvtMenuOptions();
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
+ void AddListenerLink( const Link<>& rLink );
+ void RemoveListenerLink( const Link<>& rLink );
/*-****************************************************************************************************
@short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..."
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 4bff14906401..28cd67c9649b 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -21,6 +21,7 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
+#include <tools/link.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ustring.hxx>
@@ -34,7 +35,6 @@
*//*-*************************************************************************************************************/
class SvtMiscOptions_Impl;
-class Link;
/*-************************************************************************************************************
@short collect information about misc group
@@ -60,8 +60,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
SvtMiscOptions();
virtual ~SvtMiscOptions();
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
+ void AddListenerLink( const Link<>& rLink );
+ void RemoveListenerLink( const Link<>& rLink );
bool UseSystemFileDialog() const;
void SetUseSystemFileDialog( bool bSet );
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 62d430a053c3..33ae3657c4e2 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -71,7 +71,7 @@ public:
virtual short Execute() SAL_OVERRIDE;
- void SetOptionsHdl( const Link& rLink );
+ void SetOptionsHdl( const Link<>& rLink );
};
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 30cd11f89b91..f9fa6a3f9927 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -651,12 +651,12 @@ private:
RulerSelection maHoverSelection;
- Link maStartDragHdl;
- Link maDragHdl;
- Link maEndDragHdl;
- Link maClickHdl;
- Link maDoubleClickHdl;
- Link maExtraDownHdl;
+ Link<> maStartDragHdl;
+ Link<> maDragHdl;
+ Link<> maEndDragHdl;
+ Link<> maClickHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maExtraDownHdl;
std::unique_ptr<RulerSelection> mxCurrentHitTest;
std::unique_ptr<RulerSelection> mxPreviousHitTest;
@@ -797,18 +797,18 @@ public:
void SetStyle( WinBits nStyle );
WinBits GetStyle() const { return mnWinStyle; }
- void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; }
- const Link& GetStartDragHdl() const { return maStartDragHdl; }
- void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; }
- const Link& GetDragHdl() const { return maDragHdl; }
- void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; }
- const Link& GetEndDragHdl() const { return maEndDragHdl; }
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; }
- const Link& GetExtraDownHdl() const { return maExtraDownHdl; }
+ void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; }
+ const Link<>& GetStartDragHdl() const { return maStartDragHdl; }
+ void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; }
+ const Link<>& GetDragHdl() const { return maDragHdl; }
+ void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; }
+ const Link<>& GetEndDragHdl() const { return maEndDragHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetExtraDownHdl( const Link<>& rLink ) { maExtraDownHdl = rLink; }
+ const Link<>& GetExtraDownHdl() const { return maExtraDownHdl; }
void SetTextRTL(bool bRTL);
bool GetTextRTL();
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 27208e5a63ba..90346fbba9b4 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -51,9 +51,9 @@ class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox
private:
SvSimpleTableContainer& m_rParentTableContainer;
- Link aHeaderBarClickLink;
- Link aHeaderBarDblClickLink;
- Link aCommandLink;
+ Link<> aHeaderBarClickLink;
+ Link<> aHeaderBarDblClickLink;
+ Link<> aCommandLink;
CommandEvent aCEvt;
VclPtr<HeaderBar> aHeaderBar;
long nOldPos;
@@ -120,14 +120,14 @@ public:
CommandEvent GetCommandEvent()const { return aCEvt;}
inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
- void SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; }
- const Link& GetCommandHdl() const { return aCommandLink; }
+ void SetCommandHdl( const Link<>& rLink ) { aCommandLink = rLink; }
+ const Link<>& GetCommandHdl() const { return aCommandLink; }
- void SetHeaderBarClickHdl( const Link& rLink ) { aHeaderBarClickLink = rLink; }
- const Link& GetHeaderBarClickHdl() const { return aHeaderBarClickLink; }
+ void SetHeaderBarClickHdl( const Link<>& rLink ) { aHeaderBarClickLink = rLink; }
+ const Link<>& GetHeaderBarClickHdl() const { return aHeaderBarClickLink; }
- void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; }
- const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; }
+ void SetHeaderBarDblClickHdl( const Link<>& rLink ) { aHeaderBarDblClickLink = rLink; }
+ const Link<>& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; }
void SetHeaderBarHelpId(const OString& rHelpId) { aHeaderBar->SetHelpId(rHelpId); }
diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
index 504db1f9b0c6..8628411e0810 100644
--- a/include/svtools/stdmenu.hxx
+++ b/include/svtools/stdmenu.hxx
@@ -101,8 +101,8 @@ class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
{
private:
OUString maCurName;
- Link maSelectHdl;
- Link maHighlightHdl;
+ Link<> maSelectHdl;
+ Link<> maHighlightHdl;
public:
FontNameMenu();
@@ -116,10 +116,10 @@ public:
void SetCurName( const OUString& rName );
const OUString& GetCurName() const { return maCurName; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
- const Link& GetHighlightHdl() const { return maHighlightHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
+ const Link<>& GetHighlightHdl() const { return maHighlightHdl; }
};
class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
@@ -127,8 +127,8 @@ class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
private:
long* mpHeightAry;
long mnCurHeight;
- Link maSelectHdl;
- Link maHighlightHdl;
+ Link<> maSelectHdl;
+ Link<> maHighlightHdl;
public:
FontSizeMenu();
@@ -142,10 +142,10 @@ public:
void SetCurHeight( long nHeight );
long GetCurHeight() const { return mnCurHeight; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
- const Link& GetHighlightHdl() const { return maHighlightHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
+ const Link<>& GetHighlightHdl() const { return maHighlightHdl; }
};
#endif // INCLUDED_SVTOOLS_STDMENU_HXX
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 8e9f6321a78b..a5e2ee29d855 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -59,7 +59,7 @@ struct SvLBoxButtonData_Impl;
class SVT_DLLPUBLIC SvLBoxButtonData
{
private:
- Link aLink;
+ Link<> aLink;
long nWidth;
long nHeight;
SvLBoxButtonData_Impl* pImpl;
@@ -80,8 +80,8 @@ public:
static SvBmp GetIndex( SvItemStateFlags nItemState );
long Width();
long Height();
- void SetLink( const Link& rLink) { aLink=rLink; }
- const Link& GetLink() const { return aLink; }
+ void SetLink( const Link<>& rLink) { aLink=rLink; }
+ const Link<>& GetLink() const { return aLink; }
bool IsRadio();
// as buttons are not derived from LinkHdl
void CallLink();
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 575a51de0554..9fbd66fa21a0 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -135,7 +135,7 @@ public:
inline bool IsParserWorking() const { return SVPAR_WORKING == eState; }
- Link GetAsynchCallLink() const
+ Link<> GetAsynchCallLink() const
{ return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); }
long CallAsyncCallLink() { return NewDataRead( this, 0 ); }
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 1d7e54e56028..04e5207e1b40 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -350,9 +350,9 @@ private:
bool mbHasInsertTab : 1; // if true, the tab bar has an extra tab at the end.
bool mbScrollAlwaysEnabled : 1;
- Link maSelectHdl;
- Link maSplitHdl;
- Link maScrollAreaContextHdl;
+ Link<> maSelectHdl;
+ Link<> maSplitHdl;
+ Link<> maScrollAreaContextHdl;
size_t maCurrentItemList;
using Window::ImplInit;
@@ -508,9 +508,9 @@ public:
Size CalcWindowSizePixel() const;
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
- void SetScrollAreaContextHdl( const Link& rLink ) { maScrollAreaContextHdl = rLink; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; }
+ void SetScrollAreaContextHdl( const Link<>& rLink ) { maScrollAreaContextHdl = rLink; }
// accessibility
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 78d70890c58f..a65a8ef4d7a5 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -81,7 +81,7 @@ public:
const Size& getMenuSize() const;
- void SetSelectHdl( const Link& rLink );
+ void SetSelectHdl( const Link<>& rLink );
int getSelectedEntryId() const;
int getHighlightedEntryId() const;
diff --git a/include/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx
index c5368a5aeacc..5074195a8602 100644
--- a/include/svtools/toolpanelopt.hxx
+++ b/include/svtools/toolpanelopt.hxx
@@ -34,7 +34,6 @@
is faster and smaller then a complete implementation!
*/
class SvtToolPanelOptions_Impl;
-class Link;
/** collect information about sidebar group
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index de0d85c1c1c3..0c86721d7cd5 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -23,6 +23,7 @@
#include <svtools/svtdllapi.h>
#include <tools/globname.hxx>
#include <tools/gen.hxx>
+#include <tools/link.hxx>
#include <sot/formats.hxx>
#include <sot/storage.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -49,7 +50,6 @@ class INetBookmark;
class INetImage;
class FileList;
namespace vcl { class Window; }
-class Link;
// Drag&Drop defines
@@ -517,7 +517,7 @@ public:
using TransferableHelper::StartDrag;
void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions,
- const Link& rCallbck,
+ const Link<>& rCallbck,
sal_Int32 nDragPointer = DND_POINTER_NONE,
sal_Int32 nDragImage = DND_IMAGE_NONE );
};
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 22689dcf844c..dfd6fbc146bf 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -72,8 +72,8 @@ class SVT_DLLPUBLIC SvTreeList
ListViewsType aViewList;
sal_uLong nEntryCount;
- Link aCloneLink;
- Link aCompareLink;
+ Link<> aCloneLink;
+ Link<> aCompareLink;
SvSortMode eSortMode;
sal_uInt16 nRefCount;
@@ -218,10 +218,10 @@ public:
// DECL_LINK(CloneHdl,SvTreeListEntry*);
// The Handler needs to return a SvTreeListEntry*
SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
- void SetCloneLink( const Link& rLink )
+ void SetCloneLink( const Link<>& rLink )
{ aCloneLink=rLink; }
- const Link& GetCloneLink() const
+ const Link<>& GetCloneLink() const
{ return aCloneLink; }
SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link
@@ -233,8 +233,8 @@ public:
void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
SvSortMode GetSortMode() const { return eSortMode; }
sal_Int32 Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const;
- void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
- const Link& GetCompareHdl() const { return aCompareLink; }
+ void SetCompareHdl( const Link<>& rLink ) { aCompareLink = rLink; }
+ const Link<>& GetCompareHdl() const { return aCompareLink; }
void Resort();
void Reverse();
};
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 63318874f88c..45dce8ea8d51 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -246,12 +246,12 @@ class SVT_DLLPUBLIC SvTreeListBox
SvTreeListBoxImpl* mpImpl;
SvImpLBox* pImp;
- Link aCheckButtonHdl;
- Link aScrolledHdl;
- Link aExpandedHdl;
- Link aExpandingHdl;
- Link aSelectHdl;
- Link aDeselectHdl;
+ Link<> aCheckButtonHdl;
+ Link<> aScrolledHdl;
+ Link<> aExpandedHdl;
+ Link<> aExpandingHdl;
+ Link<> aSelectHdl;
+ Link<> aDeselectHdl;
Accelerator aInpEditAcc;
Image aPrevInsertedExpBmp;
@@ -284,7 +284,7 @@ class SVT_DLLPUBLIC SvTreeListBox
SvLBoxItem* pEdItem;
protected:
- Link aDoubleClickHdl;
+ Link<> aDoubleClickHdl;
SvTreeListEntry* pTargetEntry;
SvLBoxButtonData* pCheckButtonData;
std::vector<SvLBoxTab*> aTabs;
@@ -350,7 +350,7 @@ protected:
// The Remove will be called from the handler, which then calls DragFinish.
// The Remove is also called in the DTOR of the SvTreeListBox -
// so it can't be called for a deleted object.
- Link GetDragFinishedHdl() const;
+ Link<> GetDragFinishedHdl() const;
// For asynchronous D'n'D
sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox* pSourceView );
@@ -478,15 +478,15 @@ public:
*/
bool HandleKeyInput( const KeyEvent& rKEvt );
- void SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; }
- void SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; }
- void SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;}
- const Link& GetSelectHdl() const { return aSelectHdl; }
- const Link& GetDeselectHdl() const { return aDeselectHdl; }
- const Link& GetDoubleClickHdl() const { return aDoubleClickHdl; }
- void SetExpandingHdl(const Link& rNewHdl){aExpandingHdl=rNewHdl;}
- void SetExpandedHdl(const Link& rNewHdl){aExpandedHdl=rNewHdl;}
- const Link& GetExpandingHdl() const { return aExpandingHdl; }
+ void SetSelectHdl( const Link<>& rNewHdl ) {aSelectHdl=rNewHdl; }
+ void SetDeselectHdl( const Link<>& rNewHdl ) {aDeselectHdl=rNewHdl; }
+ void SetDoubleClickHdl(const Link<>& rNewHdl) {aDoubleClickHdl=rNewHdl;}
+ const Link<>& GetSelectHdl() const { return aSelectHdl; }
+ const Link<>& GetDeselectHdl() const { return aDeselectHdl; }
+ const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; }
+ void SetExpandingHdl(const Link<>& rNewHdl){aExpandingHdl=rNewHdl;}
+ void SetExpandedHdl(const Link<>& rNewHdl){aExpandedHdl=rNewHdl;}
+ const Link<>& GetExpandingHdl() const { return aExpandingHdl; }
virtual void ExpandedHdl();
virtual bool ExpandingHdl();
@@ -610,8 +610,8 @@ protected:
virtual void NotifyEndScroll();
virtual void NotifyScrolled();
- void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; }
- const Link& GetScrolledHdl() const { return aScrolledHdl; }
+ void SetScrolledHdl( const Link<>& rLink ) { aScrolledHdl = rLink; }
+ const Link<>& GetScrolledHdl() const { return aScrolledHdl; }
long GetXOffset() const { return GetMapMode().GetOrigin().X(); }
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
@@ -693,8 +693,8 @@ public:
static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry );
static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry );
- void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; }
- Link GetCheckButtonHdl() const { return aCheckButtonHdl; }
+ void SetCheckButtonHdl( const Link<>& rLink ) { aCheckButtonHdl=rLink; }
+ Link<> GetCheckButtonHdl() const { return aCheckButtonHdl; }
virtual void CheckButtonHdl();
void SetSublistOpenWithReturn( bool bMode = true ); // open/close sublist with return/enter
@@ -830,7 +830,7 @@ struct SvLBoxDDInfo
class SvInplaceEdit2
{
- Link aCallBackHdl;
+ Link<> aCallBackHdl;
Accelerator aAccReturn;
Accelerator aAccEscape;
Idle aIdle;
@@ -845,7 +845,7 @@ class SvInplaceEdit2
public:
SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize,
- const OUString& rData, const Link& rNotifyEditEnd,
+ const OUString& rData, const Link<>& rNotifyEditEnd,
const Selection&, bool bMultiLine = false );
~SvInplaceEdit2();
bool KeyInput( const KeyEvent& rKEvt );
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index a6ceb40665d5..330db02ec858 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -221,9 +221,9 @@ private:
sal_uInt16 mnSpacing;
sal_uInt16 mnFrameStyle;
Color maColor;
- Link maDoubleClickHdl;
- Link maSelectHdl;
- Link maHighlightHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maSelectHdl;
+ Link<> maHighlightHdl;
// bitfield
bool mbFormat : 1;
@@ -374,12 +374,12 @@ public:
Size CalcItemSizePixel( const Size& rSize, bool bOut = true ) const;
long GetScrollWidth() const;
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- void SetHighlightHdl( const Link& rLink );
+ void SetHighlightHdl( const Link<>& rLink );
bool GetEdgeBlending() const { return mbEdgeBlending; }
void SetEdgeBlending(bool bNew);
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 00f9d95b9db7..2aeca758cf68 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -208,8 +208,8 @@ private:
VclPtr<vcl::Window> mpViewWindow;
sal_uInt16 mnCurLevel;
WindowAlign meViewAlign;
- Link maActivateHdl;
- Link maDeactivateHdl;
+ Link<> maActivateHdl;
+ Link<> maDeactivateHdl;
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
@@ -280,10 +280,10 @@ public:
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
const Size& GetPageSizePixel() const { return maPageSize; }
- void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
- const Link& GetActivatePageHdl() const { return maActivateHdl; }
- void SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
- const Link& GetDeactivatePageHdl() const { return maDeactivateHdl; }
+ void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+ const Link<>& GetActivatePageHdl() const { return maActivateHdl; }
+ void SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
+ const Link<>& GetDeactivatePageHdl() const { return maDeactivateHdl; }
};
#endif // INCLUDED_SVTOOLS_WIZDLG_HXX
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index db9e95361a75..6423076a09eb 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -53,14 +53,14 @@ public:
void SelectCharacter( sal_uInt32 cNew, bool bFocus = false );
sal_UCS4 GetSelectCharacter() const;
- Link GetDoubleClickHdl() const { return aDoubleClkHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { aDoubleClkHdl = rLink; }
- Link GetSelectHdl() const { return aSelectHdl; }
- void SetSelectHdl( const Link& rHdl ) { aSelectHdl = rHdl; }
- Link GetHighlightHdl() const { return aHighHdl; }
- void SetHighlightHdl( const Link& rHdl ) { aHighHdl = rHdl; }
- Link GetPreSelectHdl() const { return aHighHdl; }
- void SetPreSelectHdl( const Link& rHdl ) { aPreSelectHdl = rHdl; }
+ Link<> GetDoubleClickHdl() const { return aDoubleClkHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClkHdl = rLink; }
+ Link<> GetSelectHdl() const { return aSelectHdl; }
+ void SetSelectHdl( const Link<>& rHdl ) { aSelectHdl = rHdl; }
+ Link<> GetHighlightHdl() const { return aHighHdl; }
+ void SetHighlightHdl( const Link<>& rHdl ) { aHighHdl = rHdl; }
+ Link<> GetPreSelectHdl() const { return aHighHdl; }
+ void SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; }
static sal_uInt32& getSelectedChar();
svx::SvxShowCharSetItem* ImplGetItem( int _nPos );
@@ -100,10 +100,10 @@ protected:
private:
typedef std::map<sal_Int32, std::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap;
ItemsMap m_aItems;
- Link aDoubleClkHdl;
- Link aSelectHdl;
- Link aHighHdl;
- Link aPreSelectHdl;
+ Link<> aDoubleClkHdl;
+ Link<> aSelectHdl;
+ Link<> aHighHdl;
+ Link<> aPreSelectHdl;
svx::SvxShowCharSetVirtualAcc* m_pAccessible;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible;
long nX;
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 7b1e6ac9b6e5..07e05789a893 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -103,7 +103,7 @@ private:
Image maEntryImage;
OUString maEntryString;
utl::TextSearch* pCommentSearcher;
- Link aColCompareLink;
+ Link<> aColCompareLink;
protected:
@@ -161,8 +161,8 @@ public:
virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE;
- void SetColCompareHdl(const Link& rLink ) { aColCompareLink = rLink; }
- const Link& GetColCompareHdl() const { return aColCompareLink; }
+ void SetColCompareHdl(const Link<>& rLink ) { aColCompareLink = rLink; }
+ const Link<>& GetColCompareHdl() const { return aColCompareLink; }
};
/// Tabpage with the filter text entries etc.
@@ -170,13 +170,13 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPFilter: public TabPage
{
private:
- Link aReadyLink;
- Link aModifyLink;
- Link aModifyDateLink;
- Link aModifyAuthorLink;
- Link aModifyRefLink;
- Link aRefLink;
- Link aModifyComLink;
+ Link<> aReadyLink;
+ Link<> aModifyLink;
+ Link<> aModifyDateLink;
+ Link<> aModifyAuthorLink;
+ Link<> aModifyRefLink;
+ Link<> aRefLink;
+ Link<> aModifyComLink;
VclPtr<SvxRedlinTable> pRedlinTable;
VclPtr<CheckBox> m_pCbDate;
@@ -266,28 +266,28 @@ public:
ListBox* GetLbAction() { return m_pLbAction;}
- void SetReadyHdl( const Link& rLink ) { aReadyLink= rLink; }
- const Link& GetReadyHdl() const { return aReadyLink; }
+ void SetReadyHdl( const Link<>& rLink ) { aReadyLink= rLink; }
+ const Link<>& GetReadyHdl() const { return aReadyLink; }
- void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; }
- const Link& GetModifyHdl() const { return aModifyLink; }
+ void SetModifyHdl( const Link<>& rLink ) { aModifyLink = rLink; }
+ const Link<>& GetModifyHdl() const { return aModifyLink; }
- void SetModifyDateHdl( const Link& rLink ) { aModifyDateLink = rLink; }
- const Link& GetModifyDateHdl() const { return aModifyDateLink; }
+ void SetModifyDateHdl( const Link<>& rLink ) { aModifyDateLink = rLink; }
+ const Link<>& GetModifyDateHdl() const { return aModifyDateLink; }
- void SetModifyAuthorHdl( const Link& rLink ) { aModifyAuthorLink = rLink; }
- const Link& GetModifyAuthorHdl() const { return aModifyAuthorLink; }
+ void SetModifyAuthorHdl( const Link<>& rLink ) { aModifyAuthorLink = rLink; }
+ const Link<>& GetModifyAuthorHdl() const { return aModifyAuthorLink; }
- void SetModifyCommentHdl(const Link& rLink ) { aModifyComLink = rLink; }
- const Link& GetModifyCommentHdl() const { return aModifyComLink; }
+ void SetModifyCommentHdl(const Link<>& rLink ) { aModifyComLink = rLink; }
+ const Link<>& GetModifyCommentHdl() const { return aModifyComLink; }
// Methods for Calc {
- void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; }
- const Link& GetModifyRangeHdl() const { return aModifyRefLink; }
+ void SetModifyRangeHdl( const Link<>& rLink ) { aModifyRefLink = rLink; }
+ const Link<>& GetModifyRangeHdl() const { return aModifyRefLink; }
- void SetRefHdl( const Link& rLink ) { aRefLink = rLink; }
- const Link& GetRefHdl() const { return aRefLink; }
+ void SetRefHdl( const Link<>& rLink ) { aRefLink = rLink; }
+ const Link<>& GetRefHdl() const { return aRefLink; }
void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true );
@@ -299,11 +299,11 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPView : public TabPage
{
private:
- Link AcceptClickLk;
- Link AcceptAllClickLk;
- Link RejectClickLk;
- Link RejectAllClickLk;
- Link UndoClickLk;
+ Link<> AcceptClickLk;
+ Link<> AcceptAllClickLk;
+ Link<> RejectClickLk;
+ Link<> RejectAllClickLk;
+ Link<> UndoClickLk;
VclPtr<SvxRedlinTable> m_pViewData;
VclPtr<PushButton> m_pAccept;
@@ -345,20 +345,20 @@ public:
void HideUndo() {ShowUndo(false);}
bool IsUndoVisible();
- void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; }
- const Link& GetAcceptClickHdl() const { return AcceptClickLk; }
+ void SetAcceptClickHdl( const Link<>& rLink ) { AcceptClickLk = rLink; }
+ const Link<>& GetAcceptClickHdl() const { return AcceptClickLk; }
- void SetAcceptAllClickHdl( const Link& rLink ) { AcceptAllClickLk = rLink; }
- const Link& GetAcceptAllClickHdl() const { return AcceptAllClickLk; }
+ void SetAcceptAllClickHdl( const Link<>& rLink ) { AcceptAllClickLk = rLink; }
+ const Link<>& GetAcceptAllClickHdl() const { return AcceptAllClickLk; }
- void SetRejectClickHdl( const Link& rLink ) { RejectClickLk = rLink; }
- const Link& GetRejectClickHdl() const { return RejectClickLk; }
+ void SetRejectClickHdl( const Link<>& rLink ) { RejectClickLk = rLink; }
+ const Link<>& GetRejectClickHdl() const { return RejectClickLk; }
- void SetRejectAllClickHdl( const Link& rLink ) { RejectAllClickLk = rLink; }
- const Link& GetRejectAllClickHdl() const { return RejectAllClickLk; }
+ void SetRejectAllClickHdl( const Link<>& rLink ) { RejectAllClickLk = rLink; }
+ const Link<>& GetRejectAllClickHdl() const { return RejectAllClickLk; }
- void SetUndoClickHdl( const Link& rLink ) { UndoClickLk = rLink; }
- const Link& GetUndoAllClickHdl() const { return UndoClickLk; }
+ void SetUndoClickHdl( const Link<>& rLink ) { UndoClickLk = rLink; }
+ const Link<>& GetUndoAllClickHdl() const { return UndoClickLk; }
virtual void ActivatePage() SAL_OVERRIDE;
virtual void DeactivatePage() SAL_OVERRIDE;
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 13a182da1503..ef05aa0f4503 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -113,7 +113,7 @@ public:
void SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces = 0);
/** The passed handler is called whenever the totation value changes. */
- void SetModifyHdl( const Link& rLink );
+ void SetModifyHdl( const Link<>& rLink );
/** Save value for later comparison */
void SaveValue();
@@ -127,7 +127,7 @@ protected:
ScopedVclPtr<DialControlBmp> mxBmpEnabled;
ScopedVclPtr<DialControlBmp> mxBmpDisabled;
ScopedVclPtr<DialControlBmp> mxBmpBuffered;
- Link maModifyHdl;
+ Link<> maModifyHdl;
VclPtr<NumericField> mpLinkField;
sal_Int32 mnLinkedFieldValueMultiplyer;
Size maWinSize;
@@ -156,7 +156,7 @@ protected:
private:
void InvalidateControl();
- void ImplSetFieldLink( const Link& rLink );
+ void ImplSetFieldLink( const Link<>& rLink );
DECL_LINK( LinkedFieldModifyHdl, NumericField* );
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 4d704d63814a..ca77be777db1 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -67,10 +67,10 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl
{
// Callback for interactive changes
- Link maUserInteractiveChangeCallback;
- Link maUserSelectionChangeCallback;
- Link maChangeCallback;
- Link maSelectionChangeCallback;
+ Link<> maUserInteractiveChangeCallback;
+ Link<> maUserSelectionChangeCallback;
+ Link<> maChangeCallback;
+ Link<> maSelectionChangeCallback;
// lights
sal_uInt32 maSelectedLight;
@@ -113,10 +113,10 @@ public:
virtual void SetObjectType(SvxPreviewObjectType nType) SAL_OVERRIDE;
// register user callback
- void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
- void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
- void SetChangeCallback(Link aNew) { maChangeCallback = aNew; }
- void SetSelectionChangeCallback(Link aNew) { maSelectionChangeCallback = aNew; }
+ void SetUserInteractiveChangeCallback(Link<> aNew) { maUserInteractiveChangeCallback = aNew; }
+ void SetUserSelectionChangeCallback(Link<> aNew) { maUserSelectionChangeCallback = aNew; }
+ void SetChangeCallback(Link<> aNew) { maChangeCallback = aNew; }
+ void SetSelectionChangeCallback(Link<> aNew) { maSelectionChangeCallback = aNew; }
// selection checks
bool IsSelectionValid();
@@ -150,8 +150,8 @@ private:
VclPtr<PushButton> maSwitcher;
// callback for interactive changes
- Link maUserInteractiveChangeCallback;
- Link maUserSelectionChangeCallback;
+ Link<> maUserInteractiveChangeCallback;
+ Link<> maUserSelectionChangeCallback;
public:
SvxLightCtl3D(vcl::Window* pParent);
@@ -169,8 +169,8 @@ public:
Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl.get(); }
// register user callback
- void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
- void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
+ void SetUserInteractiveChangeCallback(Link<> aNew) { maUserInteractiveChangeCallback = aNew; }
+ void SetUserSelectionChangeCallback(Link<> aNew) { maUserSelectionChangeCallback = aNew; }
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 01f91198d3cb..f68543095cff 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -130,7 +130,7 @@ public:
bool IsActiveControl() const;
void ForgetActiveControl();
- void SetControlActivationHandler( const Link& _rHdl );
+ void SetControlActivationHandler( const Link<>& _rHdl );
virtual void Activate(bool bMDI) SAL_OVERRIDE;
virtual void Deactivate(bool bMDI) SAL_OVERRIDE;
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index c94731e7d695..5bb785c4ea38 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -45,14 +45,14 @@ class FmSearchEngine;
class SAL_WARN_UNUSED FmSearchThread : public ::osl::Thread
{
FmSearchEngine* m_pEngine;
- Link m_aTerminationHdl;
+ Link<> m_aTerminationHdl;
virtual void SAL_CALL run() SAL_OVERRIDE;
virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
public:
FmSearchThread(FmSearchEngine* pEngine) : m_pEngine(pEngine) { }
- void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; }
+ void setTerminationHandler(Link<> aHdl) { m_aTerminationHdl = aHdl; }
};
/**
@@ -84,12 +84,12 @@ struct FmSearchProgress
class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
{
// attribute
- Link m_lnkWhoWantsToKnow;
+ Link<> m_lnkWhoWantsToKnow;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListening;
// attribute access
public:
- Link SetPropChangeHandler(const Link& lnk);
+ Link<> SetPropChangeHandler(const Link<>& lnk);
// methods
public:
@@ -211,7 +211,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine
SEARCH_RESULT m_srResult; // backward direction
// The link we broadcast the progress and the result to
- Link m_aProgressHandler;
+ Link<> m_aProgressHandler;
bool m_bSearchingCurrently : 1; // is an (asynchronous) search running?
bool m_bCancelAsynchRequest : 1; // should be cancelled?
::osl::Mutex m_aCancelAsynchAccess; // access to_bCancelAsynchRequest (technically only
@@ -312,7 +312,7 @@ public:
a FmSearchProgress structure
the handler should be in any case thread-safe
*/
- void SetProgressHandler(Link aHdl) { m_aProgressHandler = aHdl; }
+ void SetProgressHandler(Link<> aHdl) { m_aProgressHandler = aHdl; }
/// search for the next appearance (for nDirection values check DIRECTION_*-defines)
void SearchNext(const OUString& strExpression);
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index bd262b3e5b5b..66f36f57e628 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -132,9 +132,9 @@ public:
// frame border selection -------------------------------------------------
/** Returns the current selection handler. */
- const Link& GetSelectHdl() const;
+ const Link<>& GetSelectHdl() const;
/** Sets the passed handler that is called if the selection of the control changes. */
- void SetSelectHdl( const Link& rHdl );
+ void SetSelectHdl( const Link<>& rHdl );
/** Returns true, if the specified frame border is selected. */
bool IsBorderSelected( FrameBorderType eBorder ) const;
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 71ca12449521..fa9f5dab4d52 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -118,7 +118,7 @@ class GalleryListView : public BrowseBox
private:
- Link maSelectHdl;
+ Link<> maSelectHdl;
GalleryTheme* mpTheme;
long mnCurRow;
@@ -144,7 +144,7 @@ public:
GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme );
- void SetSelectHdl( const Link& rSelectHdl ) { maSelectHdl = rSelectHdl; }
+ void SetSelectHdl( const Link<>& rSelectHdl ) { maSelectHdl = rSelectHdl; }
/** GetCellText returns the text at the given position
@param _nRow
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index bc06735e2802..2597870a5153 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -178,7 +178,7 @@ public:
bool IsDefault() const;
SAL_DLLPRIVATE bool IsModified() const;
- void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
+ void Actualize( const Link<>& rActualizeLink, GalleryProgress* pProgress = NULL );
SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; }
SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; }
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index aff192e19e71..77fb49484a0e 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -39,10 +39,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
Graphic aGraphic;
Idle aUpdateIdle;
- Link aMousePosLink;
- Link aGraphSizeLink;
- Link aMarkObjLink;
- Link aUpdateLink;
+ Link<> aMousePosLink;
+ Link<> aGraphSizeLink;
+ Link<> aMarkObjLink;
+ Link<> aUpdateLink;
MapMode aMap100;
Size aGraphSize;
Point aMousePos;
@@ -107,17 +107,17 @@ public:
SdrObject* GetSelectedSdrObject() const;
bool IsChanged() const { return bSdrMode && pModel->IsChanged(); }
- void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; }
- const Link& GetMousePosLink() const { return aMousePosLink; }
+ void SetMousePosLink( const Link<>& rLink ) { aMousePosLink = rLink; }
+ const Link<>& GetMousePosLink() const { return aMousePosLink; }
- void SetGraphSizeLink( const Link& rLink ) { aGraphSizeLink = rLink; }
- const Link& GetGraphSizeLink() const { return aGraphSizeLink; }
+ void SetGraphSizeLink( const Link<>& rLink ) { aGraphSizeLink = rLink; }
+ const Link<>& GetGraphSizeLink() const { return aGraphSizeLink; }
- void SetMarkObjLink( const Link& rLink ) { aMarkObjLink = rLink; }
- const Link& GetMarkObjLink() const { return aMarkObjLink; }
+ void SetMarkObjLink( const Link<>& rLink ) { aMarkObjLink = rLink; }
+ const Link<>& GetMarkObjLink() const { return aMarkObjLink; }
- void SetUpdateLink( const Link& rLink ) { aUpdateLink = rLink; }
- const Link& GetUpdateLink() const { return aUpdateLink; }
+ void SetUpdateLink( const Link<>& rLink ) { aUpdateLink = rLink; }
+ const Link<>& GetUpdateLink() const { return aUpdateLink; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
};
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index ec8ece737dfb..677e4c9e5595 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -220,8 +220,8 @@ public:
private:
vcl::Font m_aDefaultFont;
- Link m_aMasterStateProvider;
- Link m_aMasterSlotExecutor;
+ Link<> m_aMasterStateProvider;
+ Link<> m_aMasterSlotExecutor;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
@@ -478,13 +478,13 @@ public:
const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;}
- void SetStateProvider(const Link& rProvider) { m_aMasterStateProvider = rProvider; }
+ void SetStateProvider(const Link<>& rProvider) { m_aMasterStateProvider = rProvider; }
// if this link is set the given provider will be asked for the state of my items.
// the return values are interpreted as follows :
// <0 -> not specified (use default mechanism to determine the state)
// ==0 -> the item is disabled
// >0 -> the item is enabled
- void SetSlotExecutor(const Link& rExecutor) { m_aMasterSlotExecutor = rExecutor; }
+ void SetSlotExecutor(const Link<>& rExecutor) { m_aMasterSlotExecutor = rExecutor; }
// analogous : if this link is set, all nav-bar slots will be routed through it when executed
// if the handler returns nonzero, no further handling of the slot occurs
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 89fbbded5221..daeb5928d091 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -43,7 +43,7 @@ private:
OUString aOldPasswdErrStr;
OUString aRepeatPasswdErrStr;
- Link aCheckPasswordHdl;
+ Link<> aCheckPasswordHdl;
bool bEmpty;
@@ -58,7 +58,7 @@ public:
OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); }
OUString GetNewPassword() const { return m_pNewPasswdED->GetText(); }
- void SetCheckPasswordHdl( const Link& rLink ) { aCheckPasswordHdl = rLink; }
+ void SetCheckPasswordHdl( const Link<>& rLink ) { aCheckPasswordHdl = rLink; }
};
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index f77bee62b94f..7729ab54449f 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -69,8 +69,8 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
class SvxRubyData_Impl;
class RubyEdit : public Edit
{
- Link aScrollHdl;
- Link aJumpHdl;
+ Link<> aScrollHdl;
+ Link<> aJumpHdl;
virtual void GetFocus() SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
@@ -82,8 +82,8 @@ public:
: Edit(pParent, WB_BORDER)
{
}
- void SetScrollHdl(Link& rLink) {aScrollHdl = rLink;}
- void SetJumpHdl(Link& rLink) {aJumpHdl = rLink;}
+ void SetScrollHdl(Link<>& rLink) {aScrollHdl = rLink;}
+ void SetJumpHdl(Link<>& rLink) {aJumpHdl = rLink;}
};
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index 1469642d6e30..96dc794997f8 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -30,7 +30,7 @@ private:
using EditUndoManager::Undo;
using EditUndoManager::Redo;
- Link maEndTextEditHdl;
+ Link<> maEndTextEditHdl;
SfxUndoAction* mpLastUndoActionBeforeTextEdit;
bool mbEndTextEditTriggeredFromUndo;
@@ -53,7 +53,7 @@ public:
// activate (start text edit) and empty link to reset (end text edit). On
// reset all text edit actions will be removed from this undo manager to
// restore the state before activation
- void SetEndTextEditHdl(const Link& rLink);
+ void SetEndTextEditHdl(const Link<>& rLink);
// check from outside if we are inside a callback for ending text edit. This
// is needed to detect inside end text edit if it is a regular one or triggered
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index ed0ce097989c..e422125e7242 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -74,7 +74,7 @@ protected:
Rectangle aTextEditArea;
Rectangle aMinTextEditArea;
- Link aOldCalcFieldValueLink; // for call the old handler
+ Link<> aOldCalcFieldValueLink; // for call the old handler
Point aMacroDownPos;
sal_uInt16 nMacroTol;
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 1e47e180a53d..16453d8ad16a 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -23,6 +23,7 @@
#include <rtl/ustring.hxx>
#include <editeng/outliner.hxx>
#include <svx/svxdllapi.h>
+#include <tools/link.hxx>
#include <tools/shl.hxx>
#include <tools/fract.hxx>
#include <vcl/outdev.hxx>
@@ -119,10 +120,6 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl
// man dann irgendwann mit delete platthauen muss.
sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd);
-
-
-class Link;
-
// Hilfsklasse zur kommunikation zwischen dem Dialog
// zum aufbrechen von Metafiles (sd/source/ui/dlg/brkdlg.cxx),
// SdrEditView::DoImportMarkedMtf() und
@@ -142,10 +139,10 @@ private:
sal_uIntPtr nObjCount; // Anzahl der selektierten Objekte
sal_uIntPtr nCurObj; // Aktuelles Objekt
- Link *pLink;
+ Link<> *pLink;
public:
- SvdProgressInfo( Link *_pLink );
+ SvdProgressInfo( Link<> *_pLink );
void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
@@ -175,19 +172,19 @@ public:
class SdrLinkList
{
- std::vector<Link*> aList;
+ std::vector<Link<>*> aList;
protected:
- unsigned FindEntry(const Link& rLink) const;
+ unsigned FindEntry(const Link<>& rLink) const;
public:
SdrLinkList(): aList() {}
~SdrLinkList() { Clear(); }
SVX_DLLPUBLIC void Clear();
unsigned GetLinkCount() const { return (unsigned)aList.size(); }
- Link& GetLink(unsigned nNum) { return *aList[nNum]; }
- const Link& GetLink(unsigned nNum) const { return *aList[nNum]; }
- void InsertLink(const Link& rLink, unsigned nPos=0xFFFF);
- void RemoveLink(const Link& rLink);
- bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
+ Link<>& GetLink(unsigned nNum) { return *aList[nNum]; }
+ const Link<>& GetLink(unsigned nNum) const { return *aList[nNum]; }
+ void InsertLink(const Link<>& rLink, unsigned nPos=0xFFFF);
+ void RemoveLink(const Link<>& rLink);
+ bool HasLink(const Link<>& rLink) const { return FindEntry(rLink)!=0xFFFF; }
};
SdrLinkList& ImpGetUserMakeObjHdl();
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 22a55ed40e02..ce74428e219b 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -258,7 +258,7 @@ private:
Color aMarkerColor;
// callback link when value changed
- Link aColorChangeHdl;
+ Link<> aColorChangeHdl;
// use luminance values only
bool bUseLuminance : 1;
@@ -283,8 +283,8 @@ public:
const Size& GetSize() const { return aMarkerSize; }
void SetSize(const Size& rNew);
- void SetColorChangeHdl(const Link& rLink) { aColorChangeHdl = rLink; }
- const Link& GetColorChangeHdl() const { return aColorChangeHdl; }
+ void SetColorChangeHdl(const Link<>& rLink) { aColorChangeHdl = rLink; }
+ const Link<>& GetColorChangeHdl() const { return aColorChangeHdl; }
};
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 5cd184e4640d..2248d4bebb7a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -157,8 +157,8 @@ protected:
DateTime aReadDate; // date of the incoming stream
std::vector<SdrPage*> maMaPag; // master pages
std::vector<SdrPage*> maPages;
- Link aUndoLink; // link to a NotifyUndo-Handler
- Link aIOProgressLink;
+ Link<> aUndoLink; // link to a NotifyUndo-Handler
+ Link<> aIOProgressLink;
OUString aTablePath;
Size aMaxObjSize; // e.g. for auto-growing text
Fraction aObjUnit; // description of the coordinate units for ClipBoard, Drag&Drop, ...
@@ -578,8 +578,8 @@ public:
// void NotifyUndoActionHdl(SfxUndoAction* pUndoAction);
// When calling the handler ownership is transferred;
// The UndoAction belongs to the Handler, not the SdrModel.
- void SetNotifyUndoActionHdl(const Link& rLink) { aUndoLink=rLink; }
- const Link& GetNotifyUndoActionHdl() const { return aUndoLink; }
+ void SetNotifyUndoActionHdl(const Link<>& rLink) { aUndoLink=rLink; }
+ const Link<>& GetNotifyUndoActionHdl() const { return aUndoLink; }
/** application can set its own undo manager, BegUndo, EndUndo and AddUndoAction
calls are routet to this interface if given */
@@ -605,8 +605,8 @@ public:
// Mind that the handler will also be called if the App serves Draw data in the
// office wide Draw-Exchange-Format because that happens through streaming into
// a MemoryStream.
- void SetIOProgressHdl(const Link& rLink) { aIOProgressLink=rLink; }
- const Link& GetIOProgressHdl() const { return aIOProgressLink; }
+ void SetIOProgressHdl(const Link<>& rLink) { aIOProgressLink=rLink; }
+ const Link<>& GetIOProgressHdl() const { return aIOProgressLink; }
// Accessor methods for Palettes, Lists and Tabeles
// FIXME: this badly needs re-factoring ...
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index e3d77ccae081..de32cf06ce7e 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -31,6 +31,7 @@
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
#include <svx/shapeproperty.hxx>
+#include <tools/link.hxx>
#include <tools/weakbase.hxx>
#include <tools/mapunit.hxx>
#include <tools/gen.hxx>
@@ -69,7 +70,6 @@ class SdrGluePointList;
class SetOfByte;
class OutputDevice;
class Fraction;
-class Link;
namespace basegfx {
@@ -1016,10 +1016,10 @@ private:
public:
static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
static SdrObject* MakeNewObject( sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage );
- static void InsertMakeObjectHdl(const Link& rLink);
- static void RemoveMakeObjectHdl(const Link& rLink);
- static void InsertMakeUserDataHdl(const Link& rLink);
- static void RemoveMakeUserDataHdl(const Link& rLink);
+ static void InsertMakeObjectHdl(const Link<>& rLink);
+ static void RemoveMakeObjectHdl(const Link<>& rLink);
+ static void InsertMakeUserDataHdl(const Link<>& rLink);
+ static void RemoveMakeUserDataHdl(const Link<>& rLink);
};
typedef tools::WeakReference< SdrObject > SdrObjectWeakRef;
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 1854f0248988..ebf3226e2129 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -178,7 +178,7 @@ class AbstractSvxNameDialog :public VclAbstractDialog
{
public:
virtual void GetName( OUString& rName ) = 0;
- virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0;
+ virtual void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) = 0;
virtual void SetEditHelpId(const OString&) = 0;
//from class Window
virtual void SetHelpId( const OString& ) = 0;
@@ -189,7 +189,7 @@ class AbstractSvxObjectNameDialog :public VclAbstractDialog
{
public:
virtual void GetName(OUString& rName) = 0;
- virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) = 0;
+ virtual void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) = 0;
};
class AbstractSvxObjectTitleDescDialog :public VclAbstractDialog
@@ -223,8 +223,8 @@ public:
class AbstractFmSearchDialog :public VclAbstractDialog
{
public:
- virtual void SetFoundHandler(const Link& lnk) = 0;
- virtual void SetCanceledNotFoundHdl(const Link& lnk)=0;
+ virtual void SetFoundHandler(const Link<>& lnk) = 0;
+ virtual void SetCanceledNotFoundHdl(const Link<>& lnk)=0;
virtual void SetActiveField(const OUString& strField)=0;
};
@@ -241,13 +241,13 @@ class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog
class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog
{
public:
- virtual void SetValidateFramePosLink( const Link& rLink ) = 0;
+ virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
};
class AbstractSvxCaptionDialog : public SfxAbstractTabDialog
{
public:
- virtual void SetValidateFramePosLink( const Link& rLink ) = 0;
+ virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
};
class AbstractSvxPostItDialog :public VclAbstractDialog
@@ -255,8 +255,8 @@ class AbstractSvxPostItDialog :public VclAbstractDialog
public:
virtual void SetText( const OUString& rStr ) = 0; //From class Window
virtual const SfxItemSet* GetOutputItemSet() const = 0;
- virtual void SetPrevHdl( const Link& rLink ) = 0;
- virtual void SetNextHdl( const Link& rLink ) = 0;
+ virtual void SetPrevHdl( const Link<>& rLink ) = 0;
+ virtual void SetNextHdl( const Link<>& rLink ) = 0;
virtual void EnableTravel(bool bNext, bool bPrev) = 0;
virtual OUString GetNote() = 0;
virtual void SetNote(const OUString& rTxt) = 0;
@@ -396,7 +396,7 @@ public:
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
- const Link& lnkContextSupplier)=0;
+ const Link<>& lnkContextSupplier)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
const Graphic& rGraphic,
RECT_POINT eLightSource)=0;
diff --git a/include/tools/line.hxx b/include/tools/line.hxx
index c101e7567dbf..25356716337c 100644
--- a/include/tools/line.hxx
+++ b/include/tools/line.hxx
@@ -22,8 +22,6 @@
#include <tools/toolsdllapi.h>
#include <tools/gen.hxx>
-class Link;
-
class TOOLS_DLLPUBLIC Line
{
private:
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 2dd0100096ba..99be32b754f8 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -76,21 +76,73 @@
SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *)
#define LINK(Instance, Class, Member) \
- Link(static_cast<Class *>(Instance), &Class::LinkStub##Member)
+ Link<>(static_cast<Class *>(Instance), &Class::LinkStub##Member)
+
+#define DECL_LINK_TYPED(Member, ArgType, RetType) \
+ static RetType LinkStub##Member(void *, ArgType); \
+ RetType Member(ArgType)
+
+#define DECL_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \
+ static RetType LinkStub##Member(void *, ArgType); \
+ static RetType Member(Class *, ArgType)
+
+#define DECL_DLLPRIVATE_LINK_TYPED(Member, ArgType, RetType) \
+ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \
+ SAL_DLLPRIVATE RetType Member(ArgType)
+
+#define DECL_DLLPRIVATE_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \
+ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \
+ SAL_DLLPRIVATE static RetType Member(Class *, ArgType)
+
+#define IMPL_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \
+ RetType Class::LinkStub##Member(void * instance, ArgType) { \
+ return static_cast<Class *>(instance)->Member(data); \
+ } \
+ RetType Class::Member(ArgType ArgName)
+
+#define IMPL_LINK_NOARG_TYPED(Class, Member, RetType) \
+ RetType Class::LinkStub##Member(void * instance, void * data) { \
+ return static_cast<Class *>(instance)->Member(data); \
+ } \
+ RetType Class::Member(SAL_UNUSED_PARAMETER void *)
+
+#define IMPL_STATIC_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \
+ RetType Class::LinkStub##Member(void * instance, ArgType data) { \
+ return Member(static_cast<Class *>(instance), data); \
+ } \
+ RetType Class::Member(Class * pThis, ArgType ArgName)
+
+#define IMPL_STATIC_LINK_NOINSTANCE_TYPED( \
+ Class, Member, ArgType, ArgName, RetType) \
+ RetType Class::LinkStub##Member(void * instance, ArgType data) { \
+ return Member(static_cast<Class *>(instance), data); \
+ } \
+ RetType Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName)
+
+#define IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(Class, Member, RetType) \
+ RetType Class::LinkStub##Member(void * instance, void * data) { \
+ return Member(static_cast<Class *>(instance), data); \
+ } \
+ RetType Class::Member( \
+ SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *)
+
+#define LINK_TYPED(Instance, Class, Member) tools::detail::makeLink( \
+ static_cast<Class *>(Instance), &Class::LinkStub##Member)
#define EMPTYARG
+template<typename Arg = void *, typename Ret = sal_IntPtr>
class TOOLS_DLLPUBLIC Link {
public:
- typedef sal_IntPtr Stub(void *, void *);
+ typedef Ret Stub(void *, Arg);
Link(): function_(nullptr), instance_(nullptr) {}
Link(void * instance, Stub * function):
function_(function), instance_(instance) {}
- sal_IntPtr Call(void * data) const
- { return function_ == nullptr ? 0 : (*function_)(instance_, data); }
+ Ret Call(Arg data) const
+ { return function_ == nullptr ? Ret{} : (*function_)(instance_, data); }
bool IsSet() const { return function_ != nullptr; }
@@ -111,6 +163,15 @@ private:
void * instance_;
};
+namespace tools { namespace detail {
+
+template<typename Arg, typename Ret>
+Link<Arg, Ret> makeLink(void * instance, Ret (* function)(void *, Arg)) {
+ return Link<Arg, Ret>(instance, function);
+}
+
+} }
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 9e1e1646c269..a41d7ec8d88c 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -164,8 +164,8 @@ public:
This is needed because the number formatter isn't part of the svl light
library, otherwise we could call SetDefaultSystemCurrency() directly.
*/
- static void SetCurrencyChangeLink( const Link& rLink );
- static const Link& GetCurrencyChangeLink();
+ static void SetCurrencyChangeLink( const Link<>& rLink );
+ static const Link<>& GetCurrencyChangeLink();
/** return the readonly state of the queried option. */
bool IsReadOnly( EOption eOption ) const;
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 2b31b1b1d348..8ac20a190434 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -20,11 +20,11 @@
#define INCLUDED_VCL_ABSTDLG_HXX
#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
#include <vcl/dllapi.h>
namespace vcl { class Window; }
class ResId;
-class Link;
class VCL_DLLPUBLIC VclAbstractDialog
{
@@ -39,7 +39,7 @@ class VCL_DLLPUBLIC VclAbstractDialog2
public:
virtual ~VclAbstractDialog2();
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) = 0;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) = 0;
virtual long GetResult() = 0;
};
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index d7d9d296ca2d..0459f04266b3 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -36,9 +36,9 @@ class VCL_DLLPUBLIC Accelerator : public Resource
private:
ImplAccelData* mpData;
OUString maHelpStr;
- Link maActivateHdl;
- Link maDeactivateHdl;
- Link maSelectHdl;
+ Link<> maActivateHdl;
+ Link<> maDeactivateHdl;
+ Link<> maSelectHdl;
// Will be set by AcceleratorManager
vcl::KeyCode maCurKeyCode;
@@ -89,12 +89,12 @@ public:
void SetHelpText( const OUString& rHelpText ) { maHelpStr = rHelpText; }
const OUString& GetHelpText() const { return maHelpStr; }
- void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
- const Link& GetActivateHdl() const { return maActivateHdl; }
- void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
- const Link& GetDeactivateHdl() const { return maDeactivateHdl; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
+ void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+ const Link<>& GetActivateHdl() const { return maActivateHdl; }
+ void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
+ const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
Accelerator& operator=( const Accelerator& rAccel );
};
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 17d62a1a3d1a..0d89bc9c4f1b 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -163,8 +163,8 @@ public:
void SetCycleMode( CycleMode eMode );
CycleMode GetCycleMode() const { return meCycleMode; }
- void SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; }
- const Link& GetNotifyHdl() const { return maNotifyLink; }
+ void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; }
+ const Link<>& GetNotifyHdl() const { return maNotifyLink; }
size_t Count() const { return maList.size(); }
bool Insert( const AnimationBitmap& rAnimationBitmap );
@@ -196,7 +196,7 @@ public:
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
- const Link* pProgress = NULL );
+ const Link<>* pProgress = NULL );
friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation );
friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
@@ -216,7 +216,7 @@ private:
std::vector< AnimationBitmap* > maList;
std::vector< ImplAnimView* > maViewList;
- Link maNotifyLink;
+ Link<> maNotifyLink;
BitmapEx maBitmapEx;
Timer maTimer;
Size maGlobalSize;
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 7d71a66fdc0d..9027a643deba 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -704,7 +704,7 @@ public:
bool Vectorize(
tools::PolyPolygon& rPolyPoly,
sal_uLong nFlags = BMP_VECTORIZE_OUTER,
- const Link* pProgress = NULL );
+ const Link<>* pProgress = NULL );
/** Convert the bitmap to a meta file
@@ -731,7 +731,7 @@ public:
GDIMetaFile& rMtf,
sal_uInt8 cReduce = 0,
sal_uLong nFlags = BMP_VECTORIZE_INNER,
- const Link* pProgress = NULL );
+ const Link<>* pProgress = NULL );
/** Change various global color characteristics
@@ -789,7 +789,7 @@ public:
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
- const Link* pProgress = NULL );
+ const Link<>* pProgress = NULL );
public:
@@ -834,15 +834,15 @@ public:
SAL_DLLPRIVATE bool ImplConvolute3(
const long* pMatrix, long nDivisor,
const BmpFilterParam* pFilterParam,
- const Link* pProgress );
-
- SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress );
- SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress );
+ const Link<>* pProgress );
+
+ SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
+ SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius = 0.7 );
SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius = 0.7 );
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 1603f6f030c4..eb9e4d60a911 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -374,7 +374,7 @@ public:
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
- const Link* pProgress = NULL );
+ const Link<>* pProgress = NULL );
/** Get transparency at given position
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index c7fdab639d1b..db29f241aa74 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -65,8 +65,8 @@ public:
void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
sal_uInt16 GetFocusButton() const { return mnFocusButtonId; }
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
protected:
ButtonDialog( WindowType nType );
@@ -84,7 +84,7 @@ private:
sal_uInt16 mnCurButtonId;
sal_uInt16 mnFocusButtonId;
bool mbFormat;
- Link maClickHdl;
+ Link<> maClickHdl;
SAL_DLLPRIVATE void ImplInitButtonDialogData();
SAL_DLLPRIVATE PushButton* ImplCreatePushButton( sal_uInt16 nBtnFlags );
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 8fb9dedbfe65..8ecf063e0577 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -38,7 +38,7 @@ class VCL_DLLPUBLIC Button : public Control
{
private:
std::unique_ptr<ImplCommonButtonData> mpButtonData;
- Link maClickHdl;
+ Link<> maClickHdl;
/// Command URL (like .uno:Save) in case the button should handle it.
OUString maCommand;
@@ -68,8 +68,8 @@ public:
virtual void Click();
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
/// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button.
void SetCommandHandler(const OUString& aCommand);
@@ -116,7 +116,7 @@ protected:
sal_uInt16 mnDDStyle;
bool mbPressed;
bool mbInUserDraw;
- Link maToggleHdl;
+ Link<> maToggleHdl;
SAL_DLLPRIVATE void ImplInitPushButtonData();
SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle );
@@ -195,8 +195,8 @@ public:
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
- const Link& GetToggleHdl() const { return maToggleHdl; }
+ void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
+ const Link<>& GetToggleHdl() const { return maToggleHdl; }
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
};
@@ -282,7 +282,7 @@ private:
bool mbSaveValue;
bool mbRadioCheck;
bool mbStateChanged;
- Link maToggleHdl;
+ Link<> maToggleHdl;
// when mbLegacyNoTextAlign is set then the old behaviour where
// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
// occurs, otherwise the image ( radiobutton circle ) is placed
@@ -373,8 +373,8 @@ public:
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
- const Link& GetToggleHdl() const { return maToggleHdl; }
+ void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
+ const Link<>& GetToggleHdl() const { return maToggleHdl; }
/** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group.
@@ -411,7 +411,7 @@ private:
TriState meState;
TriState meSaveValue;
bool mbTriState;
- Link maToggleHdl;
+ Link<> maToggleHdl;
// when mbLegacyNoTextAlign is set then the old behaviour where
// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
// occurs, otherwise the image ( checkbox box ) is placed
@@ -485,8 +485,8 @@ public:
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
- const Link& GetToggleHdl() const { return maToggleHdl; }
+ void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
+ const Link<>& GetToggleHdl() const { return maToggleHdl; }
bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; }
void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; }
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index a835a40d215f..83e4a1812d4a 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -45,8 +45,8 @@ private:
bool mbSyntheticModify : 1;
bool mbMatchCase : 1;
sal_Int32 m_nMaxWidthChars;
- Link maSelectHdl;
- Link maDoubleClickHdl;
+ Link<> maSelectHdl;
+ Link<> maDoubleClickHdl;
boost::signals2::scoped_connection mAutocompleteConnection;
struct ComboBoxBounds
@@ -163,10 +163,10 @@ public:
void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; }
sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
Size CalcMinimumSize() const SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index f3fd7026472b..7c3c9e69c9cc 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -41,8 +41,8 @@ protected:
private:
bool mbHasControlFocus;
- Link maGetFocusHdl;
- Link maLoseFocusHdl;
+ Link<> maGetFocusHdl;
+ Link<> maLoseFocusHdl;
SAL_DLLPRIVATE void ImplInitControlData();
@@ -79,7 +79,7 @@ protected:
if the Control instance has been destroyed in any of the call
*/
bool ImplCallEventListenersAndHandler(
- sal_uLong nEvent, const Link& rHandler, void* pCaller
+ sal_uLong nEvent, const Link<>& rHandler, void* pCaller
);
/** draws the given text onto the given device
@@ -163,10 +163,10 @@ public:
*/
long ToRelativeLineIndex( long nIndex ) const;
- void SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; }
- const Link& GetGetFocusHdl() const { return maGetFocusHdl; }
- void SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; }
- const Link& GetLoseFocusHdl() const { return maLoseFocusHdl; }
+ void SetGetFocusHdl( const Link<>& rLink ) { maGetFocusHdl = rLink; }
+ const Link<>& GetGetFocusHdl() const { return maGetFocusHdl; }
+ void SetLoseFocusHdl( const Link<>& rLink ) { maLoseFocusHdl = rLink; }
+ const Link<>& GetLoseFocusHdl() const { return maLoseFocusHdl; }
/** determines whether the control currently has the focus
*/
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index 254d887b7251..a714b227c69d 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -35,7 +35,7 @@ class VCL_DLLPUBLIC GraphicConverter
{
private:
- Link maFilterHdl;
+ Link<> maFilterHdl;
ConvertData* mpConvertData;
public:
@@ -48,8 +48,8 @@ public:
ConvertData* GetConvertData() { return mpConvertData; }
- void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; }
- const Link& GetFilterHdl() const { return maFilterHdl; }
+ void SetFilterHdl( const Link<>& rLink ) { maFilterHdl = rLink; }
+ const Link<>& GetFilterHdl() const { return maFilterHdl; }
};
#endif // INCLUDED_VCL_CVTGRF_HXX
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 652a06965e27..0587aefb7b3e 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -101,7 +101,7 @@ public:
// Dialog::Execute replacement API
public:
// Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended
- virtual void StartExecuteModal( const Link& rEndDialogHdl );
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl );
long GetResult() const;
private:
bool ImplStartExecuteModal();
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index dde925f47051..3eb655ccd09b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -94,8 +94,8 @@ private:
mbIsSubEdit:1,
mbInMBDown:1,
mbActivePopup:1;
- Link maModifyHdl;
- Link maUpdateDataHdl;
+ Link<> maModifyHdl;
+ Link<> maUpdateDataHdl;
css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
@@ -233,9 +233,9 @@ public:
const OUString& GetSavedValue() const { return maSaveValue; }
bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); }
- virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
- virtual const Link& GetModifyHdl() const { return maModifyHdl; }
- virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; }
+ virtual void SetModifyHdl( const Link<>& rLink ) { maModifyHdl = rLink; }
+ virtual const Link<>& GetModifyHdl() const { return maModifyHdl; }
+ virtual void SetUpdateDataHdl( const Link<>& rLink ) { maUpdateDataHdl = rLink; }
void SetSubEdit( Edit* pEdit );
Edit* GetSubEdit() const { return mpSubEdit; }
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 86b38f69253d..e98ec15398e8 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -36,12 +36,12 @@ namespace vcl
class VCL_DLLPUBLIC EventPoster
{
ImplSVEvent * m_nId;
- Link m_aLink;
+ Link<> m_aLink;
DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* );
public:
- EventPoster( const Link& rLink );
+ EventPoster( const Link<>& rLink );
~EventPoster();
void Post( UserEvent* pEvent );
};
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index cdc80d9cd31c..dc461b781771 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -43,7 +43,7 @@ class VCL_DLLPUBLIC FormatterBase
private:
VclPtr<Edit> mpField;
LocaleDataWrapper* mpLocaleDataWrapper;
- Link maErrorLink;
+ Link<> maErrorLink;
bool mbReformat;
bool mbStrictFormat;
bool mbEmptyFieldValue;
@@ -83,8 +83,8 @@ public:
const AllSettings& GetFieldSettings() const;
- void SetErrorHdl( const Link& rLink ) { maErrorLink = rLink; }
- const Link& GetErrorHdl() const { return maErrorLink; }
+ void SetErrorHdl( const Link<>& rLink ) { maErrorLink = rLink; }
+ const Link<>& GetErrorHdl() const { return maErrorLink; }
void SetEmptyFieldValue();
bool IsEmptyFieldValue() const;
@@ -229,7 +229,7 @@ protected:
OUString maCurUnitText;
sal_Int64 mnBaseValue;
FieldUnit meUnit;
- Link maCustomConvertLink;
+ Link<> maCustomConvertLink;
protected:
MetricFormatter();
@@ -270,8 +270,8 @@ public:
using NumericFormatter::GetCorrectedValue;
sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const;
- void SetCustomConvertHdl( const Link& rLink ) { maCustomConvertLink = rLink; }
- const Link& GetCustomConvertHdl() const { return maCustomConvertLink; }
+ void SetCustomConvertHdl( const Link<>& rLink ) { maCustomConvertLink = rLink; }
+ const Link<>& GetCustomConvertHdl() const { return maCustomConvertLink; }
};
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index 2fc8e2f95469..8af5860bcf4c 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -28,7 +28,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
private:
long m_nTextLen;
Pointer m_aOldPointer;
- Link m_aClickHdl;
+ Link<> m_aClickHdl;
OUString m_sURL;
/** initializes the font (link color and underline).
@@ -91,14 +91,14 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
m_aClickHdl is called if the text is clicked.
*/
- inline void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; }
+ inline void SetClickHdl( const Link<>& rLink ) { m_aClickHdl = rLink; }
/** returns m_aClickHdl.
@return
m_aClickHdl
*/
- inline const Link& GetClickHdl() const { return m_aClickHdl; }
+ inline const Link<>& GetClickHdl() const { return m_aClickHdl; }
// ::FixedHyperbaseLink
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index a9033a22670b..fb542ddffb06 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -89,7 +89,7 @@ private:
bool mbOldSaveBackMode;
bool mbGrabFocus; // act as key input window, although focus is not set
bool mbInCleanUp;
- Link maPopupModeEndHdl;
+ Link<> maPopupModeEndHdl;
SAL_DLLPRIVATE void ImplCallPopupModeEnd();
DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* );
@@ -144,8 +144,8 @@ public:
bool IsPopupModeCanceled() const { return mbPopupModeCanceled; }
bool IsPopupModeTearOff() const { return mbPopupModeTearOff; }
- void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; }
- const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; }
+ void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; }
+ const Link<>& GetPopupModeEndHdl() const { return maPopupModeEndHdl; }
bool GrabsFocus() const { return mbGrabFocus; }
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index e860dda464b1..43bfad95a0b6 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -78,7 +78,7 @@ private:
MapMode aPrefMapMode;
Size aPrefSize;
- Link aHookHdlLink;
+ Link<> aHookHdlLink;
GDIMetaFile* pPrev;
GDIMetaFile* pNext;
VclPtr<OutputDevice> pOutDev;
@@ -198,8 +198,8 @@ public:
const MapMode& GetPrefMapMode() const { return aPrefMapMode; }
void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; }
- void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; }
- const Link& GetHookHdl() const { return aHookHdlLink; }
+ void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; }
+ const Link<>& GetHookHdl() const { return aHookHdlLink; }
sal_uLong GetChecksum() const;
sal_uLong GetSizeBytes() const;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 1111dd46d533..778c6719c4c7 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -158,8 +158,8 @@ public:
void StopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0L );
- void SetAnimationNotifyHdl( const Link& rLink );
- Link GetAnimationNotifyHdl() const;
+ void SetAnimationNotifyHdl( const Link<>& rLink );
+ Link<> GetAnimationNotifyHdl() const;
sal_uLong GetAnimationLoopCount() const;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 5249d73600e5..44511930ec0b 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -315,7 +315,7 @@ public:
const FilterErrorEx& GetLastError() const { return *pErrorEx;}
void ResetLastError();
- const Link GetFilterCallback() const;
+ const Link<> GetFilterCallback() const;
static GraphicFilter& GetGraphicFilter();
static int LoadGraphic( const OUString& rPath, const OUString& rFilter,
Graphic& rGraphic,
diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index 9cb734546fb0..64cd9674f383 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -26,7 +26,7 @@
class VCL_DLLPUBLIC Idle : public Scheduler
{
protected:
- Link maIdleHdl; // Callback Link
+ Link<> maIdleHdl; // Callback Link
public:
Idle();
@@ -34,8 +34,8 @@ public:
/// Make it possible to associate a callback with this idle handler
/// of course, you can also sub-class and override 'Invoke'
- void SetIdleHdl( const Link& rLink ) { maIdleHdl = rLink; }
- const Link& GetIdleHdl() const { return maIdleHdl; }
+ void SetIdleHdl( const Link<>& rLink ) { maIdleHdl = rLink; }
+ const Link<>& GetIdleHdl() const { return maIdleHdl; }
virtual void Invoke() SAL_OVERRIDE;
Idle& operator=( const Idle& rIdle );
};
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index bec9976a7317..85c613919020 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -544,15 +544,15 @@ public:
return m_pDisclosureButton->GetText();
}
virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE;
- void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; }
- const Link& GetExpandedHdl() const { return maExpandedHdl; }
+ void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; }
+ const Link<>& GetExpandedHdl() const { return maExpandedHdl; }
protected:
virtual Size calculateRequisition() const SAL_OVERRIDE;
virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
private:
bool m_bResizeTopLevel;
VclPtr<DisclosureButton> m_pDisclosureButton;
- Link maExpandedHdl;
+ Link<> maExpandedHdl;
DECL_DLLPRIVATE_LINK(ClickHdl, DisclosureButton* pBtn);
};
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 5647f974f396..bd13541337c3 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -44,8 +44,8 @@ private:
sal_uInt16 mnDDHeight;
sal_Int32 mnSaveValue;
sal_Int32 m_nMaxWidthChars;
- Link maSelectHdl;
- Link maDoubleClickHdl;
+ Link<> maSelectHdl;
+ Link<> maDoubleClickHdl;
sal_uInt16 mnLineCount;
/// bitfield
@@ -190,10 +190,10 @@ public:
void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false );
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown
Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 32dfd5a73d28..2af6a530cb27 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -126,10 +126,10 @@ private:
Menu* pStartedFrom;
VclPtr<vcl::Window> pWindow;
- Link aActivateHdl; // Active-Handler
- Link aDeactivateHdl; // Deactivate-Handler
- Link aHighlightHdl; // Highlight-Handler
- Link aSelectHdl; // Highlight-Handler
+ Link<> aActivateHdl; // Active-Handler
+ Link<> aDeactivateHdl; // Deactivate-Handler
+ Link<> aHighlightHdl; // Highlight-Handler
+ Link<> aSelectHdl; // Highlight-Handler
VclEventListeners maEventListeners;
VclEventListeners maChildEventListeners;
@@ -320,24 +320,24 @@ public:
void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
OString GetHelpId( sal_uInt16 nItemId ) const;
- void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; }
- const Link& GetActivateHdl() const { return aActivateHdl; }
+ void SetActivateHdl( const Link<>& rLink ) { aActivateHdl = rLink; }
+ const Link<>& GetActivateHdl() const { return aActivateHdl; }
- void SetDeactivateHdl( const Link& rLink ) { aDeactivateHdl = rLink; }
- const Link& GetDeactivateHdl() const { return aDeactivateHdl; }
+ void SetDeactivateHdl( const Link<>& rLink ) { aDeactivateHdl = rLink; }
+ const Link<>& GetDeactivateHdl() const { return aDeactivateHdl; }
- void SetHighlightHdl( const Link& rLink ) { aHighlightHdl = rLink; }
- const Link& GetHighlightHdl() const { return aHighlightHdl; }
+ void SetHighlightHdl( const Link<>& rLink ) { aHighlightHdl = rLink; }
+ const Link<>& GetHighlightHdl() const { return aHighlightHdl; }
- void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return aSelectHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { aSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return aSelectHdl; }
bool HasLogo() const { return pLogo != nullptr; }
- void AddEventListener( const Link& rEventListener );
- void RemoveEventListener( const Link& rEventListener );
- void AddChildEventListener( const Link& rEventListener );
- void RemoveChildEventListener( const Link& rEventListener );
+ void AddEventListener( const Link<>& rEventListener );
+ void RemoveEventListener( const Link<>& rEventListener );
+ void AddChildEventListener( const Link<>& rEventListener );
+ void RemoveChildEventListener( const Link<>& rEventListener );
Menu& operator =( const Menu& rMenu );
@@ -393,9 +393,9 @@ namespace vcl
class VCL_DLLPUBLIC MenuBar : public Menu
{
- Link maCloseHdl;
- Link maFloatHdl;
- Link maHideHdl;
+ Link<> maCloseHdl;
+ Link<> maFloatHdl;
+ Link<> maHideHdl;
bool mbCloseBtnVisible;
bool mbFloatBtnVisible;
bool mbHideBtnVisible;
@@ -447,12 +447,12 @@ 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; }
- void SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; }
- const Link& GetFloatButtonClickHdl() const { return maFloatHdl; }
- void SetHideButtonClickHdl( const Link& rLink ) { maHideHdl = rLink; }
- const Link& GetHideButtonClickHdl() const { return maHideHdl; }
+ void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; }
+ const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; }
+ void SetFloatButtonClickHdl( const Link<>& rLink ) { maFloatHdl = rLink; }
+ const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; }
+ void SetHideButtonClickHdl( const Link<>& rLink ) { maHideHdl = rLink; }
+ const Link<>& GetHideButtonClickHdl() const { return maHideHdl; }
// - by default a menubar is displayable
// - if a menubar is not displayable, its MenuBarWindow will never be shown
@@ -470,11 +470,11 @@ public:
// add an arbitrary button to the menubar (will appear next to closer)
// passed link will be call with a MenuBarButtonCallbackArg on press
// passed string will be set as tooltip
- sal_uInt16 AddMenuBarButton( const Image&, const Link&, const OUString&, sal_uInt16 nPos = 0 );
+ sal_uInt16 AddMenuBarButton( const Image&, const Link<>&, const OUString&, sal_uInt16 nPos = 0 );
// set the highlight link for additional button with ID nId
// highlight link will be called with a MenuBarButtonHighlightArg
// the bHighlight member of that struct shall contain the new state
- void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& );
+ void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& );
// returns the rectangle occupied by the additional button named nId
// coordinates are relative to the systemwindiow the menubar is attached to
// if the menubar is unattached an empty rectangle is returned
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index eb2c446a4a53..ffeaa19919bc 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -41,8 +41,8 @@ private:
PopupMenu* mpMenu;
sal_uInt16 mnCurItemId;
sal_uInt16 mnMenuMode;
- Link maActivateHdl;
- Link maSelectHdl;
+ Link<> maActivateHdl;
+ Link<> maSelectHdl;
SAL_DLLPRIVATE void ImplInitMenuButtonData();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
@@ -77,10 +77,10 @@ public:
OString GetCurItemIdent() const;
void SetCurItemId( sal_uInt16 nItemId ) { mnCurItemId = nItemId; }
- void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
- const Link& GetActivateHdl() const { return maActivateHdl; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
+ void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+ const Link<>& GetActivateHdl() const { return maActivateHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
};
#endif // INCLUDED_VCL_MENUBTN_HXX
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index be18fd06bb6a..e6d3b28c1638 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -227,7 +227,7 @@ private:
bool mbInPrintPage;
bool mbNewJobSetup;
bool mbIsQueuePrinter;
- Link maErrorHdl;
+ Link<> maErrorHdl;
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
@@ -372,8 +372,8 @@ public:
sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); }
sal_uLong GetErrorCode() const { return mnError; }
- void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; }
- const Link& GetErrorHdl() const { return maErrorHdl; }
+ void SetErrorHdl( const Link<>& rLink ) { maErrorHdl = rLink; }
+ const Link<>& GetErrorHdl() const { return maErrorHdl; }
/** checks the printer list and updates it necessary
*
@@ -552,7 +552,7 @@ public:
VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false );
VCL_PLUGIN_PUBLIC void printFilteredPage( int i_nPage );
SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& );
- SAL_DLLPRIVATE void setOptionChangeHdl( const Link& );
+ SAL_DLLPRIVATE void setOptionChangeHdl( const Link<>& );
VCL_PLUGIN_PUBLIC void createProgressDialog();
VCL_PLUGIN_PUBLIC bool isProgressCanceled() const;
SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 3a16f9e4359e..71bda7168c3b 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -65,8 +65,8 @@ private:
ScrollType meDDScrollType;
bool mbCalcSize;
bool mbFullDrag;
- Link maScrollHdl;
- Link maEndScrollHdl;
+ Link<> maScrollHdl;
+ Link<> maEndScrollHdl;
SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt );
using Window::ImplInit;
@@ -134,10 +134,10 @@ public:
long GetDelta() const { return mnDelta; }
ScrollType GetType() const { return meScrollType; }
- void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; }
- const Link& GetScrollHdl() const { return maScrollHdl; }
- void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; }
- const Link& GetEndScrollHdl() const { return maEndScrollHdl; }
+ void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; }
+ const Link<>& GetScrollHdl() const { return maScrollHdl; }
+ void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; }
+ const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; }
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index a2900309abe6..4f3677677e3b 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -50,8 +50,8 @@ private:
ScrollType meScrollType;
bool mbCalcSize;
bool mbFullDrag;
- Link maSlideHdl;
- Link maEndSlideHdl;
+ Link<> maSlideHdl;
+ Link<> maEndSlideHdl;
using Control::ImplInitSettings;
using Window::ImplInit;
@@ -107,10 +107,10 @@ public:
Size CalcWindowSizePixel();
- void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; }
- const Link& GetSlideHdl() const { return maSlideHdl; }
- void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; }
- const Link& GetEndSlideHdl() const { return maEndSlideHdl; }
+ void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; }
+ const Link<>& GetSlideHdl() const { return maSlideHdl; }
+ void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl = rLink; }
+ const Link<>& GetEndSlideHdl() const { return maEndSlideHdl; }
};
#endif // INCLUDED_VCL_SLIDER_HXX
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index a78f3b292b1f..1e40c6d6f017 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -43,8 +43,8 @@ private:
bool mbInitialDown : 1;
bool mbHorz : 1;
bool mbUpperIsFocused : 1;
- Link maUpHdlLink;
- Link maDownHdlLink;
+ Link<> maUpHdlLink;
+ Link<> maDownHdlLink;
long mnMinRange;
long mnMaxRange;
long mnValue;
@@ -84,10 +84,10 @@ public:
long GetValueStep() const { return mnValueStep; }
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
- const Link& GetUpHdl() const { return maUpHdlLink; }
- void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; }
- const Link& GetDownHdl() const { return maDownHdlLink; }
+ void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; }
+ const Link<>& GetUpHdl() const { return maUpHdlLink; }
+ void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; }
+ const Link<>& GetDownHdl() const { return maDownHdlLink; }
private:
// moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed.
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 20a3a43f3745..8060271d1777 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -34,10 +34,10 @@ protected:
Rectangle maUpperRect;
Rectangle maLowerRect;
Rectangle maDropDownRect; // noch nicht angebunden...
- Link maUpHdlLink;
- Link maDownHdlLink;
- Link maFirstHdlLink;
- Link maLastHdlLink;
+ Link<> maUpHdlLink;
+ Link<> maDownHdlLink;
+ Link<> maFirstHdlLink;
+ Link<> maLastHdlLink;
bool mbRepeat:1,
mbSpin:1,
mbInitialUp:1,
@@ -89,14 +89,14 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
- const Link& GetUpHdl() const { return maUpHdlLink; }
- void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; }
- const Link& GetDownHdl() const { return maDownHdlLink; }
- void SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; }
- const Link& GetFirstHdl() const { return maFirstHdlLink; }
- void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; }
- const Link& GetLastHdl() const { return maLastHdlLink; }
+ void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; }
+ const Link<>& GetUpHdl() const { return maUpHdlLink; }
+ void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; }
+ const Link<>& GetDownHdl() const { return maDownHdlLink; }
+ void SetFirstHdl( const Link<>& rLink ) { maFirstHdlLink = rLink; }
+ const Link<>& GetFirstHdl() const { return maFirstHdlLink; }
+ void SetLastHdl( const Link<>& rLink ) { maLastHdlLink = rLink; }
+ const Link<>& GetLastHdl() const { return maLastHdlLink; }
virtual Size CalcMinimumSize() const SAL_OVERRIDE;
virtual Size CalcMinimumSizeForText(const OUString &rString) const SAL_OVERRIDE;
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 91a1c0df99c5..a9a185bb67eb 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -39,9 +39,9 @@ private:
bool mbKbdSplitting;
long mbInKeyEvent;
long mnKeyboardStepSize;
- Link maStartSplitHdl;
- Link maSplitHdl;
- Link maEndSplitHdl;
+ Link<> maStartSplitHdl;
+ Link<> maSplitHdl;
+ Link<> maEndSplitHdl;
SAL_DLLPRIVATE void ImplInitSplitterData();
SAL_DLLPRIVATE void ImplDrawSplitter();
@@ -99,12 +99,12 @@ public:
// the default is 10% of the reference window's width/height
void SetKeyboardStepSize( long nStepSize );
- void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
- const Link& GetStartSplitHdl() const { return maStartSplitHdl; }
- void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
- void SetEndSplitHdl( const Link& rLink ) { maEndSplitHdl = rLink; }
- const Link& GetEndSplitHdl() const { return maEndSplitHdl; }
- const Link& GetSplitHdl() const { return maSplitHdl; }
+ void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; }
+ const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; }
+ void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; }
+ void SetEndSplitHdl( const Link<>& rLink ) { maEndSplitHdl = rLink; }
+ const Link<>& GetEndSplitHdl() const { return maEndSplitHdl; }
+ const Link<>& GetSplitHdl() const { return maSplitHdl; }
};
#endif // INCLUDED_VCL_SPLIT_HXX
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index d0ffa134a10a..08ea8f5c7871 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -78,12 +78,12 @@ private:
mbFadeOutPressed:1,
mbFadeNoButtonMode:1,
mbNoAlign:1;
- Link maStartSplitHdl;
- Link maSplitHdl;
- Link maSplitResizeHdl;
- Link maAutoHideHdl;
- Link maFadeInHdl;
- Link maFadeOutHdl;
+ Link<> maStartSplitHdl;
+ Link<> maSplitHdl;
+ Link<> maSplitResizeHdl;
+ Link<> maAutoHideHdl;
+ Link<> maFadeInHdl;
+ Link<> maFadeOutHdl;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
@@ -203,18 +203,18 @@ public:
void SetAutoHideState( bool bAutoHide );
bool GetAutoHideState() const { return mbAutoHideIn; }
- void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
- const Link& GetStartSplitHdl() const { return maStartSplitHdl; }
- void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
- const Link& GetSplitHdl() const { return maSplitHdl; }
- void SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; }
- const Link& GetSplitResizeHdl() const { return maSplitResizeHdl; }
- void SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; }
- const Link& GetAutoHideHdl() const { return maAutoHideHdl; }
- void SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; }
- const Link& GetFadeInHdl() const { return maFadeInHdl; }
- void SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; }
- const Link& GetFadeOutHdl() const { return maFadeOutHdl; }
+ void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; }
+ const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; }
+ void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; }
+ const Link<>& GetSplitHdl() const { return maSplitHdl; }
+ void SetSplitResizeHdl( const Link<>& rLink ) { maSplitResizeHdl = rLink; }
+ const Link<>& GetSplitResizeHdl() const { return maSplitResizeHdl; }
+ void SetAutoHideHdl( const Link<>& rLink ) { maAutoHideHdl = rLink; }
+ const Link<>& GetAutoHideHdl() const { return maAutoHideHdl; }
+ void SetFadeInHdl( const Link<>& rLink ) { maFadeInHdl = rLink; }
+ const Link<>& GetFadeInHdl() const { return maFadeInHdl; }
+ void SetFadeOutHdl( const Link<>& rLink ) { maFadeOutHdl = rLink; }
+ const Link<>& GetFadeOutHdl() const { return maFadeOutHdl; }
};
#endif // INCLUDED_VCL_SPLITWIN_HXX
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 50b52f981a91..f0fdbf653f25 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -93,8 +93,8 @@ private:
bool mbProgressMode;
bool mbInUserDraw;
bool mbAdjustHiDPI;
- Link maClickHdl;
- Link maDoubleClickHdl;
+ Link<> maClickHdl;
+ Link<> maDoubleClickHdl;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
@@ -198,10 +198,10 @@ public:
Size CalcWindowSizePixel() const;
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
using Window::SetAccessibleName;
void SetAccessibleName( sal_uInt16 nItemId, const OUString& rName );
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 720bf7eeeecf..a576a2c479b8 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -42,7 +42,6 @@
#include <o3tl/typed_flags_set.hxx>
class BitmapEx;
-class Link;
class AllSettings;
class DataChangedEvent;
class Accelerator;
@@ -591,7 +590,7 @@ public:
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
EnableNoYieldMode, DisableNoYieldMode, RemovePostYieldListener
*/
- static void AddPostYieldListener( const Link& i_rListener );
+ static void AddPostYieldListener( const Link<>& i_rListener );
/** Remove listener for yield events
@@ -601,7 +600,7 @@ public:
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
AddPostYieldListener, EnableNoYieldMode, DisableNoYieldMode
*/
- static void RemovePostYieldListener( const Link& i_rListener );
+ static void RemovePostYieldListener( const Link<>& i_rListener );
/** Queries whether the application is in "main", i.e. not yet in
@@ -755,7 +754,7 @@ public:
@see RemoveEventListener, AddKeyListener, RemoveKeyListener
*/
- static void AddEventListener( const Link& rEventListener );
+ static void AddEventListener( const Link<>& rEventListener );
/** Remove a VCL event listener from the application.
@@ -763,7 +762,7 @@ public:
@see AddEventListener, AddKeyListener, RemoveKeyListener
*/
- static void RemoveEventListener( const Link& rEventListener );
+ static void RemoveEventListener( const Link<>& rEventListener );
/** Add a keypress listener to the application. If keypress listener exists,
then initialize the application's keypress event listener with a new one, then
@@ -773,7 +772,7 @@ public:
@see AddEventListener, RemoveEventListener, RemoveKeyListener
*/
- static void AddKeyListener( const Link& rKeyListener );
+ static void AddKeyListener( const Link<>& rKeyListener );
/** Remove a keypress listener from the application.
@@ -781,7 +780,7 @@ public:
@see AddEventListener, RemoveEventListener, AddKeyListener
*/
- static void RemoveKeyListener( const Link& rKeyListener );
+ static void RemoveKeyListener( const Link<>& rKeyListener );
/** Send event to all VCL application event listeners
@@ -869,7 +868,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<>& rLink, void* pCaller = NULL );
/** Remove user event based on event ID
@@ -887,13 +886,13 @@ public:
@return true if the handler was inserted successfully, false if it couldn't be inserted.
*/
- static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority );
+ static bool InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPriority );
/** Remove an idle handler from the application.
@param rLink const reference to the idle handler to remove
*/
- static void RemoveIdleHdl( const Link& rLink );
+ static void RemoveIdleHdl( const Link<>& rLink );
/*** Get the DisplayConnection.
@@ -1359,13 +1358,13 @@ public:
@see GetFilterHdl
*/
- static void SetFilterHdl( const Link& rLink );
+ static void SetFilterHdl( const Link<>& rLink );
/*** Get a new graphics filter
@return Const reference to the Link object (the filter)
*/
- static const Link& GetFilterHdl();
+ static const Link<>& GetFilterHdl();
///@}
@@ -1504,7 +1503,7 @@ public:
///@}
// For vclbootstrapprotector:
- static void setDeInitHook(Link const & hook);
+ static void setDeInitHook(Link<> const & hook);
private:
@@ -1703,7 +1702,7 @@ VCL_DLLPUBLIC void JoinMainLoopThread();
inline void Application::EndYield()
{
- PostUserEvent( Link() );
+ PostUserEvent( Link<>() );
}
namespace vcl
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index f90fb16bfeea..29ed4b4225ed 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -267,8 +267,8 @@ public:
void SetApplicationID( const OUString &rApplicationID );
- void SetCloseHdl(const Link& rLink);
- const Link& GetCloseHdl() const;
+ void SetCloseHdl(const Link<>& rLink);
+ const Link<>& GetCloseHdl() const;
SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutIdle.IsActive(); }
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 05fd48e9cef7..df8e6ffb6669 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -49,8 +49,8 @@ private:
bool mbRestoreUnqId;
bool mbSmallInvalidate;
bool mbLayoutDirty;
- Link maActivateHdl;
- Link maDeactivateHdl;
+ Link<> maActivateHdl;
+ Link<> maDeactivateHdl;
using Control::ImplInitSettings;
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
@@ -160,10 +160,10 @@ public:
const OString& GetHelpId() const
{ return Control::GetHelpId(); }
- void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
- const Link& GetActivatePageHdl() const { return maActivateHdl; }
- void SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
- const Link& GetDeactivatePageHdl() const { return maDeactivateHdl; }
+ void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+ const Link<>& GetActivatePageHdl() const { return maActivateHdl; }
+ void SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
+ const Link<>& GetDeactivatePageHdl() const { return maDeactivateHdl; }
// returns (control relative) bounding rectangle for the
// character at index nIndex relative to the text of page nPageId
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 8ab238a293bd..c1779ce04294 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -26,7 +26,7 @@
class VCL_DLLPUBLIC Timer : public Scheduler
{
protected:
- Link maTimeoutHdl; // Callback Link
+ Link<> maTimeoutHdl; // Callback Link
sal_uInt64 mnTimeout;
bool mbAuto;
@@ -43,8 +43,8 @@ public:
/// Make it possible to associate a callback with this timer handler
/// of course, you can also sub-class and override 'Invoke'
- void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; }
- const Link& GetTimeoutHdl() const { return maTimeoutHdl; }
+ void SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; }
+ const Link<>& GetTimeoutHdl() const { return maTimeoutHdl; }
void SetTimeout( sal_uInt64 nTimeoutMs );
sal_uInt64 GetTimeout() const { return mnTimeout; }
virtual void Invoke() SAL_OVERRIDE;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index b03f05174a01..661ea918a641 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -185,15 +185,15 @@ private:
PointerStyle meLastStyle;
WinBits mnWinStyle;
ToolBoxLayoutMode meLayoutMode;
- Link maClickHdl;
- Link maDoubleClickHdl;
- Link maActivateHdl;
- Link maDeactivateHdl;
- Link maHighlightHdl;
- Link maSelectHdl;
- Link maCommandHandler;
- Link maStateChangedHandler;
- Link maDataChangedHandler;
+ Link<> maClickHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maActivateHdl;
+ Link<> maDeactivateHdl;
+ Link<> maHighlightHdl;
+ Link<> maSelectHdl;
+ Link<> maCommandHandler;
+ Link<> maStateChangedHandler;
+ Link<> maDataChangedHandler;
public:
using Window::ImplInit;
@@ -495,26 +495,26 @@ public:
using DockingWindow::SetHelpId;
using DockingWindow::GetHelpId;
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- void SetDropdownClickHdl( const Link& rLink );
- const Link& GetDropdownClickHdl() const;
- void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
- const Link& GetActivateHdl() const { return maActivateHdl; }
- void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
- const Link& GetDeactivateHdl() const { return maDeactivateHdl; }
- void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
- const Link& GetHighlightHdl() const { return maHighlightHdl; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetCommandHdl( const Link& aLink ) { maCommandHandler = aLink; }
- const Link& GetCommandHdl() const { return maCommandHandler; }
- void SetStateChangedHdl( const Link& aLink ) { maStateChangedHandler = aLink; }
- const Link& GetStateChangedHdl() const { return maStateChangedHandler; }
- void SetDataChangedHdl( const Link& aLink ) { maDataChangedHandler = aLink; }
- const Link& GetDataChangedHdl() { return maDataChangedHandler; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetDropdownClickHdl( const Link<>& rLink );
+ const Link<>& GetDropdownClickHdl() const;
+ void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+ const Link<>& GetActivateHdl() const { return maActivateHdl; }
+ void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
+ const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; }
+ void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
+ const Link<>& GetHighlightHdl() const { return maHighlightHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; }
+ const Link<>& GetCommandHdl() const { return maCommandHandler; }
+ void SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; }
+ const Link<>& GetStateChangedHdl() const { return maStateChangedHandler; }
+ void SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
+ const Link<>& GetDataChangedHdl() { return maDataChangedHandler; }
// support for custom menu (eg for configuration)
// note: this menu will also be used to display currently
@@ -528,7 +528,7 @@ public:
bool IsMenuEnabled() const;
PopupMenu* GetMenu() const;
void UpdateCustomMenu();
- void SetMenuButtonHdl( const Link& rLink );
+ void SetMenuButtonHdl( const Link<>& rLink );
// open custommenu
void ExecuteCustomMenu();
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 99f329e8da65..5729e1d4fcd5 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -261,22 +261,22 @@ public:
// and returns true in that case
// a handler must return true to signal that it has processed the event
bool Process( VclSimpleEvent* pEvent ) const;
- void addListener( const Link& rListener );
- void removeListener( const Link& rListener );
+ void addListener( const Link<>& rListener );
+ void removeListener( const Link<>& rListener );
private:
- std::list<Link> m_aListeners;
+ std::list<Link<>> m_aListeners;
};
class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier
{
- std::list< Link > m_aListeners;
+ std::list< Link<> > m_aListeners;
struct ListenerIt
{
- std::list< Link >::iterator m_aIt;
+ std::list< Link<> >::iterator m_aIt;
bool m_bWasInvalidated;
- ListenerIt(const std::list<Link>::iterator& rIt)
+ ListenerIt(const std::list<Link<>>::iterator& rIt)
: m_aIt(rIt)
, m_bWasInvalidated( false )
{}
@@ -289,8 +289,8 @@ public:
VclEventListeners2();
~VclEventListeners2();
- void addListener( const Link& );
- void removeListener( const Link& );
+ void addListener( const Link<>& );
+ void removeListener( const Link<>& );
void callListeners( VclSimpleEvent* );
};
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 034c25412969..441edcd45bf4 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -36,10 +36,10 @@ private:
ImpVclMEdit* pImpVclMEdit;
OUString aSaveValue;
- Link aModifyHdlLink;
+ Link<> aModifyHdlLink;
Timer* pUpdateDataTimer;
- Link aUpdateDataHdlLink;
+ Link<> aUpdateDataHdlLink;
protected:
@@ -109,10 +109,10 @@ public:
const OUString& GetSavedValue() const { return aSaveValue; }
bool IsValueChangedFromSaved() const { return aSaveValue != GetText(); }
- void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; }
- const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; }
+ void SetModifyHdl( const Link<>& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; }
+ const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; }
- void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; }
+ void SetUpdateDataHdl( const Link<>& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; }
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index cde2c864f248..ccee88b2c20d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -722,12 +722,12 @@ public:
virtual bool Notify( NotifyEvent& rNEvt );
virtual vcl::Window* GetPreferredKeyInputWindow();
- void AddEventListener( const Link& rEventListener );
- void RemoveEventListener( const Link& rEventListener );
- void AddChildEventListener( const Link& rEventListener );
- void RemoveChildEventListener( const Link& rEventListener );
+ void AddEventListener( const Link<>& rEventListener );
+ void RemoveEventListener( const Link<>& rEventListener );
+ void AddChildEventListener( const Link<>& rEventListener );
+ void RemoveChildEventListener( const Link<>& rEventListener );
- ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL );
+ ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL );
void RemoveUserEvent( ImplSVEvent * nUserEvent );
void IncrementLockCount();
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 7685b447fef6..b547b33c8fff 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -61,7 +61,7 @@ class OAddFieldWindow :public FloatingWindow
VclPtr<FixedText> m_aHelpText;
VclPtr<PushButton> m_aInsertButton;
- Link m_aCreateLink;
+ Link<> m_aCreateLink;
OUString m_aCommandName;
OUString m_sFilter;
sal_Int32 m_nCommandType;
@@ -88,7 +88,7 @@ public:
inline const OUString& GetCommand() const { return m_aCommandName; }
inline sal_Int32 GetCommandType() const { return m_nCommandType; }
inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; }
- inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; }
+ inline void SetCreateHdl(const Link<>& _aCreateLink) { m_aCreateLink = _aCreateLink; }
inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const { return m_xColumns; }
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const;
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index c0ebffb83922..b3eeca1021bc 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -33,7 +33,7 @@ namespace rptui
void operator =(const OColorListener&) SAL_DELETED_FUNCTION;
protected:
OModuleClient m_aModuleClient;
- Link m_aCollapsedLink;
+ Link<> m_aCollapsedLink;
svtools::ColorConfig m_aColorConfig;
svtools::ExtendedColorConfig m_aExtendedColorConfig;
OUString m_sColorEntry;
@@ -63,7 +63,7 @@ namespace rptui
*/
inline bool isMarked() const { return m_bMarked; }
- inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; }
+ inline void setCollapsedHdl(const Link<>& _aLink ){ m_aCollapsedLink = _aLink; }
inline bool isCollapsed() const { return m_bCollapsed; }
/** collapse or expand
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 15881fdee485..c8c6a0e61898 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -44,7 +44,7 @@ public:
BiNode * Left() const { return pLeft ; }
BiNode * Right() const{ return pRight ; }
- void EnumNodes( Link aLink ) const;
+ void EnumNodes( Link<> aLink ) const;
};
class NameNode : public BiNode
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index a080349cf80d..f37ea656f719 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/source/tools/rsctree.cxx
@@ -35,7 +35,7 @@ BiNode::~BiNode()
{
}
-void BiNode::EnumNodes( Link aLink ) const
+void BiNode::EnumNodes( Link<> aLink ) const
{
if( Left() )
Left()->EnumNodes( aLink );
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 49209b65bc0d..935178bd4b46 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -54,7 +54,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
bool Refresh( const OUString& rNewFile, const OUString& rNewFilter,
const OUString& rNewArea, sal_uLong nNewRefresh );
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a4fc6fa6a959..ac2726d1f00c 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -111,9 +111,9 @@ namespace editeng { class SvxBorderLine; }
class ScLinkListener : public SvtListener
{
- Link aLink;
+ Link<> aLink;
public:
- ScLinkListener(const Link& rL) : aLink(rL) {}
+ ScLinkListener(const Link<>& rL) : aLink(rL) {}
virtual ~ScLinkListener();
virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE;
};
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 6599d841b95a..8c4b695a6dd3 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -913,7 +913,7 @@ class ScChangeTrack : public utl::ConfigurationListener
ScChangeTrackMsgStack aMsgStackFinal;
std::set<OUString> maUserCollection;
OUString maUser;
- Link aModifiedLink;
+ Link<> aModifiedLink;
ScRange aInDeleteRange;
DateTime aFixDateTime;
ScChangeAction* pFirst;
@@ -1200,9 +1200,9 @@ public:
// If ModifiedLink is set, changes go to
// ScChangeTrackMsgQueue
- void SetModifiedLink( const Link& r )
+ void SetModifiedLink( const Link<>& r )
{ aModifiedLink = r; ClearMsgQueue(); }
- const Link& GetModifiedLink() const { return aModifiedLink; }
+ const Link<>& GetModifiedLink() const { return aModifiedLink; }
ScChangeTrackMsgQueue& GetMsgQueue();
void NotifyModified( ScChangeTrackMsgType eMsgType,
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 708bd858c628..2da067aa22b8 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -214,7 +214,7 @@ public:
};
private:
- Link aRefreshHandler;
+ Link<> aRefreshHandler;
ScDocument* pDoc;
sal_uInt16 nEntryIndex; ///< counter for unique indices
NamedDBs maNamedDBs;
@@ -246,9 +246,9 @@ public:
sal_uInt16 GetEntryIndex() { return nEntryIndex; }
void SetEntryIndex(sal_uInt16 nInd) { nEntryIndex = nInd; }
- void SetRefreshHandler( const Link& rLink )
+ void SetRefreshHandler( const Link<>& rLink )
{ aRefreshHandler = rLink; }
- const Link& GetRefreshHandler() const { return aRefreshHandler; }
+ const Link<>& GetRefreshHandler() const { return aRefreshHandler; }
bool empty() const;
bool operator== (const ScDBCollection& r) const;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 9aab2af911ac..f26526419207 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -70,7 +70,7 @@ public:
virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE;
- virtual void Edit(vcl::Window* pParent, const Link& rEndEditHdl) SAL_OVERRIDE;
+ virtual void Edit(vcl::Window* pParent, const Link<>& rEndEditHdl) SAL_OVERRIDE;
void SetDoReferesh(bool b);
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index aa9f11c1ed7b..7962290f2ae4 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -37,12 +37,12 @@ public:
class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem
{
- Link aCommitLink;
+ Link<> aCommitLink;
public:
ScLinkConfigItem( const OUString& rSubTree );
ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode );
- void SetCommitLink( const Link& rLink );
+ void SetCommitLink( const Link<>& rLink );
virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
virtual void ImplCommit() SAL_OVERRIDE;
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 68f2b957e3c6..2eed9833d7ee 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -54,7 +54,7 @@ public:
bool operator!=( const ScRefreshTimer& r ) const;
void SetRefreshControl( ScRefreshTimerControl * const * pp );
- void SetRefreshHandler( const Link& rLink );
+ void SetRefreshHandler( const Link<>& rLink );
sal_uLong GetRefreshDelay() const;
void StopRefreshTimer();
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index fb85482d3ab2..3296c76b22a5 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -52,7 +52,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
bool Refresh(const OUString& rNewFile, const OUString& rNewFilter,
const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 2afb10989b12..2a0f08530aba 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -115,7 +115,7 @@ void ScPoolHelper::SourceDocumentGone()
// reset all pointers to the source document
mxStylePool->SetDocument( NULL );
if ( pFormTable )
- pFormTable->SetColorLink( Link() );
+ pFormTable->SetColorLink( Link<>() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 0574517749b0..76a61b5c9fc8 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -42,7 +42,7 @@ ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode )
{
}
-void ScLinkConfigItem::SetCommitLink( const Link& rLink )
+void ScLinkConfigItem::SetCommitLink( const Link<>& rLink )
{
aCommitLink = rLink;
}
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 1dab3d6d52ba..1a4bf179445e 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -89,7 +89,7 @@ void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp )
ppControl = pp;
}
-void ScRefreshTimer::SetRefreshHandler( const Link& rLink )
+void ScRefreshTimer::SetRefreshHandler( const Link<>& rLink )
{
SetTimeoutHdl( rLink );
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index fd390dd5d5a6..dc46cca851c4 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -264,7 +264,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
{
- Link aOldLink = pEdit->GetImportHdl();
+ Link<> aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
@@ -2874,7 +2874,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
}
}
- Link aOldLink = pEdit->GetImportHdl();
+ Link<> aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
pEdit->SetImportHdl( aOldLink );
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 31065f0800a9..b436ebfb457e 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -58,7 +58,7 @@ ScRTFParser::~ScRTFParser()
sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
{
- Link aOldLink = pEdit->GetImportHdl();
+ Link<> aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
if ( nLastToken == RTF_PAR )
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index c6ca6ad40564..a9add1cb7618 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -713,7 +713,7 @@ ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell,
ScAccessibleCellTextData::~ScAccessibleCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
if (mpEditViewForwarder)
@@ -972,7 +972,7 @@ ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
{
// If the object is cloned, do NOT set notify hdl.
if (mpEditEngine && !mbIsCloned)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
if (mpEditViewForwarder)
@@ -1088,7 +1088,7 @@ ScAccessibleEditLineTextData::~ScAccessibleEditLineTextData()
// the NotifyHdl also has to be removed from the ScTextWnd's EditEngine
// (it's set in ScAccessibleEditLineTextData::GetTextForwarder, and mpEditEngine
// is reset there)
- pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link());
+ pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link<>());
}
}
@@ -1183,7 +1183,7 @@ void ScAccessibleEditLineTextData::ResetEditMode()
if (mbEditEngineCreated && mpEditEngine)
delete mpEditEngine;
else if (pTxtWnd && pTxtWnd->GetEditView() && pTxtWnd->GetEditView()->GetEditEngine())
- pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link());
+ pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link<>());
mpEditEngine = NULL;
DELETEZ(mpForwarder);
@@ -1236,7 +1236,7 @@ ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell*
ScAccessiblePreviewCellTextData::~ScAccessiblePreviewCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
}
@@ -1314,7 +1314,7 @@ ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScP
ScAccessiblePreviewHeaderCellTextData::~ScAccessiblePreviewHeaderCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
}
@@ -1432,7 +1432,7 @@ ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
if (mpDocSh)
mpDocSh->GetDocument().RemoveUnoObject(*this);
if (mpEditEngine)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
delete mpEditEngine;
delete mpForwarder;
}
@@ -1547,7 +1547,7 @@ ScAccessibleNoteTextData::~ScAccessibleNoteTextData()
if (mpDocSh)
mpDocSh->GetDocument().RemoveUnoObject(*this);
if (mpEditEngine)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
delete mpEditEngine;
delete mpForwarder;
}
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 5583760ba2e2..ecc1a8bcdf8b 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -112,7 +112,7 @@ void ScRandomNumberGeneratorDialog::Init()
mpButtonClose->SetClickHdl( LINK( this, ScRandomNumberGeneratorDialog, CloseClicked ) );
mpButtonApply->SetClickHdl( LINK( this, ScRandomNumberGeneratorDialog, ApplyClicked ) );
- Link aLink = LINK( this, ScRandomNumberGeneratorDialog, GetFocusHandler );
+ Link<> aLink = LINK( this, ScRandomNumberGeneratorDialog, GetFocusHandler );
mpInputRangeEdit->SetGetFocusHdl( aLink );
mpInputRangeButton->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index f985adb04648..e8bd197f7949 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -87,7 +87,7 @@ void ScSamplingDialog::Init()
mpButtonOk->SetClickHdl( LINK( this, ScSamplingDialog, OkClicked ) );
mpButtonOk->Enable(false);
- Link aLink = LINK( this, ScSamplingDialog, GetFocusHandler );
+ Link<> aLink = LINK( this, ScSamplingDialog, GetFocusHandler );
mpInputRangeEdit->SetGetFocusHdl( aLink );
mpInputRangeButton->SetGetFocusHdl( aLink );
mpOutputRangeEdit->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 8e2fa67a455c..8887c5a1425c 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -111,7 +111,7 @@ void ScStatisticsInputOutputDialog::Init()
mpButtonOk->SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, OkClicked ) );
mpButtonOk->Enable(false);
- Link aLink = LINK( this, ScStatisticsInputOutputDialog, GetFocusHandler );
+ Link<> aLink = LINK( this, ScStatisticsInputOutputDialog, GetFocusHandler );
mpInputRangeEdit->SetGetFocusHdl( aLink );
mpInputRangeButton->SetGetFocusHdl( aLink );
mpOutputRangeEdit->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 8dc5ade17d61..ce7cdf7744ba 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -92,7 +92,7 @@ void ScStatisticsTwoVariableDialog::Init()
mpButtonOk->SetClickHdl( LINK( this, ScStatisticsTwoVariableDialog, OkClicked ) );
mpButtonOk->Enable(false);
- Link aLink = LINK( this, ScStatisticsTwoVariableDialog, GetFocusHandler );
+ Link<> aLink = LINK( this, ScStatisticsTwoVariableDialog, GetFocusHandler );
mpVariable1RangeEdit->SetGetFocusHdl( aLink );
mpVariable1RangeButton->SetGetFocusHdl( aLink );
mpVariable2RangeEdit->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a4c64d5691ad..db2c1bb1b52d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1437,7 +1437,7 @@ void ScMultiTextWnd::InitEditEngine()
void ScMultiTextWnd::StopEditEngine( bool bAll )
{
if ( pEditEngine )
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
ScTextWnd::StopEditEngine( bAll );
}
@@ -1853,7 +1853,7 @@ void ScTextWnd::StopEditEngine( bool bAll )
aString = pEditEngine->GetText();
bIsInsertMode = pEditView->IsInsertMode();
bool bSelection = pEditView->HasSelection();
- pEditEngine->SetModifyHdl(Link());
+ pEditEngine->SetModifyHdl(Link<>());
DELETEZ(pEditView);
DELETEZ(pEditEngine);
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index b6bb098af896..9148f7ec2588 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -90,7 +90,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
IMPL_LINK_NOARG(ScAttrDlg, OkHandler)
{
- ((Link&)GetOKButton().GetClickHdl()).Call( NULL );
+ ((Link<>&)GetOKButton().GetClickHdl()).Call( NULL );
return 0;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 216c3c8a8211..9f90132c0e34 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -73,7 +73,7 @@ public: \
: pDlg(p) \
{} \
virtual ~Class(); \
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; \
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; \
long GetResult() SAL_OVERRIDE;
#define IMPL_ABSTDLG_BASE(Class) \
@@ -89,7 +89,7 @@ short Class::Execute() \
Class::~Class() \
{ \
} \
-void Class::StartExecuteModal( const Link& rEndDialogHdl ) \
+void Class::StartExecuteModal( const Link<>& rEndDialogHdl ) \
{ \
pDlg->StartExecuteModal( rEndDialogHdl ) ; \
} \
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 6858d5df706e..e6e2b9890039 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -78,7 +78,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
maAddressDetails (mpDocument->GetAddressConvention(), 0, 0),
mbDialogLostFocus (false)
{
- Link aLink;
+ Link<> aLink;
get(mpListBoxField, "listbox-fields");
get(mpListBoxPage, "listbox-page");
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 9dab72200314..3dab776b8a1b 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -38,7 +38,7 @@ ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) :
maHScroll->SetLineSize( 1 );
maVScroll->SetLineSize( 1 );
- Link aLink = LINK( this, ScCsvTableBox, CsvCmdHdl );
+ Link<> aLink = LINK( this, ScCsvTableBox, CsvCmdHdl );
SetCmdHdl( aLink );
maRuler->SetCmdHdl( aLink );
maGrid->SetCmdHdl( aLink );
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index e3584d570015..8ac10bee2fa3 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -452,7 +452,7 @@ void ScFilterDlg::SetActive()
{
pEdCopyArea->GrabFocus();
if ( pEdCopyArea->GetModifyHdl().IsSet() )
- ((Link&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea );
+ ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea );
}
else
GrabFocus();
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 3c56ba69ca4a..e63ac13b4abb 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -370,7 +370,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
lcl_FillCombo( *pCbTextSep, aTextSepList, mcTextSep );
pCbTextSep->SetText( sTextSeparators );
- Link aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
+ Link<> aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
pCbTextSep->SetSelectHdl( aSeparatorHdl );
pCbTextSep->SetModifyHdl( aSeparatorHdl );
pCkbTab->SetClickHdl( aSeparatorHdl );
@@ -774,8 +774,8 @@ IMPL_LINK( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox*, pTableBox )
pFtType->Enable( bEnable );
pLbType->Enable( bEnable );
- Link aSelHdl = pLbType->GetSelectHdl();
- pLbType->SetSelectHdl( Link() );
+ Link<> aSelHdl = pLbType->GetSelectHdl();
+ pLbType->SetSelectHdl( Link<>() );
if( bEmpty )
pLbType->SetNoSelection();
else if( bEnable )
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 028963d76556..120669101b1b 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -255,7 +255,7 @@ void ScSpecialFilterDlg::SetActive()
{
pEdCopyArea->GrabFocus();
if ( pEdCopyArea->GetModifyHdl().IsSet() )
- ((Link&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea );
+ ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea );
}
else if ( pRefInputEdit == pEdFilterArea )
{
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 9e0b76e821f8..e0518cd06d7f 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -85,7 +85,7 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems)
m_rVertScroll.SetRangeMin( 0 );
m_rVertScroll.SetVisibleSize( 0xFFFF );
- Link aScrollLink = LINK( this, ScSortKeyCtrl, ScrollHdl );
+ Link<> aScrollLink = LINK( this, ScSortKeyCtrl, ScrollHdl );
m_rVertScroll.SetScrollHdl( aScrollLink );
}
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 211b6d233e1b..e0be3a2bc573 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -72,7 +72,7 @@ bool ScTextImportOptionsDlg::isDateConversionSet() const
void ScTextImportOptionsDlg::init()
{
- Link aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
+ Link<> aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
m_pBtnOk->SetClickHdl(aLink);
aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl );
m_pRbAutomatic->SetClickHdl(aLink);
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 8b3247af4f3b..9e1fe0af342b 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -84,7 +84,7 @@ ScAreaLink::~ScAreaLink()
delete pImpl;
}
-void ScAreaLink::Edit(vcl::Window* pParent, const Link& /* rEndEditHdl */ )
+void ScAreaLink::Edit(vcl::Window* pParent, const Link<>& /* rEndEditHdl */ )
{
// use own dialog instead of SvBaseLink::Edit...
// DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index ddea5130c995..74e1e3251153 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1327,7 +1327,7 @@ void ScExternalRefLink::Closed()
return SUCCESS;
}
-void ScExternalRefLink::Edit(vcl::Window* pParent, const Link& /*rEndEditHdl*/)
+void ScExternalRefLink::Edit(vcl::Window* pParent, const Link<>& /*rEndEditHdl*/)
{
SvBaseLink::Edit(pParent, LINK(this, ScExternalRefLink, ExternalRefEndEditHdl));
}
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 6c8edb9ecbb5..4b7ff828e66d 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -49,7 +49,7 @@ struct TableLink_Impl
{
ScDocShell* m_pDocSh;
VclPtr<vcl::Window> m_pOldParent;
- Link m_aEndEditLink;
+ Link<> m_aEndEditLink;
TableLink_Impl() : m_pDocSh( NULL ), m_pOldParent( NULL ) {}
};
@@ -106,7 +106,7 @@ ScTableLink::~ScTableLink()
delete pImpl;
}
-void ScTableLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl )
+void ScTableLink::Edit( vcl::Window* pParent, const Link<>& rEndEditHdl )
{
// DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
// ein Optionen-Dialog kommt...
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1a692d54dc80..96ae3c0ac2c3 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -124,17 +124,17 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
aFiFuncDesc->SetFont(aFont);
aFiFuncDesc->SetBackground( GetBackground() ); //! never transparent?
- Link aLink=LINK( this, ScFunctionDockWin, SelHdl);
+ Link<> aLink=LINK( this, ScFunctionDockWin, SelHdl);
aCatBox->SetSelectHdl(aLink);
aFuncList->SetSelectHdl(aLink);
aDDFuncList->SetSelectHdl(aLink);
- Link a2Link=LINK( this, ScFunctionDockWin, SetSelectionHdl);
+ Link<> a2Link=LINK( this, ScFunctionDockWin, SetSelectionHdl);
aFuncList->SetDoubleClickHdl(a2Link);
aDDFuncList->SetSelectHdl(aLink);
aInsertButton->SetClickHdl(a2Link);
- Link a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
+ Link<> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
aPrivatSplit->SetCtrModifiedHdl(a3Link);
StartListening( *pBindingsP, true );
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 168b6927cbfc..e0d1e8cb187f 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -43,7 +43,7 @@ class ScCondFrmtEntry : public Control
private:
bool mbActive;
- Link maClickHdl;
+ Link<> maClickHdl;
//general ui elements
VclPtr<FixedText> maFtCondNr;
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index fee07ecba715..3639d6f93eaf 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -229,7 +229,7 @@ protected:
::com::sun::star::accessibility::XAccessible > XAccessibleRef;
private:
- Link maCmdHdl; /// External command handler.
+ Link<> maCmdHdl; /// External command handler.
ScCsvCmd maCmd; /// Data of last command.
const ScCsvLayoutData& mrData; /// Shared layout data.
@@ -286,9 +286,9 @@ public:
// command handling -------------------------------------------------------
/** Sets a new command handler. */
- inline void SetCmdHdl( const Link& rHdl ) { maCmdHdl = rHdl; }
+ inline void SetCmdHdl( const Link<>& rHdl ) { maCmdHdl = rHdl; }
/** Returns the current command handler. */
- inline const Link& GetCmdHdl() const { return maCmdHdl; }
+ inline const Link<>& GetCmdHdl() const { return maCmdHdl; }
/** Returns data of the last command. */
inline const ScCsvCmd& GetCmd() const { return maCmd; }
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 2c5b458b5fcc..747199b89d53 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -51,8 +51,8 @@ private:
VclPtr<ScrollBar> maVScroll; /// Vertical scroll bar.
VclPtr<ScrollBarBox> maScrollBox; /// For the bottom right edge.
- Link maUpdateTextHdl; /// Updates all cell texts.
- Link maColTypeHdl; /// Handler for exporting the column type.
+ Link<> maUpdateTextHdl; /// Updates all cell texts.
+ Link<> maColTypeHdl; /// Handler for exporting the column type.
ScCsvColStateVec maFixColStates; /// Column states in fixed width mode.
ScCsvColStateVec maSepColStates; /// Column states in separators mode.
@@ -113,13 +113,13 @@ public:
// event handling ---------------------------------------------------------
public:
/** Sets a new handler for "update cell texts" requests. */
- inline void SetUpdateTextHdl( const Link& rHdl ) { maUpdateTextHdl = rHdl; }
+ inline void SetUpdateTextHdl( const Link<>& rHdl ) { maUpdateTextHdl = rHdl; }
/** Returns the handler for "update cell texts" requests. */
- inline const Link& GetUpdateTextHdl() const { return maUpdateTextHdl; }
+ inline const Link<>& GetUpdateTextHdl() const { return maUpdateTextHdl; }
/** Sets a new handler for "column selection changed" events. */
- inline void SetColTypeHdl( const Link& rHdl ) { maColTypeHdl = rHdl; }
+ inline void SetColTypeHdl( const Link<>& rHdl ) { maColTypeHdl = rHdl; }
/** Returns the handler for "column selection changed" events. */
- inline const Link& GetColTypeHdl() const { return maColTypeHdl; }
+ inline const Link<>& GetColTypeHdl() const { return maColTypeHdl; }
protected:
virtual void Resize() SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index 49494c609133..1e99143dd811 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -52,8 +52,8 @@ class ScFuncPage : public TabPage
{
private:
- Link aDoubleClickLink;
- Link aSelectionLink;
+ Link<> aDoubleClickLink;
+ Link<> aSelectionLink;
FixedText aFtCategory;
ListBox aLbCategory;
FixedText aFtFunction;
@@ -85,11 +85,11 @@ public:
const ScFuncDesc* GetFuncDesc( sal_uInt16 nPos ) const;
OUString GetSelFunctionName() const;
- void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
- const Link& GetDoubleClickHdl() const { return aDoubleClickLink; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClickLink = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return aDoubleClickLink; }
- void SetSelectHdl( const Link& rLink ) { aSelectionLink = rLink; }
- const Link& GetSelectHdl() const { return aSelectionLink; }
+ void SetSelectHdl( const Link<>& rLink ) { aSelectionLink = rLink; }
+ const Link<>& GetSelectHdl() const { return aSelectionLink; }
};
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 1a9acfa1f072..d48d78da49a2 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -36,12 +36,12 @@ namespace com { namespace sun { namespace star {
class ScCursorRefEdit : public formula::RefEdit
{
- Link maCursorUpLink;
- Link maCursorDownLink;
+ Link<> maCursorUpLink;
+ Link<> maCursorDownLink;
public:
ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel );
- void SetCursorLinks( const Link& rUp, const Link& rDown );
+ void SetCursorLinks( const Link<>& rUp, const Link<>& rDown );
protected:
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 7018dfe969ca..9089782f5bb4 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -28,7 +28,7 @@ class ScPrivatSplit : public Control
{
private:
- Link aCtrModifiedLink;
+ Link<> aCtrModifiedLink;
bool aMovingFlag;
Pointer aWinPointer;
SC_SPLIT_DIRECTION eScSplit;
@@ -66,8 +66,8 @@ class ScPrivatSplit : public Control
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; }
- const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; }
+ void SetCtrModifiedHdl( const Link<>& rLink ) { aCtrModifiedLink = rLink; }
+ const Link<>& GetCtrModifiedHdl() const { return aCtrModifiedLink; }
};
#endif
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 650ac840d8b7..6d12f0ed4246 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -160,9 +160,9 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
static void SetDefaultPosSize(Point aPos, Size aSize, bool bSet = true);
void SetRefString(const OUString& rStr);
- void SetCloseHdl( const Link& rLink );
- void SetUnoLinks( const Link& rDone, const Link& rAbort,
- const Link& rChange );
+ void SetCloseHdl( const Link<>& rLink );
+ void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
+ const Link<>& rChange );
void SetFlags( bool bCloseOnButtonUp, bool bSingleCell, bool bMultiSelection );
static void SetAutoReOpen(bool bFlag);
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 9a4d66c3a173..4b8db1757763 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -35,10 +35,10 @@ class ScDocument;
class ScSimpleRefDlg: public ScAnyRefDlg
{
private:
- Link aCloseHdl;
- Link aDoneHdl;
- Link aAbortedHdl;
- Link aChangeHdl;
+ Link<> aCloseHdl;
+ Link<> aDoneHdl;
+ Link<> aAbortedHdl;
+ Link<> aChangeHdl;
VclPtr<FixedText> m_pFtAssign;
VclPtr<formula::RefEdit> m_pEdAssign;
@@ -79,9 +79,9 @@ public:
void SetRefString(const OUString &rStr);
virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
- void SetCloseHdl( const Link& rLink );
- void SetUnoLinks( const Link& rDone, const Link& rAbort,
- const Link& rChange );
+ void SetCloseHdl( const Link<>& rLink );
+ void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
+ const Link<>& rChange );
void SetFlags( bool bSetCloseOnButtonUp, bool bSetSingleCell, bool bSetMultiSelection );
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 9ad107a9905a..cd4d3bfb74e2 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -71,7 +71,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; }
- void SetObjectSelectHdl( const Link& aLink) { aObjectSelectLink = aLink; }
+ void SetObjectSelectHdl( const Link<>& aLink) { aObjectSelectLink = aLink; }
void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; }
protected:
@@ -94,7 +94,7 @@ private:
com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc;
ScAccessibleEditObject* pAcc;
- Link aObjectSelectLink;
+ Link<> aObjectSelectLink;
};
class SC_DLLPUBLIC ScExtIButton : public ImageButton
@@ -103,7 +103,7 @@ private:
Idle aIdle;
PopupMenu* pPopupMenu;
- Link aMLink;
+ Link<> aMLink;
sal_uInt16 nSelected;
OString aSelectedIdent;
@@ -126,8 +126,8 @@ public:
sal_uInt16 GetSelected() const { return nSelected;}
OString GetSelectedIdent() const { return aSelectedIdent;}
- void SetMenuHdl( const Link& rLink ) { aMLink = rLink; }
- const Link& GetMenuHdl() const { return aMLink; }
+ void SetMenuHdl( const Link<>& rLink ) { aMLink = rLink; }
+ const Link<>& GetMenuHdl() const { return aMLink; }
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index ac1b5a4bb012..f8011b957a44 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -164,7 +164,7 @@ void ScAcceptChgDlg::dispose()
if(pChanges!=NULL)
{
- Link aLink;
+ Link<> aLink;
pChanges->SetModifiedLink(aLink);
}
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 55ca2df0cb59..d44b489ff2ad 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -107,7 +107,7 @@ void ScColRowNameRangesDlg::Init()
pBtnRowHead->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
pEdAssign2->SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
- Link aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl );
+ Link<> aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl );
pEdAssign->SetGetFocusHdl( aLink );
pRbAssign->SetGetFocusHdl( aLink );
pEdAssign2->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 9b4f998f56fe..8bc45a74e074 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -140,7 +140,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCursorRefEdit(vcl::W
return new ScCursorRefEdit(pParent, nullptr);
}
-void ScCursorRefEdit::SetCursorLinks( const Link& rUp, const Link& rDown )
+void ScCursorRefEdit::SetCursorLinks( const Link<>& rUp, const Link<>& rDown )
{
maCursorUpLink = rUp;
maCursorDownLink = rDown;
@@ -381,7 +381,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
m_pBtnCancel->SetClickHdl( LINK( this, ScOptSolverDlg, BtnHdl ) );
m_pBtnSolve->SetClickHdl( LINK( this, ScOptSolverDlg, BtnHdl ) );
- Link aLink = LINK( this, ScOptSolverDlg, GetFocusHdl );
+ Link<> aLink = LINK( this, ScOptSolverDlg, GetFocusHdl );
m_pEdObjectiveCell->SetGetFocusHdl( aLink );
m_pRBObjectiveCell->SetGetFocusHdl( aLink );
m_pEdTargetValue->SetGetFocusHdl( aLink );
@@ -413,9 +413,9 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
mpRightButton[nRow]->SetLoseFocusHdl( aLink );
}
- Link aCursorUp = LINK( this, ScOptSolverDlg, CursorUpHdl );
- Link aCursorDown = LINK( this, ScOptSolverDlg, CursorDownHdl );
- Link aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl );
+ Link<> aCursorUp = LINK( this, ScOptSolverDlg, CursorUpHdl );
+ Link<> aCursorDown = LINK( this, ScOptSolverDlg, CursorDownHdl );
+ Link<> aCondModify = LINK( this, ScOptSolverDlg, CondModifyHdl );
for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
{
mpLeftEdit[nRow]->SetCursorLinks( aCursorUp, aCursorDown );
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index cf552f41f0e7..1e3b7d490b50 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -89,7 +89,7 @@ void ScTableProtectionDlg::WriteData(ScTableProtection& rData) const
void ScTableProtectionDlg::Init()
{
- Link aLink = LINK( this, ScTableProtectionDlg, CheckBoxHdl );
+ Link<> aLink = LINK( this, ScTableProtectionDlg, CheckBoxHdl );
m_pBtnProtect->SetClickHdl(aLink);
aLink = LINK( this, ScTableProtectionDlg, OKHdl );
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 60be4c415bcf..ce482a3a2156 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -155,7 +155,7 @@ void ScRetypePassDlg::WriteNewDataToDocument(ScDocument& rDoc) const
void ScRetypePassDlg::Init()
{
- Link aLink = LINK( this, ScRetypePassDlg, OKHdl );
+ Link<> aLink = LINK( this, ScRetypePassDlg, OKHdl );
mpBtnOk->SetClickHdl(aLink);
aLink = LINK( this, ScRetypePassDlg, RetypeBtnHdl );
@@ -365,7 +365,7 @@ OUString ScRetypePassInputDlg::GetNewPassword() const
void ScRetypePassInputDlg::Init()
{
- Link aLink = LINK( this, ScRetypePassInputDlg, OKHdl );
+ Link<> aLink = LINK( this, ScRetypePassInputDlg, OKHdl );
m_pBtnOk->SetClickHdl(aLink);
aLink = LINK( this, ScRetypePassInputDlg, RadioBtnHdl );
m_pBtnRetypePassword->SetClickHdl(aLink);
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 866bb129af9d..429b84a6140a 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -149,13 +149,13 @@ bool ScSimpleRefDlg::IsRefInputMode() const
return true;
}
-void ScSimpleRefDlg::SetCloseHdl( const Link& rLink )
+void ScSimpleRefDlg::SetCloseHdl( const Link<>& rLink )
{
aCloseHdl=rLink;
}
-void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort,
- const Link& rChange )
+void ScSimpleRefDlg::SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
+ const Link<>& rChange )
{
aDoneHdl = rDone;
aAbortedHdl = rAbort;
@@ -195,7 +195,7 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl)
bAutoReOpen=false;
OUString aResult=m_pEdAssign->GetText();
aCloseHdl.Call(&aResult);
- Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose
+ Link<> aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose
DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() );
aUnoLink.Call( &aResult );
return 0;
@@ -206,7 +206,7 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl)
bAutoReOpen=false;
OUString aResult=m_pEdAssign->GetText();
aCloseHdl.Call(NULL);
- Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose
+ Link<> aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose
DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() );
aUnoLink.Call( &aResult );
return 0;
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 45f6f453b83b..af94aabb8424 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -96,7 +96,7 @@ void ScSolverDlg::Init()
m_pBtnOk->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) );
m_pBtnCancel->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) );
- Link aLink = LINK( this, ScSolverDlg, GetFocusHdl );
+ Link<> aLink = LINK( this, ScSolverDlg, GetFocusHdl );
m_pEdFormulaCell->SetGetFocusHdl( aLink );
m_pRBFormulaCell->SetGetFocusHdl( aLink );
m_pEdVariableCell->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index d4f8c17ece4a..e86b3b42785d 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -103,7 +103,7 @@ void ScTabOpDlg::Init()
m_pBtnOk->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
m_pBtnCancel->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
- Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl );
+ Link<> aLink = LINK( this, ScTabOpDlg, GetFocusHdl );
m_pEdFormulaRange->SetGetFocusHdl( aLink );
m_pRBFormulaRange->SetGetFocusHdl( aLink );
m_pEdRowCell->SetGetFocusHdl( aLink );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 090738cbe436..3b1aa06e89ab 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -253,10 +253,10 @@ void ScNameDlg::UpdateChecks(ScRangeData* pData)
// handlers, triggering handlers while already processing a handler can
// ( and does in this case ) corrupt the internal data
- m_pBtnCriteria->SetToggleHdl( Link() );
- m_pBtnPrintArea->SetToggleHdl( Link() );
- m_pBtnColHeader->SetToggleHdl( Link() );
- m_pBtnRowHeader->SetToggleHdl( Link() );
+ m_pBtnCriteria->SetToggleHdl( Link<>() );
+ m_pBtnPrintArea->SetToggleHdl( Link<>() );
+ m_pBtnColHeader->SetToggleHdl( Link<>() );
+ m_pBtnRowHeader->SetToggleHdl( Link<>() );
m_pBtnCriteria->Check( pData->HasType( RT_CRITERIA ) );
m_pBtnPrintArea->Check( pData->HasType( RT_PRINTAREA ) );
@@ -264,7 +264,7 @@ void ScNameDlg::UpdateChecks(ScRangeData* pData)
m_pBtnRowHeader->Check( pData->HasType( RT_ROWHEADER ) );
// Restore handlers so user input is processed again
- Link aToggleHandler = LINK( this, ScNameDlg, EdModifyHdl );
+ Link<> aToggleHandler = LINK( this, ScNameDlg, EdModifyHdl );
m_pBtnCriteria->SetToggleHdl( aToggleHandler );
m_pBtnPrintArea->SetToggleHdl( aToggleHandler );
m_pBtnColHeader->SetToggleHdl( aToggleHandler );
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index f0deec661e62..3560c01e2a58 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -48,7 +48,7 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent,
get(m_pInsertColorLB, "entries");
get(m_pMoveColorLB, "insertions");
- Link aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl);
+ Link<> aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl);
m_pContentColorLB->SetSelectHdl( aLk );
m_pMoveColorLB->SetSelectHdl( aLk );
m_pInsertColorLB->SetSelectHdl( aLk );
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 1f6416fc7197..3e7feb1ff2f8 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -58,7 +58,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r
mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString());
mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString());
- Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
+ Link<> aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
mpBtnSepReset->SetClickHdl(aLink);
mpBtnCustomCalcDefault->SetClickHdl(aLink);
mpBtnCustomCalcCustom->SetClickHdl(aLink);
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 251285e85f64..c1d533417e13 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -69,13 +69,13 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent,
get(pOutlineCB,"outline");
SetExchangeSupport();
- Link aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
+ Link<> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
pObjGrfLB-> SetSelectHdl(aSelObjHdl);
pDiagramLB-> SetSelectHdl(aSelObjHdl);
pDrawLB-> SetSelectHdl(aSelObjHdl);
pGridLB-> SetSelectHdl( LINK( this, ScTpContentOptions, GridHdl ) );
- Link aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
+ Link<> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
pFormulaCB ->SetClickHdl(aCBHdl);
pNilCB ->SetClickHdl(aCBHdl);
pAnnotCB ->SetClickHdl(aCBHdl);
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 4d8410726a2e..69dc943b72d3 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -365,14 +365,14 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt )
void ScExtIButton::MouseButtonUp( const MouseEvent& rMEvt)
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link());
+ aIdle.SetIdleHdl(Link<>());
ImageButton::MouseButtonUp(rMEvt );
}
void ScExtIButton::Click()
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link());
+ aIdle.SetIdleHdl(Link<>());
ImageButton::Click();
}
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index d1da58a3cd47..98eff3043f5b 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -97,7 +97,7 @@ void AlignmentPropertyPanel::Initialize()
mpFTLeftIndent->Disable();
mpMFLeftIndent->Disable();
mpMFLeftIndent->SetAccessibleName(OUString( "Left Indent")); //wj acc
- Link aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
+ Link<> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
mpMFLeftIndent->SetModifyHdl ( aLink );
aLink = LINK(this, AlignmentPropertyPanel, CBOXMergnCellClkHdl);
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index b3012fab9141..7ee1f5bb5f49 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -167,7 +167,7 @@ void CellAppearancePropertyPanel::Initialize()
const sal_uInt16 nIdBorderType = mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE );
mpTBCellBorder->SetItemImage( nIdBorderType, maIMGCellBorder );
mpTBCellBorder->SetItemBits( nIdBorderType, mpTBCellBorder->GetItemBits( nIdBorderType ) | ToolBoxItemBits::DROPDOWNONLY );
- Link aLink = LINK(this, CellAppearancePropertyPanel, TbxCellBorderSelectHdl);
+ Link<> aLink = LINK(this, CellAppearancePropertyPanel, TbxCellBorderSelectHdl);
mpTBCellBorder->SetDropdownClickHdl ( aLink );
mpTBCellBorder->SetSelectHdl ( aLink );
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index ff09bcf7b5b0..0c62047365af 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -100,7 +100,7 @@ void CellBorderStyleControl::Initialize()
maTBBorder1->SetPaintTransparent(true);
Size aTbxSize( maTBBorder1->CalcWindowSizePixel() );
maTBBorder1->SetOutputSizePixel( aTbxSize );
- Link aLink = LINK(this, CellBorderStyleControl, TB1SelectHdl);
+ Link<> aLink = LINK(this, CellBorderStyleControl, TB1SelectHdl);
maTBBorder1->SetSelectHdl ( aLink );
maTBBorder2->SetLineCount(2);
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 0528df76bc98..e23f4cde5e54 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -59,7 +59,7 @@ void CellLineStyleControl::dispose()
void CellLineStyleControl::Initialize()
{
//maPushButtonMoreOptions->SetIcoPosX(2);
- Link aLink = LINK(this, CellLineStyleControl, PBClickHdl);
+ Link<> aLink = LINK(this, CellLineStyleControl, PBClickHdl);
maPushButtonMoreOptions->SetClickHdl(aLink);
maCellLineStyleValueSet->SetStyle(maCellLineStyleValueSet->GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT);
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 3d59a6dfce51..c005b8c1096c 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -90,7 +90,7 @@ void NumberFormatPropertyPanel::dispose()
void NumberFormatPropertyPanel::Initialize()
{
- Link aLink = LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl);
+ Link<> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl);
mpLbCategory->SetSelectHdl ( aLink );
mpLbCategory->SelectEntryPos(0);
mpLbCategory->SetAccessibleName(OUString( "Category"));
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 2b427c3023ca..0ba222434e9d 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -931,7 +931,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<>( pDlg, &DelayDeleteAbstractDialog ) );
}
}
break;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 94f629c2f696..8703ae4150fd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3193,7 +3193,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
if (pHdl)
pHdl->SetModified();
- Link aLink = LINK( this, ScGridWindow, PopupSpellingHdl );
+ Link<> aLink = LINK( this, ScGridWindow, PopupSpellingHdl );
pEditView->ExecuteSpellPopup( aMenuPos, &aLink );
bDone = true;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index dc8bd2d21cbb..970eff0ce189 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -184,7 +184,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
ScPreviewShell::~ScPreviewShell()
{
if (mpFrameWindow)
- mpFrameWindow->SetCloseHdl(Link()); // Remove close handler.
+ mpFrameWindow->SetCloseHdl(Link<>()); // Remove close handler.
// #108333#; notify Accessibility that Shell is dying and before destroy all
BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) );
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 3b0e96224d29..4ba4eb96acac 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -193,7 +193,7 @@ void ScSimpleRefDlgWrapper::SetRefString(const OUString& rStr)
}
}
-void ScSimpleRefDlgWrapper::SetCloseHdl( const Link& rLink )
+void ScSimpleRefDlgWrapper::SetCloseHdl( const Link<>& rLink )
{
if(pWindow!=nullptr)
{
@@ -201,8 +201,8 @@ void ScSimpleRefDlgWrapper::SetCloseHdl( const Link& rLink )
}
}
-void ScSimpleRefDlgWrapper::SetUnoLinks( const Link& rDone,
- const Link& rAbort, const Link& rChange )
+void ScSimpleRefDlgWrapper::SetUnoLinks( const Link<>& rDone,
+ const Link<>& rAbort, const Link<>& rChange )
{
if(pWindow!=nullptr)
{
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 71661bf301bb..dc2817df36cd 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -239,7 +239,7 @@ void ScTabViewShell::Deactivate(bool bMDI)
if(pChanges!=NULL)
{
- Link aLink;
+ Link<> aLink;
pChanges->SetModifiedLink(aLink);
}
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 0224565d322c..9e23ca6f307e 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -94,12 +94,12 @@ ScXMLSourceDlg::ScXMLSourceDlg(
maXMLParam.maImgElementRepeat = Image(ScResId(IMG_ELEMENT_REPEAT));
maXMLParam.maImgAttribute = Image(ScResId(IMG_ELEMENT_ATTRIBUTE));
- Link aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl);
+ Link<> aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl);
mpBtnSelectSource->SetClickHdl(aBtnHdl);
mpBtnOk->SetClickHdl(aBtnHdl);
mpBtnCancel->SetClickHdl(aBtnHdl);
- Link aLink = LINK(this, ScXMLSourceDlg, GetFocusHdl);
+ Link<> aLink = LINK(this, ScXMLSourceDlg, GetFocusHdl);
mpRefEdit->SetGetFocusHdl(aLink);
mpRefBtn->SetGetFocusHdl(aLink);
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index 6bcb1071f789..5e42f93ee0f3 100644
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
@@ -28,15 +28,15 @@ class SdrObjFactory;
class SdObjectFactory
{
protected:
- Link aOldMakeObjLink;
- Link aOldMakeUserDataLink;
+ Link<> aOldMakeObjLink;
+ Link<> aOldMakeUserDataLink;
public:
SdObjectFactory() {}
- void SetOldMakeUserDataHdl( const Link& rLink )
+ void SetOldMakeUserDataHdl( const Link<>& rLink )
{ aOldMakeUserDataLink = rLink; }
- Link GetOldMakeUserDataHdl() const { return aOldMakeUserDataLink; }
+ Link<> GetOldMakeUserDataHdl() const { return aOldMakeUserDataLink; }
DECL_LINK( MakeUserData, SdrObjFactory * );
};
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 76f9d384d877..1abbd8e136ad 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -884,7 +884,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
mbHasOnlineSpellErrors = false;
::sd::Outliner* pOutl = GetInternalOutliner(true);
pOutl->SetUpdateMode(true);
- Link aEvtHdl = pOutl->GetStatusEventHdl();
+ Link<> aEvtHdl = pOutl->GetStatusEventHdl();
pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl));
sal_uInt16 nOldOutlMode = pOutl->GetMode();
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index f21dfdb03544..fac2dfc0f88e 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -177,7 +177,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
{
pWindow->RemoveChildEventListener (maWindowLink);
- maWindowLink = Link();
+ maWindowLink = Link<>();
}
}
break;
@@ -484,7 +484,7 @@ void AccessibleDocumentViewBase::impl_dispose()
{
if (pWindow)
pWindow->RemoveChildEventListener (maWindowLink);
- maWindowLink = Link();
+ maWindowLink = Link<>();
}
else
{
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 90e907c489e2..7528ccb19b68 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -48,7 +48,7 @@ namespace accessibility
AccessibleOutlineEditSource::~AccessibleOutlineEditSource()
{
if( mpOutliner )
- mpOutliner->SetNotifyHdl( Link() );
+ mpOutliner->SetNotifyHdl( Link<>() );
Broadcast( TextHint( SFX_HINT_DYING ) );
}
@@ -196,7 +196,7 @@ namespace accessibility
if( bDispose )
{
if( mpOutliner )
- mpOutliner->SetNotifyHdl( Link() );
+ mpOutliner->SetNotifyHdl( Link<>() );
mpOutliner = NULL;
mpOutlinerView = NULL;
Broadcast( TextHint( SFX_HINT_DYING ) );
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 59bcdecaceb0..6ab163cbb26f 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -73,14 +73,14 @@ public:
sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND );
- void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; }
+ void SetDoubleClickLink( const Link<>& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; }
DECL_LINK(implDoubleClickHdl, void *);
private:
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
- Link maDoubleClickHdl;
+ Link<> maDoubleClickHdl;
};
CategoryListBox::CategoryListBox( vcl::Window* pParent )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index c2bd3292e100..0e06814de8ed 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -98,7 +98,7 @@ namespace sd {
class PresetPropertyBox : public PropertySubControl
{
public:
- PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl );
+ PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl );
virtual ~PresetPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -110,7 +110,7 @@ private:
VclPtr<ListBox> mpControl;
};
-PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl )
+PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
{
mpControl = VclPtr<ListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -175,7 +175,7 @@ Control* PresetPropertyBox::getControl()
class ColorPropertyBox : public PropertySubControl
{
public:
- ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~ColorPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -186,7 +186,7 @@ private:
VclPtr<ColorListBox> mpControl;
};
-ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
{
mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -247,7 +247,7 @@ Control* ColorPropertyBox::getControl()
class FontPropertyBox : public PropertySubControl
{
public:
- FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~FontPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -259,7 +259,7 @@ private:
VclPtr<FontNameBox> mpControl;
};
-FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
{
mpControl = VclPtr<FontNameBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -327,7 +327,7 @@ public:
void Resize() SAL_OVERRIDE;
bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void SetMenuSelectHdl( const Link& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); }
+ void SetMenuSelectHdl( const Link<>& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); }
private:
VclPtr<Edit> mpSubControl;
@@ -401,7 +401,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
class CharHeightPropertyBox : public PropertySubControl
{
public:
- CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~CharHeightPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -417,7 +417,7 @@ private:
VclPtr<MetricField> mpMetric;
};
-CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
{
mpMetric.set( VclPtr<MetricField>::Create( pParent, WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) );
@@ -478,7 +478,7 @@ Control* CharHeightPropertyBox::getControl()
class TransparencyPropertyBox : public PropertySubControl
{
public:
- TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~TransparencyPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -495,10 +495,10 @@ private:
VclPtr<DropdownMenuBox> mpControl;
PopupMenu* mpMenu;
VclPtr<MetricField> mpMetric;
- Link maModifyHdl;
+ Link<> maModifyHdl;
};
-TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -519,7 +519,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W
mpControl->SetMenuSelectHdl( LINK( this, TransparencyPropertyBox, implMenuSelectHdl ));
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX );
- Link aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) );
+ Link<> aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink );
OUString aPresetId;
@@ -582,7 +582,7 @@ Control* TransparencyPropertyBox::getControl()
class RotationPropertyBox : public PropertySubControl
{
public:
- RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~RotationPropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -599,10 +599,10 @@ private:
VclPtr<DropdownMenuBox> mpControl;
PopupMenu* mpMenu;
VclPtr<MetricField> mpMetric;
- Link maModifyHdl;
+ Link<> maModifyHdl;
};
-RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -617,7 +617,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p
mpControl->SetMenuSelectHdl( LINK( this, RotationPropertyBox, implMenuSelectHdl ));
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX );
- Link aLink( LINK( this, RotationPropertyBox, implModifyHdl ) );
+ Link<> aLink( LINK( this, RotationPropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink );
OUString aPresetId;
@@ -707,7 +707,7 @@ Control* RotationPropertyBox::getControl()
class ScalePropertyBox : public PropertySubControl
{
public:
- ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~ScalePropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -724,11 +724,11 @@ private:
VclPtr<DropdownMenuBox> mpControl;
PopupMenu* mpMenu;
VclPtr<MetricField> mpMetric;
- Link maModifyHdl;
+ Link<> maModifyHdl;
int mnDirection;
};
-ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -742,7 +742,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent
mpControl->SetMenuSelectHdl( LINK( this, ScalePropertyBox, implMenuSelectHdl ));
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX );
- Link aLink( LINK( this, ScalePropertyBox, implModifyHdl ) );
+ Link<> aLink( LINK( this, ScalePropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink );
OUString aPresetId;
@@ -870,7 +870,7 @@ Control* ScalePropertyBox::getControl()
class FontStylePropertyBox : public PropertySubControl
{
public:
- FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl );
+ FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
virtual ~FontStylePropertyBox();
virtual Any getValue() SAL_OVERRIDE;
@@ -886,14 +886,14 @@ private:
VclPtr<DropdownMenuBox> mpControl;
PopupMenu* mpMenu;
VclPtr<Edit> mpEdit;
- Link maModifyHdl;
+ Link<> maModifyHdl;
float mfFontWeight;
awt::FontSlant meFontSlant;
sal_Int16 mnFontUnderline;
};
-FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
+FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -1110,7 +1110,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
// get property value
const Any aValue( pSet->getPropertyValue( nHandleProperty1Value ) );
- Link aModifyLink;
+ Link<> aModifyLink;
// create property sub control
mpLBProperty1->setSubControl( PropertySubControl::create( nType, mpPlaceholderBox, aValue, aPresetId, aModifyLink ));
}
@@ -2342,7 +2342,7 @@ PropertySubControl::~PropertySubControl()
{
}
-PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link& rModifyHdl )
+PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link<>& rModifyHdl )
{
PropertySubControl* pSubControl = NULL;
switch( nType )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 3754d93ffdbf..4a082c36b780 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -110,7 +110,7 @@ public:
vcl::Window* pParent,
const ::com::sun::star::uno::Any& rValue,
const OUString& rPresetId,
- const Link& rModifyHdl );
+ const Link<>& rModifyHdl );
sal_Int32 getControlType() const { return mnType; }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index da9ba62eeb82..43da01c86479 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -287,7 +287,7 @@ void CustomAnimationPane::KeyInput( const KeyEvent& rKEvt )
void CustomAnimationPane::addListener()
{
- Link aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
@@ -300,7 +300,7 @@ void CustomAnimationPane::addListener()
void CustomAnimationPane::removeListener()
{
- Link aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 274929e44409..4a0419b08b73 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -910,7 +910,7 @@ void SlideTransitionPane::stopEffects()
void SlideTransitionPane::addListener()
{
- Link aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
@@ -923,7 +923,7 @@ void SlideTransitionPane::addListener()
void SlideTransitionPane::removeListener()
{
- Link aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
}
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 21614cd73662..1835d444bc3a 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -864,7 +864,7 @@ void AnnotationManagerImpl::DisposeTags()
void AnnotationManagerImpl::addListener()
{
- Link aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
@@ -875,7 +875,7 @@ void AnnotationManagerImpl::addListener()
void AnnotationManagerImpl::removeListener()
{
- Link aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
}
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d48fbae53d3b..c593325a9bd8 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -355,7 +355,7 @@ void AnnotationWindow::InitControls()
nCntrl |= EEControlBits::PASTESPECIAL | EEControlBits::AUTOCORRECT | EEControlBits::USECHARATTRIBS | EEControlBits::NOCOLORS;
mpOutliner->SetControlWord(nCntrl);
- Engine()->SetModifyHdl( Link() );
+ Engine()->SetModifyHdl( Link<>() );
Engine()->EnableUndo( false );
Engine()->ClearModifyFlag();
@@ -476,7 +476,7 @@ void AnnotationWindow::ResizeIfNecessary(long aOldHeight, long aNewHeight)
void AnnotationWindow::SetLanguage(const SvxLanguageItem &aNewItem)
{
- Engine()->SetModifyHdl( Link() );
+ Engine()->SetModifyHdl( Link<>() );
ESelection aOld = getView()->GetSelection();
ESelection aNewSelection( 0, 0, Engine()->GetParagraphCount()-1, EE_TEXTPOS_ALL );
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index c763e023c70e..f27d159ad4ae 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -98,8 +98,8 @@ class ClientBox:
long m_nActiveHeight;
long m_nExtraHeight;
Size m_aOutputSize;
- Link m_aClickHdl;
- Link m_aDeauthoriseHdl;
+ Link<> m_aClickHdl;
+ Link<> m_aDeauthoriseHdl;
VclPtr<NumericBox> m_aPinBox;
VclPtr<PushButton> m_aDeauthoriseButton;
@@ -153,9 +153,9 @@ public:
Rectangle GetEntryRect( const long nPos ) const;
bool HasActive() { return m_bHasActive; }
long PointToPos( const Point& rPos );
- void SetScrollHdl( const Link& rLink );
+ void SetScrollHdl( const Link<>& rLink );
void DoScroll( long nDelta );
- void SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }
+ void SetHyperlinkHdl( const Link<>& rLink ){ m_aClickHdl = rLink; }
void RecalcAll();
void RemoveUnlocked();
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8de00aa58c42..bbb49c6e6af9 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -52,7 +52,7 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow,
m_pLbCustomShows->set_width_request(m_pLbCustomShows->approximate_char_width() * 32);
m_pLbCustomShows->SetDropDownLineCount(8);
- Link aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) );
+ Link<> aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) );
m_pBtnNew->SetClickHdl( aLink );
m_pBtnEdit->SetClickHdl( aLink );
m_pBtnRemove->SetClickHdl( aLink );
@@ -292,7 +292,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
get( m_pBtnCancel, "cancel" );
get( m_pBtnHelp, "help" );
- Link aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
+ Link<> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
m_pBtnAdd->SetClickHdl( aLink );
m_pBtnRemove->SetClickHdl( aLink );
m_pEdtName->SetModifyHdl( aLink );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index d6f35d109473..759a26cc7542 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -96,7 +96,7 @@ public:
NextButton (vcl::Window* pParent);
void ForceFocusEventBroadcast();
- void SetClickHdl (const Link& rLink);
+ void SetClickHdl (const Link<>& rLink);
bool IsEnabled();
void Enable (bool bEnable);
@@ -109,7 +109,7 @@ private:
class AssistentDlgImpl : public SfxListener
{
public:
- AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot );
+ AssistentDlgImpl( vcl::Window* pWindow, const Link<>& rFinishLink, bool bAutoPilot );
virtual ~AssistentDlgImpl();
/// Local mutex used to serialize concurrent method calls.
@@ -318,7 +318,7 @@ public:
};
-AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) :
+AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link<>& rFinishLink, bool bAutoPilot ) :
mpTemplateRegion(NULL),
mpLayoutRegion(NULL),
mbUserDataDirty(false),
@@ -1724,7 +1724,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL)
AssistentDlg::AssistentDlg(vcl::Window* pParent, bool bAutoPilot) :
ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui")
{
- Link aFinishLink = LINK(this,AssistentDlg, FinishHdl);
+ Link<> aFinishLink = LINK(this,AssistentDlg, FinishHdl);
mpImpl = new AssistentDlgImpl( this, aFinishLink, bAutoPilot );
// button assigmnent
@@ -1861,7 +1861,7 @@ void NextButton::ForceFocusEventBroadcast()
}
}
-void NextButton::SetClickHdl (const Link& rLink)
+void NextButton::SetClickHdl (const Link<>& rLink)
{
// Forward the setting of the click handler to the two buttons
// regardless of which one is currently visible.
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index bd635ad96676..3c0d92667303 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -72,7 +72,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow,
get( msMonitor, "monitor_str" );
get( msAllMonitors, "allmonitors_str" );
- Link aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
+ Link<> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
aRbtAll->SetClickHdl( aLink );
aRbtAtDia->SetClickHdl( aLink );
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 3785de353d1f..2b44f51b3599 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -52,7 +52,7 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs
get( m_pCbxBack , "backcb" );
get( m_pCbxPaperbin , "papertryfrmprntrcb" );
- Link aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
+ Link<> aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
m_pRbtDefault->SetClickHdl( aLink );
m_pRbtPagesize->SetClickHdl( aLink );
m_pRbtPagetile->SetClickHdl( aLink );
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index d7cde0582f7e..36847a80638f 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -158,7 +158,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
if( !!aTmp )
{
- const Link aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) );
+ const Link<> aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) );
aTmp.Vectorize( rMtf, (sal_uInt8) m_pMtReduce->GetValue(), BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES, &aPrgsHdl );
if( m_pCbFillHoles->IsChecked() )
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ba793b25961c..746be6603db2 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -72,7 +72,7 @@ FullScreenPane::FullScreenPane (
// afterwards may or may not work.
// Add resize listener at the work window.
- Link aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler));
+ Link<> aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler));
mpWorkWindow->AddEventListener(aWindowEventHandler);
// Set title and icon of the new window to those of the current window
@@ -108,7 +108,7 @@ void SAL_CALL FullScreenPane::disposing()
if (mpWorkWindow.get() != NULL)
{
- Link aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler));
+ Link<> aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler));
mpWorkWindow->RemoveEventListener(aWindowEventHandler);
mpWorkWindow.reset();
}
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index c0bbd9f3deeb..414ea1ac7ba5 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -694,19 +694,19 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
::Outliner* pOutliner = pOlView->GetViewByWindow(mpWindow)->GetOutliner();
// cut notification links temporarily
- Link aOldParagraphInsertedHdl = pOutliner->GetParaInsertedHdl();
- pOutliner->SetParaInsertedHdl( Link(NULL, NULL));
- Link aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl();
- pOutliner->SetParaRemovingHdl( Link(NULL, NULL));
- Link aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl();
- pOutliner->SetDepthChangedHdl( Link(NULL, NULL));
- Link aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl();
- pOutliner->SetBeginMovingHdl( Link(NULL, NULL));
- Link aOldEndMovingHdl = pOutliner->GetEndMovingHdl();
- pOutliner->SetEndMovingHdl( Link(NULL, NULL));
-
- Link aOldStatusEventHdl = pOutliner->GetStatusEventHdl();
- pOutliner->SetStatusEventHdl(Link(NULL, NULL));
+ Link<> aOldParagraphInsertedHdl = pOutliner->GetParaInsertedHdl();
+ pOutliner->SetParaInsertedHdl( Link<>(NULL, NULL));
+ Link<> aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl();
+ pOutliner->SetParaRemovingHdl( Link<>(NULL, NULL));
+ Link<> aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl();
+ pOutliner->SetDepthChangedHdl( Link<>(NULL, NULL));
+ Link<> aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl();
+ pOutliner->SetBeginMovingHdl( Link<>(NULL, NULL));
+ Link<> aOldEndMovingHdl = pOutliner->GetEndMovingHdl();
+ pOutliner->SetEndMovingHdl( Link<>(NULL, NULL));
+
+ Link<> aOldStatusEventHdl = pOutliner->GetStatusEventHdl();
+ pOutliner->SetStatusEventHdl(Link<>(NULL, NULL));
pOutliner->Clear();
pOlView->FillOutliner();
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index ac49bd266c27..1bfbd129cf8f 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -305,7 +305,7 @@ protected:
::com::sun::star::accessibility::XAccessible>
mxAccessibleOLEObject;
- Link maWindowLink;
+ Link<> maWindowLink;
// This method is called from the component helper base class while
// disposing.
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 40c650c5ee7f..6be181af2cad 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -69,7 +69,7 @@ private:
Idle aIdle;
SvdProgressInfo *pProgrInfo;
- Link aLink;
+ Link<> aLink;
SfxProgress *mpProgress;
DECL_LINK( CancelButtonHdl, void* );
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 68ee23083ca4..50ad82333628 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -21,12 +21,11 @@
#define INCLUDED_SD_SOURCE_UI_INC_EVENTMULTIPLEXER_HXX
#include <svl/lstner.hxx>
+#include <tools/link.hxx>
#include <set>
#include <memory>
-class Link;
-
namespace sd {
class ViewShellBase;
}
@@ -177,7 +176,7 @@ public:
be informed about.
*/
void AddEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypeSet);
/** Remove an event listener for the specified event types.
@@ -188,7 +187,7 @@ public:
for.
*/
void RemoveEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypeSet = EID_FULL_SET);
/** This method is used for out-of-line events. An event of the
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 41d454665103..8ac9096e2394 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -61,7 +61,7 @@ public:
The event listener to call for future events. Call
RemoveEventListener() before the listener is destroyed.
*/
- void AddEventListener (const Link& rEventListener);
+ void AddEventListener (const Link<>& rEventListener);
/** Remove the given listener from the list of listeners.
@param rEventListener
@@ -69,7 +69,7 @@ public:
from this object. Passing a listener that has not
been registered before is safe and is silently ignored.
*/
- void RemoveEventListener (const Link& rEventListener);
+ void RemoveEventListener (const Link<>& rEventListener);
private:
static ::osl::Mutex maMutex;
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index dd382c39a414..52fd77e283ad 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -148,7 +148,7 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
- void AddSelectionChangeListener (const Link& rListener);
+ void AddSelectionChangeListener (const Link<>& rListener);
/** Remove a listener that was called when the selection of the slide
sorter changes.
@@ -156,7 +156,7 @@ public:
It is save to pass a listener that was not added are has been
removed previously. Such calls are ignored.
*/
- void RemoveSelectionChangeListener (const Link& rListener);
+ void RemoveSelectionChangeListener (const Link<>& rListener);
virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index a5403c7759f7..ff1f4b97c778 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -43,7 +43,7 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener
protected:
GDIMetaFile* pMetaFile;
bool bInEffect;
- Link aClickHdl;
+ Link<> aClickHdl;
SfxObjectShell* mpObj;
sal_uInt16 mnShowPage;
Color maDocumentColor;
@@ -72,8 +72,8 @@ public:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; }
- const Link& GetClickHdl() const { return aClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { aClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return aClickHdl; }
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index 4a1180b8e95e..5e1dd66bf729 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -81,7 +81,7 @@ protected:
virtual void disposing() SAL_OVERRIDE;
SdrObjectWeakRef mxTextObj;
- Link aOldLink;
+ Link<> aOldLink;
bool bFirstObjCreated;
bool bJustEndedEdit;
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 8b4056c7eb22..2971d996c09e 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -155,7 +155,7 @@ public:
children as well as focus, visibility, and expansion state.
Multiple calls are ignored. Each listener is added only once.
*/
- void AddStateChangeListener (const Link& rListener);
+ void AddStateChangeListener (const Link<>& rListener);
/** Call the state change listeners and pass a state change event with
the specified event id. The source field is set to this.
@@ -172,7 +172,7 @@ protected:
private:
TreeNode* mpParent;
- typedef ::std::vector<Link> StateChangeListenerContainer;
+ typedef ::std::vector<Link<>> StateChangeListenerContainer;
StateChangeListenerContainer maStateChangeListeners;
};
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 64045d50509e..1837996cc4dd 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -51,7 +51,7 @@ public:
explanations about the parameters.
*/
SlotStateListener (
- Link& rCallback,
+ Link<>& rCallback,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider>& rxDispatchProvider,
const OUString& rSlotName);
@@ -66,7 +66,7 @@ public:
Changing the callback does not release the listeners.
@throws DisposedException
*/
- void SetCallback (const Link& rCallback);
+ void SetCallback (const Link<>& rCallback);
/** Set the frame whose slots shall be observed. When an object of this
class is already observing slots of another frame then these
@@ -111,7 +111,7 @@ protected:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
private:
- Link maCallback;
+ Link<> maCallback;
/** Remember the URLs that describe slots whose state changes we are
listening to.
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index de51f263dbf4..c9009629c24d 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -79,7 +79,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
// left clicks.
mnDefaultClickAction = SID_TP_APPLY_TO_SELECTED_SLIDES;
- Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
+ Link<> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
rBase.GetEventMultiplexer()->AddEventListener(aLink,
sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
| sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL
@@ -106,7 +106,7 @@ void CurrentMasterPagesSelector::dispose()
OSL_ASSERT(mrDocument.GetDocSh() != NULL);
}
- Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
+ Link<> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
MasterPagesSelector::dispose();
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 65ce70fa7e04..53a66c8fa52b 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -168,7 +168,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
SetSelectHdl (LINK(this, LayoutMenu, ClickHandler));
InvalidateContent();
- Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
+ Link<> aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink,
::sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
| ::sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION
@@ -181,14 +181,14 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS);
SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE));
- Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler));
+ Link<> aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler));
mxListener = new ::sd::tools::SlotStateListener(
aStateChangeLink,
Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), UNO_QUERY),
".uno:VerticalTextState");
SetSizePixel(GetParent()->GetSizePixel());
- Link aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
+ Link<> aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
GetParent()->AddEventListener(aWindowEventHandlerLink);
}
@@ -218,10 +218,10 @@ void LayoutMenu::Dispose()
xComponent->dispose();
Clear();
- Link aLink (LINK(this,LayoutMenu,EventMultiplexerListener));
+ Link<> aLink (LINK(this,LayoutMenu,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->RemoveEventListener (aLink);
- Link aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
+ Link<> aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
GetParent()->RemoveEventListener(aWindowEventHandlerLink);
}
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 0a6c697fa6d1..3cce7291df9c 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -84,8 +84,8 @@ public:
static ::boost::shared_ptr<Implementation> Instance();
void LateInit();
- void AddChangeListener (const Link& rLink);
- void RemoveChangeListener (const Link& rLink);
+ void AddChangeListener (const Link<>& rLink);
+ void RemoveChangeListener (const Link<>& rLink);
void UpdatePreviewSizePixel();
Size GetPreviewSizePixel (PreviewSize eSize) const;
@@ -158,7 +158,7 @@ private:
Image maLargePreviewNotAvailable;
Image maSmallPreviewNotAvailable;
- ::std::vector<Link> maChangeListeners;
+ ::std::vector<Link<>> maChangeListeners;
// We have to remember the tasks for initialization and filling in case
// a MasterPageContainer object is destroyed before these tasks have
@@ -228,12 +228,12 @@ MasterPageContainer::~MasterPageContainer()
{
}
-void MasterPageContainer::AddChangeListener (const Link& rLink)
+void MasterPageContainer::AddChangeListener (const Link<>& rLink)
{
mpImpl->AddChangeListener(rLink);
}
-void MasterPageContainer::RemoveChangeListener (const Link& rLink)
+void MasterPageContainer::RemoveChangeListener (const Link<>& rLink)
{
mpImpl->RemoveChangeListener(rLink);
}
@@ -548,22 +548,22 @@ void MasterPageContainer::Implementation::LateInit()
}
}
-void MasterPageContainer::Implementation::AddChangeListener (const Link& rLink)
+void MasterPageContainer::Implementation::AddChangeListener (const Link<>& rLink)
{
const ::osl::MutexGuard aGuard (maMutex);
- ::std::vector<Link>::iterator iListener (
+ ::std::vector<Link<>>::iterator iListener (
::std::find(maChangeListeners.begin(),maChangeListeners.end(),rLink));
if (iListener == maChangeListeners.end())
maChangeListeners.push_back(rLink);
}
-void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLink)
+void MasterPageContainer::Implementation::RemoveChangeListener (const Link<>& rLink)
{
const ::osl::MutexGuard aGuard (maMutex);
- ::std::vector<Link>::iterator iListener (
+ ::std::vector<Link<>>::iterator iListener (
::std::find(maChangeListeners.begin(),maChangeListeners.end(),rLink));
if (iListener != maChangeListeners.end())
maChangeListeners.erase(iListener);
@@ -961,8 +961,8 @@ void MasterPageContainer::Implementation::FireContainerChange (
}
else
{
- ::std::vector<Link> aCopy(maChangeListeners.begin(),maChangeListeners.end());
- ::std::vector<Link>::iterator iListener;
+ ::std::vector<Link<>> aCopy(maChangeListeners.begin(),maChangeListeners.end());
+ ::std::vector<Link<>>::iterator iListener;
MasterPageContainerChangeEvent aEvent;
aEvent.meEventType = eType;
aEvent.maChildToken = aToken;
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 020b6bd2d7fb..daf3ba8bc8b0 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -61,8 +61,8 @@ public:
MasterPageContainer();
virtual ~MasterPageContainer();
- void AddChangeListener (const Link& rLink);
- void RemoveChangeListener (const Link& rLink);
+ void AddChangeListener (const Link<>& rLink);
+ void RemoveChangeListener (const Link<>& rLink);
enum PreviewSize { SMALL, LARGE };
/** There are two different preview sizes, a small one and a large one.
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 0d5b6e46caa4..af7fe595b3e1 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -109,7 +109,7 @@ void MasterPageContainerQueue::LateInit()
{
// Set up the timer for the delayed creation of preview bitmaps.
maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout);
- Link aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
+ Link<> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink);
}
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index b5b5f4bd4ac5..1df0a078bb24 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -56,7 +56,7 @@ public:
The event listener to call for future events. Call
RemoveEventListener() before the listener is destroyed.
*/
- void AddEventListener (const Link& rEventListener);
+ void AddEventListener (const Link<>& rEventListener);
/** Remove the given listener from the list of listeners.
@param rEventListener
@@ -64,10 +64,10 @@ public:
from this object. Passing a listener that has not
been registered before is safe and is silently ignored.
*/
- void RemoveEventListener (const Link& rEventListener);
+ void RemoveEventListener (const Link<>& rEventListener);
private:
- ::std::vector<Link> maListeners;
+ ::std::vector<Link<>> maListeners;
struct DrawDocHash {
size_t operator()(SdDrawDocument* argument) const
@@ -127,13 +127,13 @@ void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument)
mpImpl->UnregisterDocument (rDocument);
}
-void MasterPageObserver::AddEventListener (const Link& rEventListener)
+void MasterPageObserver::AddEventListener (const Link<>& rEventListener)
{
mpImpl->AddEventListener (rEventListener);
}
-void MasterPageObserver::RemoveEventListener (const Link& rEventListener)
+void MasterPageObserver::RemoveEventListener (const Link<>& rEventListener)
{
mpImpl->RemoveEventListener (rEventListener);
}
@@ -176,7 +176,7 @@ void MasterPageObserver::Implementation::UnregisterDocument (
}
void MasterPageObserver::Implementation::AddEventListener (
- const Link& rEventListener)
+ const Link<>& rEventListener)
{
if (::std::find (
maListeners.begin(),
@@ -208,7 +208,7 @@ void MasterPageObserver::Implementation::AddEventListener (
}
void MasterPageObserver::Implementation::RemoveEventListener (
- const Link& rEventListener)
+ const Link<>& rEventListener)
{
maListeners.erase (
::std::find (
@@ -334,8 +334,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
void MasterPageObserver::Implementation::SendEvent (
MasterPageObserverEvent& rEvent)
{
- ::std::vector<Link>::iterator aLink (maListeners.begin());
- ::std::vector<Link>::iterator aEnd (maListeners.end());
+ ::std::vector<Link<>>::iterator aLink (maListeners.begin());
+ ::std::vector<Link<>>::iterator aEnd (maListeners.end());
while (aLink!=aEnd)
{
aLink->Call (&rEvent);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 4f5f284860c0..9afaf0a4b5ac 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -98,7 +98,7 @@ MasterPagesSelector::MasterPagesSelector (
SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
- Link aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
+ Link<> aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
mpContainer->AddChangeListener(aChangeListener);
}
@@ -112,7 +112,7 @@ void MasterPagesSelector::dispose()
Clear();
UpdateLocks(ItemList());
- Link aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
+ Link<> aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
mpContainer->RemoveChangeListener(aChangeListener);
PreviewValueSet::dispose();
}
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index 4c199cbb1611..3e4a6f599541 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -47,7 +47,7 @@ void PreviewValueSet::SetPreviewSize (const Size& rSize)
maPreviewSize = rSize;
}
-void PreviewValueSet::SetRightMouseClickHandler (const Link& rLink)
+void PreviewValueSet::SetRightMouseClickHandler (const Link<>& rLink)
{
maRightMouseClickHandler = rLink;
}
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 2ce5fc564db0..c8629f6730ba 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -33,7 +33,7 @@ public:
PreviewValueSet (vcl::Window* pParent);
virtual ~PreviewValueSet();
- void SetRightMouseClickHandler (const Link& rLink);
+ void SetRightMouseClickHandler (const Link<>& rLink);
virtual void Resize() SAL_OVERRIDE;
void SetPreviewSize (const Size& rSize);
@@ -49,7 +49,7 @@ protected:
virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE;
private:
- Link maRightMouseClickHandler;
+ Link<> maRightMouseClickHandler;
Size maPreviewSize;
const int mnBorderWidth;
const int mnBorderHeight;
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index f237da8fd10e..89900189fed6 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -96,7 +96,7 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages()
RecentlyUsedMasterPages::~RecentlyUsedMasterPages()
{
- Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
+ Link<> aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
mpContainer->RemoveChangeListener(aLink);
MasterPageObserver::Instance().RemoveEventListener(
@@ -105,7 +105,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages()
void RecentlyUsedMasterPages::LateInit()
{
- Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
+ Link<> aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
mpContainer->AddChangeListener(aLink);
LoadPersistentValues ();
@@ -237,7 +237,7 @@ void RecentlyUsedMasterPages::SavePersistentValues()
}
}
-void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener)
+void RecentlyUsedMasterPages::AddEventListener (const Link<>& rEventListener)
{
if (::std::find (
maListeners.begin(),
@@ -248,7 +248,7 @@ void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener)
}
}
-void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener)
+void RecentlyUsedMasterPages::RemoveEventListener (const Link<>& rEventListener)
{
maListeners.erase (
::std::find (
@@ -272,8 +272,8 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32
void RecentlyUsedMasterPages::SendEvent()
{
- ::std::vector<Link>::iterator aLink (maListeners.begin());
- ::std::vector<Link>::iterator aEnd (maListeners.end());
+ ::std::vector<Link<>>::iterator aLink (maListeners.begin());
+ ::std::vector<Link<>>::iterator aEnd (maListeners.end());
while (aLink!=aEnd)
{
aLink->Call (NULL);
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 04fbd5b9c44c..f4d18099ca43 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -46,8 +46,8 @@ public:
*/
static RecentlyUsedMasterPages& Instance();
- void AddEventListener (const Link& rEventListener);
- void RemoveEventListener (const Link& rEventListener);
+ void AddEventListener (const Link<>& rEventListener);
+ void RemoveEventListener (const Link<>& rEventListener);
int GetMasterPageCount() const;
MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
@@ -84,7 +84,7 @@ private:
*/
static RecentlyUsedMasterPages* mpInstance;
- ::std::vector<Link> maListeners;
+ ::std::vector<Link<>> maListeners;
typedef ::std::vector<Descriptor> MasterPageList;
MasterPageList mvMasterPages;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f6fd9fa9b101..28c4a82524e0 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -669,7 +669,7 @@ void SAL_CALL SlideshowImpl::disposing()
#if HAVE_FEATURE_SCRIPTING
// restore StarBASICErrorHdl
StarBASIC::SetGlobalErrorHdl(maStarBASICGlobalErrorHdl);
- maStarBASICGlobalErrorHdl = Link();
+ maStarBASICGlobalErrorHdl = Link<>();
#endif
}
else
@@ -994,7 +994,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
#if HAVE_FEATURE_SCRIPTING
// disable basic ide error handling
maStarBASICGlobalErrorHdl = StarBASIC::GetGlobalErrorHdl();
- StarBASIC::SetGlobalErrorHdl( Link() );
+ StarBASIC::SetGlobalErrorHdl( Link<>() );
#endif
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index e52152957bfc..61a9aaec1c0e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -349,7 +349,7 @@ private:
Pointer maPencil;
std::vector< VclPtr< ::sd::Window> > maDrawModeWindows;
VclPtr< ::sd::Window> mpOldActiveWindow;
- Link maStarBASICGlobalErrorHdl;
+ Link<> maStarBASICGlobalErrorHdl;
unsigned long mnChildMask;
bool mbGridVisible;
bool mbBordVisible;
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index b0acdd6ed90f..aff6a5e1727c 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -243,7 +243,7 @@ void FocusManager::ShowFocusIndicator (
}
}
-void FocusManager::AddFocusChangeListener (const Link& rListener)
+void FocusManager::AddFocusChangeListener (const Link<>& rListener)
{
if (::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)
== maFocusChangeListeners.end())
@@ -252,7 +252,7 @@ void FocusManager::AddFocusChangeListener (const Link& rListener)
}
}
-void FocusManager::RemoveFocusChangeListener (const Link& rListener)
+void FocusManager::RemoveFocusChangeListener (const Link<>& rListener)
{
maFocusChangeListeners.erase (
::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener));
@@ -261,11 +261,11 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener)
void FocusManager::NotifyFocusChangeListeners() const
{
// Create a copy of the listener list to be safe when that is modified.
- ::std::vector<Link> aListeners (maFocusChangeListeners);
+ ::std::vector<Link<>> aListeners (maFocusChangeListeners);
// Tell the selection change listeners that the selection has changed.
- ::std::vector<Link>::iterator iListener (aListeners.begin());
- ::std::vector<Link>::iterator iEnd (aListeners.end());
+ ::std::vector<Link<>>::iterator iListener (aListeners.begin());
+ ::std::vector<Link<>>::iterator iEnd (aListeners.end());
for (; iListener!=iEnd; ++iListener)
{
iListener->Call(NULL);
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 149edf879839..4e64787c997d 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -125,7 +125,7 @@ Listener::Listener (
StartListening(*pMainViewShell);
}
- Link aLink (LINK(this, Listener, EventMultiplexerCallback));
+ Link<> aLink (LINK(this, Listener, EventMultiplexerCallback));
mpBase->GetEventMultiplexer()->AddEventListener(
aLink,
tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
@@ -185,7 +185,7 @@ void Listener::ReleaseListeners()
if (mpBase != NULL)
{
- Link aLink (LINK(this, Listener, EventMultiplexerCallback));
+ Link<> aLink (LINK(this, Listener, EventMultiplexerCallback));
mpBase->GetEventMultiplexer()->RemoveEventListener(
aLink,
tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index ccf32ce708e5..eaa64571cf63 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -88,11 +88,11 @@ void ScrollBarManager::Disconnect()
{
if (mpVerticalScrollBar != nullptr)
{
- mpVerticalScrollBar->SetScrollHdl (Link());
+ mpVerticalScrollBar->SetScrollHdl (Link<>());
}
if (mpHorizontalScrollBar != nullptr)
{
- mpHorizontalScrollBar->SetScrollHdl (Link());
+ mpHorizontalScrollBar->SetScrollHdl (Link<>());
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 889e3510c940..0768a1e62903 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -236,8 +236,8 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible)
pViewShell->UpdatePreview(pDescriptor->GetPage());
// Tell the selection change listeners that the selection has changed.
- ::std::vector<Link>::iterator iListener (maSelectionChangeListeners.begin());
- ::std::vector<Link>::iterator iEnd (maSelectionChangeListeners.end());
+ ::std::vector<Link<>>::iterator iListener (maSelectionChangeListeners.begin());
+ ::std::vector<Link<>>::iterator iEnd (maSelectionChangeListeners.end());
for (; iListener!=iEnd; ++iListener)
{
iListener->Call(NULL);
@@ -249,7 +249,7 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible)
}
}
-void SelectionManager::AddSelectionChangeListener (const Link& rListener)
+void SelectionManager::AddSelectionChangeListener (const Link<>& rListener)
{
if (::std::find (
maSelectionChangeListeners.begin(),
@@ -260,7 +260,7 @@ void SelectionManager::AddSelectionChangeListener (const Link& rListener)
}
}
-void SelectionManager::RemoveSelectionChangeListener(const Link&rListener)
+void SelectionManager::RemoveSelectionChangeListener(const Link<>&rListener)
{
maSelectionChangeListeners.erase (
::std::find (
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 3658db1f3854..62818dc4ebc3 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -246,7 +246,7 @@ private:
bool mbPreModelChangeDone;
bool mbPostModelChangePending;
- ::std::vector<Link> maSelectionChangeListeners;
+ ::std::vector<Link<>> maSelectionChangeListeners;
/** This array stores the indices of the selected page descriptors at
the time when the edit mode is switched to EM_MASTERPAGE. With this
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index c67fdf3e74bb..e6bdfffa8a34 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -143,14 +143,14 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
- void AddFocusChangeListener (const Link& rListener);
+ void AddFocusChangeListener (const Link<>& rListener);
/** Remove a focus change listener.
@param rListener
It is save to pass a listener that was not added are has been
removed previously. Such calls are ignored.
*/
- void RemoveFocusChangeListener (const Link& rListener);
+ void RemoveFocusChangeListener (const Link<>& rListener);
/** Create an instance of this class to temporarily hide the focus
indicator. It is restored to its former visibility state when the
@@ -179,7 +179,7 @@ private:
*/
bool mbPageIsFocused;
- ::std::vector<Link> maFocusChangeListeners;
+ ::std::vector<Link<>> maFocusChangeListeners;
/** When vertical wrap is active then pressing UP in the top row moves
the focus to the bottom row, DOWN in the bottom row moves the focus
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 1d63ead4c585..84a95942c0f0 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -24,10 +24,10 @@
#include "controller/SlsAnimator.hxx"
#include <sal/types.h>
#include <tools/gen.hxx>
+#include <tools/link.hxx>
#include <basegfx/range/b2irectangle.hxx>
#include <vector>
-class Link;
class SdPage;
namespace sd { namespace slidesorter {
@@ -78,7 +78,7 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
- void AddSelectionChangeListener (const Link& rListener);
+ void AddSelectionChangeListener (const Link<>& rListener);
/** Remove a listener that was called when the selection of the slide
sorter changes.
@@ -86,7 +86,7 @@ public:
It is save to pass a listener that was not added are has been
removed previously. Such calls are ignored.
*/
- void RemoveSelectionChangeListener (const Link& rListener);
+ void RemoveSelectionChangeListener (const Link<>& rListener);
/** Return the position where to insert pasted slides based on the
current selection. When there is a selection then the insert
@@ -109,7 +109,7 @@ private:
SlideSorter& mrSlideSorter;
SlideSorterController& mrController;
- ::std::vector<Link> maSelectionChangeListeners;
+ ::std::vector<Link<>> maSelectionChangeListeners;
/** This array stores the indices of the selected page descriptors at
the time when the edit mode is switched to EM_MASTERPAGE. With this
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 3d7a2bd4e60d..9ec37e4546e0 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -190,14 +190,14 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
- void AddVisibilityChangeListener (const Link& rListener);
+ void AddVisibilityChangeListener (const Link<>& rListener);
/** Remove a listener that is called when the set of visible slides changes.
@param rListener
It is save to pass a listener that was not added or has been
removed previously. Such calls are ignored.
*/
- void RemoveVisibilityChangeListener (const Link& rListener);
+ void RemoveVisibilityChangeListener (const Link<>& rListener);
/** The page under the mouse is not highlighted in some contexts. Call
this method on context changes.
@@ -259,7 +259,7 @@ private:
SharedILayerPainter mpBackgroundPainter;
::boost::scoped_ptr<ToolTip> mpToolTip;
bool mbIsRearrangePending;
- ::std::vector<Link> maVisibilityChangeListeners;
+ ::std::vector<Link<>> maVisibilityChangeListeners;
/** Determine the visibility of all page objects.
*/
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index d58ac87098d6..bd2d1aee49ef 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -693,14 +693,14 @@ void SlideSorterViewShell::SetPageSelection (
}
void SlideSorterViewShell::AddSelectionChangeListener (
- const Link& rCallback)
+ const Link<>& rCallback)
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
mpSlideSorter->GetController().GetSelectionManager()->AddSelectionChangeListener(rCallback);
}
void SlideSorterViewShell::RemoveSelectionChangeListener (
- const Link& rCallback)
+ const Link<>& rCallback)
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
mpSlideSorter->GetController().GetSelectionManager()->RemoveSelectionChangeListener(rCallback);
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 33b9643073de..51565b02101d 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -486,8 +486,8 @@ void SlideSorterView::DeterminePageObjectVisibilities()
// Tell the listeners that the visibility of some objects has
// changed.
- ::std::vector<Link>& aChangeListeners (maVisibilityChangeListeners);
- for (::std::vector<Link>::const_iterator
+ ::std::vector<Link<>>& aChangeListeners (maVisibilityChangeListeners);
+ for (::std::vector<Link<>>::const_iterator
iLink(aChangeListeners.begin()),
iEnd(aChangeListeners.end());
iLink!=iEnd;
@@ -720,7 +720,7 @@ Pair SlideSorterView::GetVisiblePageRange()
return maVisiblePageRange;
}
-void SlideSorterView::AddVisibilityChangeListener (const Link& rListener)
+void SlideSorterView::AddVisibilityChangeListener (const Link<>& rListener)
{
if (::std::find (
maVisibilityChangeListeners.begin(),
@@ -731,7 +731,7 @@ void SlideSorterView::AddVisibilityChangeListener (const Link& rListener)
}
}
-void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener)
+void SlideSorterView::RemoveVisibilityChangeListener(const Link<>&rListener)
{
maVisibilityChangeListeners.erase (
::std::find (
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 6515c6e4b594..54fa4f451125 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -428,7 +428,7 @@ void TableDesignWidget::updateControls()
void TableDesignWidget::addListener()
{
- Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
@@ -440,7 +440,7 @@ void TableDesignWidget::addListener()
void TableDesignWidget::removeListener()
{
- Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
}
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 1a3639409570..f5bd0a1128e9 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -27,7 +27,7 @@ AsynchronousCall::AsynchronousCall()
: maTimer(),
mpFunction()
{
- Link aCallback (LINK(this,AsynchronousCall,TimerCallback));
+ Link<> aCallback (LINK(this,AsynchronousCall,TimerCallback));
maTimer.SetTimeoutHdl(aCallback);
}
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index f23d9fd0a267..4ccb5ad49683 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -68,11 +68,11 @@ public:
virtual ~Implementation();
void AddEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes);
void RemoveEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes);
void CallListeners (EventMultiplexerEvent& rEvent);
@@ -120,7 +120,7 @@ protected:
private:
ViewShellBase& mrBase;
- typedef ::std::pair<Link,EventMultiplexerEvent::EventId> ListenerDescriptor;
+ typedef ::std::pair<Link<>,EventMultiplexerEvent::EventId> ListenerDescriptor;
typedef ::std::vector<ListenerDescriptor> ListenerList;
ListenerList maListeners;
@@ -190,14 +190,14 @@ EventMultiplexer::~EventMultiplexer()
}
void EventMultiplexer::AddEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes)
{
mpImpl->AddEventListener (rCallback, aEventTypes);
}
void EventMultiplexer::RemoveEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes)
{
mpImpl->RemoveEventListener (rCallback, aEventTypes);
@@ -321,7 +321,7 @@ void EventMultiplexer::Implementation::ReleaseListeners()
}
void EventMultiplexer::Implementation::AddEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes)
{
ListenerList::iterator iListener (maListeners.begin());
@@ -341,7 +341,7 @@ void EventMultiplexer::Implementation::AddEventListener (
}
void EventMultiplexer::Implementation::RemoveEventListener (
- Link& rCallback,
+ Link<>& rCallback,
EventMultiplexerEvent::EventId aEventTypes)
{
ListenerList::iterator iListener (maListeners.begin());
diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx
index 017ff5e215ec..b508abdd4ae3 100644
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
namespace sd { namespace tools {
SlotStateListener::SlotStateListener (
- Link& rCallback,
+ Link<>& rCallback,
const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider,
const OUString& rSlotName)
: SlotStateListenerInterfaceBase(maMutex),
@@ -49,7 +49,7 @@ SlotStateListener::~SlotStateListener()
ReleaseListeners();
}
-void SlotStateListener::SetCallback (const Link& rCallback)
+void SlotStateListener::SetCallback (const Link<>& rCallback)
{
ThrowIfDisposed();
@@ -90,7 +90,7 @@ void SlotStateListener::disposing()
{
ReleaseListeners();
mxDispatchProviderWeak = uno::WeakReference<frame::XDispatchProvider>(NULL);
- maCallback = Link();
+ maCallback = Link<>();
}
util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 03335f7e06e4..10f46a019fa6 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -88,7 +88,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution (
mpSelf(),
mnMaxTimePerStep(nMaxTimePerStep)
{
- Link aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
+ Link<> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
maTimer.SetTimeoutHdl(aLink);
maTimer.SetTimeout(nMillisecondsBetweenSteps);
maTimer.Start();
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index d3e44fb3561e..14230cb9f43e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1627,7 +1627,7 @@ private:
Size( nRotatedWidth, nRotatedHeight ) );
}
- Link aOldLink;
+ Link<> aOldLink;
Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner();
pOutliner->Init(OUTLINERMODE_OUTLINEVIEW);
const sal_uInt16 nSavedOutlMode (pOutliner->GetMode());
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 03ac6c7045bd..ad6354b96105 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -57,7 +57,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
{
// Register at the EventMultiplexer to be informed about changes in the
// center pane.
- Link aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
+ Link<> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
mrBase.GetEventMultiplexer()->AddEventListener(
aLink,
sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
@@ -73,7 +73,7 @@ FormShellManager::~FormShellManager()
UnregisterAtCenterPane();
// Unregister from the EventMultiplexer.
- Link aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
+ Link<> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
if (mpSubShellFactory.get() != NULL)
@@ -91,7 +91,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell)
// Disconnect from the old form shell.
if (mpFormShell != NULL)
{
- mpFormShell->SetControlActivationHandler(Link());
+ mpFormShell->SetControlActivationHandler(Link<>());
EndListening(*mpFormShell);
mpFormShell->SetView(NULL);
}
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index ca5b6dd66fb5..277efb16bb77 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -311,7 +311,7 @@ void Outliner::EndSpelling()
bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell));
if (bViewIsDrawViewShell)
{
- SetStatusEventHdl(Link());
+ SetStatusEventHdl(Link<>());
mpView = pViewShell->GetView();
mpView->UnmarkAllObj (mpView->GetSdrPageView());
mpView->SdrEndTextEdit();
@@ -736,7 +736,7 @@ void Outliner::DetectChange()
|| aPosition.mePageKind != pDrawViewShell->GetPageKind()))
{
// Either the edit mode or the page kind has changed.
- SetStatusEventHdl(Link());
+ SetStatusEventHdl(Link<>());
SdrPageView* pPageView = mpView->GetSdrPageView();
if (pPageView != NULL)
@@ -1207,7 +1207,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
// Restore old edit mode.
pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, false);
- SetStatusEventHdl(Link());
+ SetStatusEventHdl(Link<>());
OUString sViewURL;
switch (ePageKind)
{
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 3b5b281b13de..67cc9552500f 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -536,7 +536,7 @@ ToolBarManager::Implementation::Implementation (
mnPendingSetValidCall(0),
maToolBarRules(rpToolBarManager,rpViewShellManager)
{
- Link aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
+ Link<> aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
mpEventMultiplexer->AddEventListener(
aLink,
tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED
@@ -551,7 +551,7 @@ ToolBarManager::Implementation::Implementation (
ToolBarManager::Implementation::~Implementation()
{
// Unregister at broadcasters.
- Link aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
+ Link<> aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
mpEventMultiplexer->RemoveEventListener(aLink);
// Abort pending user calls.
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 9a6b58553aec..dc7a8fe99354 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -609,7 +609,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
( !rCEvt.IsMouseEvent() && pOutlinerView->IsCursorAtWrongSpelledWord() ) )
{
// Popup for Online-Spelling now handled by DrawDocShell
- Link aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
+ Link<> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
if( !rCEvt.IsMouseEvent() )
{
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index f72aa2f3512c..a222d8a0a393 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1378,7 +1378,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin )
if (pOLV && pOLV->IsWrongSpelledWordAtPos(aPos))
{
// Popup for Online-Spelling now handled by DrawDocShell
- Link aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
+ Link<> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
pOLV->ExecuteSpellPopup(aPos, &aLink);
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 8b0ba72e30f1..db4ab7a4a619 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -131,7 +131,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
FillOutliner();
}
- Link aLink( LINK(this,OutlineView,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,OutlineView,EventMultiplexerListener) );
mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(
aLink,
tools::EventMultiplexerEvent::EID_CURRENT_PAGE
@@ -171,7 +171,7 @@ OutlineView::~OutlineView()
{
DBG_ASSERT(maDragAndDropModelGuard.get() == 0, "sd::OutlineView::~OutlineView(), prior drag operation not finished correctly!" );
- Link aLink( LINK(this,OutlineView,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,OutlineView,EventMultiplexerListener) );
mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->RemoveEventListener( aLink );
DisconnectFromApplication();
@@ -1378,7 +1378,7 @@ void OutlineView::SetLinks()
*/
void OutlineView::ResetLinks() const
{
- Link aEmptyLink;
+ Link<> aEmptyLink;
mrOutliner.SetParaInsertedHdl(aEmptyLink);
mrOutliner.SetParaRemovingHdl(aEmptyLink);
mrOutliner.SetDepthChangedHdl(aEmptyLink);
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 40906cb21b19..f184bb89a177 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -422,7 +422,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
: mrBase( rViewShellBase )
, mnUpdateTagsEvent( 0 )
{
- Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE
| tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
| tools::EventMultiplexerEvent::EID_VIEW_ADDED
@@ -434,7 +434,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
ViewOverlayManager::~ViewOverlayManager()
{
- Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
+ Link<> aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
if( mnUpdateTagsEvent )
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 2b71b76f7d99..782d75a2fe6e 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -43,8 +43,8 @@ private:
VclPtr<CheckBox> m_pBackwardsBox;
VclPtr<PushButton> m_pFindBtn;
- Link m_aFindHdl;
- Link m_aCloseHdl;
+ Link<> m_aFindHdl;
+ Link<> m_aCloseHdl;
OUString m_sConfigName;
OString m_sWinState;
@@ -61,8 +61,8 @@ public:
virtual ~SearchDialog();
virtual void dispose() SAL_OVERRIDE;
- void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; }
- void SetCloseHdl( const Link& rLink ) { m_aCloseHdl = rLink; }
+ void SetFindHdl( const Link<>& rLink ) { m_aFindHdl = rLink; }
+ void SetCloseHdl( const Link<>& rLink ) { m_aCloseHdl = rLink; }
OUString GetSearchText() const { return m_pSearchEdit->GetText(); }
void SetSearchText( const OUString& _rText ) { m_pSearchEdit->SetText( _rText ); }
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 278034ceee0c..deaedf5876f6 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -68,7 +68,7 @@ SvFileObject::~SvFileObject()
{
if (xMed.Is())
{
- xMed->SetDoneLink( Link() );
+ xMed->SetDoneLink( Link<>() );
xMed.Clear();
}
if (nPostUserEventId)
@@ -392,7 +392,7 @@ OUString impl_getFilter( const OUString& _rURL )
return sFilter;
}
-void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl )
+void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link<>& rEndEditHdl )
{
aEndEditLink = rEndEditHdl;
OUString sFile, sRange, sTmpFilter;
@@ -485,7 +485,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
pThis->bLoadAgain = true;
if( pThis->xMed.Is() )
{
- pThis->xMed->SetDoneLink( Link() );
+ pThis->xMed->SetDoneLink( Link<>() );
pThis->pDelMed = new SfxMediumRef(pThis->xMed);
pThis->nPostUserEventId = Application::PostUserEvent(
LINK( pThis, SvFileObject, DelMedium_Impl ),
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 5e2a5fddfcc1..7e0c72bb56eb 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -31,7 +31,7 @@ class SvFileObject : public sfx2::SvLinkSource
OUString sFileNm;
OUString sFilter;
OUString sReferer;
- Link aEndEditLink;
+ Link<> aEndEditLink;
SfxMediumRef xMed;
ImplSVEvent* nPostUserEventId;
SfxMediumRef* pDelMed;
@@ -69,7 +69,7 @@ public:
bool bSynchron = false ) SAL_OVERRIDE;
virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window *, sfx2::SvBaseLink *, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
// Ask whether you can access data directly or whether it has to be triggered
virtual bool IsPending() const SAL_OVERRIDE;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index a990518bc7a4..f5ce4bb9d1ac 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -120,7 +120,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::fram
{
private:
HelpInterceptor_Impl* pInterceptor;
- Link aChangeLink;
+ Link<> aChangeLink;
OUString aFactory;
public:
@@ -131,7 +131,7 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; }
+ void SetChangeHdl( const Link<>& rLink ) { aChangeLink = rLink; }
OUString GetFactory() const { return aFactory; }
};
// HelpStatusListener_Impl -----------------------------------------------------
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 110fe238dc9f..2d375fa22109 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -269,7 +269,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
return true;
}
-void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl )
+void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link<>& rEndEditHdl )
{
ScopedVclPtrInstance< SvDDELinkEditDialog > aDlg(pParent, pBaseLink);
if ( RET_OK == aDlg->Execute() && rEndEditHdl.IsSet() )
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 3ce245452b94..b6c66eadf966 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -59,7 +59,7 @@ public:
bool bSynchron = false ) SAL_OVERRIDE;
virtual bool Connect( SvBaseLink * ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
virtual bool IsPending() const SAL_OVERRIDE;
virtual bool IsDataComplete() const SAL_OVERRIDE;
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index ecd06b3bc5b8..fb0dad6ff795 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -435,7 +435,7 @@ bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, bool
return false;
}
-void SvLinkSource::Edit( vcl::Window *, SvBaseLink *, const Link& )
+void SvLinkSource::Edit( vcl::Window *, SvBaseLink *, const Link<>& )
{
}
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 8834962b8762..3c899b35c91e 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -44,7 +44,7 @@ class ImplDdeItem;
struct BaseLink_Impl
{
- Link m_aEndEditLink;
+ Link<> m_aEndEditLink;
LinkManager* m_pLinkMgr;
VclPtr<vcl::Window> m_pParentWin;
FileDialogHelper* m_pFileDlg;
@@ -475,7 +475,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com:
return SUCCESS;
}
-void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl )
+void SvBaseLink::Edit( vcl::Window* pParent, const Link<>& rEndEditHdl )
{
pImpl->m_pParentWin = pParent;
pImpl->m_aEndEditLink = rEndEditHdl;
@@ -484,7 +484,7 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl )
_GetRealObject( xObj.Is() );
bool bAsync = false;
- Link aLink = LINK( this, SvBaseLink, EndEditHdl );
+ Link<> aLink = LINK( this, SvBaseLink, EndEditHdl );
if( OBJECT_CLIENT_SO & nObjType && pImplData->ClientType.bIntrnlLnk )
{
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 25a45ce97baf..a1e8f4ccdb1e 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -565,7 +565,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
get(m_pOpenBtn, "display");
m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
- Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
+ Link<> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
aFactoryIdle.SetPriority(SchedulerPriority::LOWER);
aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
@@ -774,7 +774,7 @@ Control* IndexTabPage_Impl::GetLastFocusControl()
return m_pOpenBtn;
}
-void IndexTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
+void IndexTabPage_Impl::SetDoubleClickHdl( const Link<>& rLink )
{
m_pIndexCB->SetDoubleClickHdl( rLink );
}
@@ -950,7 +950,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_
m_pResultsLB->set_height_request(aSize.Height());
get(m_pOpenBtn, "display");
- Link aLink = LINK( this, SearchTabPage_Impl, SearchHdl );
+ Link<> aLink = LINK( this, SearchTabPage_Impl, SearchHdl );
m_pSearchED->SetSearchLink( aLink );
m_pSearchBtn->SetClickHdl(aLink);
m_pSearchED->SetModifyHdl( LINK( this, SearchTabPage_Impl, ModifyHdl ) );
@@ -1110,7 +1110,7 @@ Control* SearchTabPage_Impl::GetLastFocusControl()
return m_pOpenBtn;
}
-void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
+void SearchTabPage_Impl::SetDoubleClickHdl( const Link<>& rLink )
{
m_pResultsLB->SetDoubleClickHdl( rLink );
}
@@ -1356,7 +1356,7 @@ Control* BookmarksTabPage_Impl::GetLastFocusControl()
return m_pBookmarksPB;
}
-void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
+void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<>& rLink )
{
m_pBookmarksBox->SetDoubleClickHdl(rLink);
}
@@ -1734,7 +1734,7 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
-void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
+void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink )
{
aPageDoubleClickLink = rLink;
if ( pCPage )
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index add82d178f9b..bf87d9226c96 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -65,7 +65,7 @@ public:
virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
+ inline void SetOpenHdl( const Link<>& rLink ) { SetDoubleClickHdl( rLink ); }
OUString GetSelectEntry() const;
};
@@ -102,7 +102,7 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
virtual Control* GetLastFocusControl() SAL_OVERRIDE;
- void SetOpenHdl( const Link& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
+ void SetOpenHdl( const Link<>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); }
void SetFocusOnBox() { m_pContentBox->GrabFocus(); }
};
@@ -128,7 +128,7 @@ private:
Idle aFactoryIdle;
Timer aKeywordTimer;
- Link aKeywordLink;
+ Link<> aKeywordLink;
OUString sFactory;
OUString sKeyword;
@@ -150,14 +150,14 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
virtual Control* GetLastFocusControl() SAL_OVERRIDE;
- void SetDoubleClickHdl( const Link& rLink );
+ void SetDoubleClickHdl( const Link<>& rLink );
void SetFactory( const OUString& rFactory );
inline OUString GetFactory() const { return sFactory; }
OUString GetSelectEntry() const;
inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
- inline void SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; }
+ inline void SetKeywordHdl( const Link<>& rLink ) { aKeywordLink = rLink; }
void SetKeyword( const OUString& rKeyword );
bool HasKeyword() const;
bool HasKeywordIgnoreCase();
@@ -171,7 +171,7 @@ public:
class SearchBox_Impl : public ComboBox
{
private:
- Link aSearchLink;
+ Link<> aSearchLink;
public:
SearchBox_Impl(vcl::Window* pParent, WinBits nStyle)
@@ -183,7 +183,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void Select() SAL_OVERRIDE;
- inline void SetSearchLink( const Link& rLink ) { aSearchLink = rLink; }
+ inline void SetSearchLink( const Link<>& rLink ) { aSearchLink = rLink; }
};
class SearchResultsBox_Impl : public ListBox
@@ -227,7 +227,7 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
virtual Control* GetLastFocusControl() SAL_OVERRIDE;
- void SetDoubleClickHdl( const Link& rLink );
+ void SetDoubleClickHdl( const Link<>& rLink );
inline void SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
OUString GetSelectEntry() const;
void ClearPage();
@@ -269,7 +269,7 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
virtual Control* GetLastFocusControl() SAL_OVERRIDE;
- void SetDoubleClickHdl( const Link& rLink );
+ void SetDoubleClickHdl( const Link<>& rLink );
OUString GetSelectEntry() const;
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
void SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); }
@@ -287,9 +287,9 @@ private:
Idle aIdle;
- Link aSelectFactoryLink;
- Link aPageDoubleClickLink;
- Link aIndexKeywordLink;
+ Link<> aSelectFactoryLink;
+ Link<> aPageDoubleClickLink;
+ Link<> aIndexKeywordLink;
OUString sKeyword;
VclPtr<SfxHelpWindow_Impl> pParentWin;
@@ -328,8 +328,8 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void SetDoubleClickHdl( const Link& rLink );
- inline void SetSelectFactoryHdl( const Link& rLink ) { aSelectFactoryLink = rLink; }
+ void SetDoubleClickHdl( const Link<>& rLink );
+ inline void SetSelectFactoryHdl( const Link<>& rLink ) { aSelectFactoryLink = rLink; }
void SetFactory( const OUString& rFactory, bool bActive );
inline OUString GetFactory() const { return pIPage->GetFactory(); }
OUString GetSelectEntry() const;
@@ -470,7 +470,7 @@ public:
inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
getFrame() const { return xFrame; }
- inline void SetSelectHdl( const Link& rLink ) { aToolBox->SetSelectHdl( rLink ); }
+ inline void SetSelectHdl( const Link<>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
void ToggleIndex( bool bOn );
void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch );
void SetPageStyleHeaderOff() const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 51644e7d80ad..2e54af5e9838 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -376,7 +376,7 @@ SfxDispatcher::~SfxDispatcher()
// So that no timer by Reschedule in PlugComm strikes the LeaveRegistrations
xImp->aIdle.Stop();
- xImp->xPoster->SetEventHdl( Link() );
+ xImp->xPoster->SetEventHdl( Link<>() );
// Notify the stack varialbles in Call_Impl
if ( xImp->pInCallAliveFlag )
diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx
index 9ba81f7050ca..9166d4b14ff5 100644
--- a/sfx2/source/control/itemdel.cxx
+++ b/sfx2/source/control/itemdel.cxx
@@ -31,7 +31,7 @@
class SfxItemDisruptor_Impl: private boost::noncopyable
{
SfxPoolItem *pItem;
- Link aLink;
+ Link<> aLink;
private:
DECL_LINK( Delete, void* );
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 351dc0704429..520ba71c4fdf 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -420,7 +420,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync )
{
if( !pImp->pExecuter )
pImp->pExecuter = new svtools::AsynchronLink(
- Link( this, ShellCall_Impl ) );
+ Link<>( this, ShellCall_Impl ) );
pImp->pExecuter->Call( new SfxRequest( rReq ) );
return 0;
}
@@ -686,7 +686,7 @@ void SfxShell::UIFeatureChanged()
// something my get stuck in the bunkered tools. Asynchronous call to
// prevent recursion.
if ( !pImp->pUpdater )
- pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
+ pImp->pUpdater = new svtools::AsynchronLink( Link<>( this, DispatcherUpdate_Impl ) );
// Multiple views allowed
pImp->pUpdater->Call( pFrame->GetDispatcher(), true );
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index ccf1aa756777..3ffb69c599be 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -218,12 +218,12 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties>
-void TemplateAbstractView::setOpenRegionHdl(const Link &rLink)
+void TemplateAbstractView::setOpenRegionHdl(const Link<> &rLink)
{
maOpenRegionHdl = rLink;
}
-void TemplateAbstractView::setOpenTemplateHdl(const Link &rLink)
+void TemplateAbstractView::setOpenTemplateHdl(const Link<> &rLink)
{
maOpenTemplateHdl = rLink;
}
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 582dd5ad2c2f..7ba4e8248548 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -22,7 +22,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateSearchView(vcl
return new TemplateSearchView(pParent);
}
-void TemplateSearchView::setOpenTemplateHdl(const Link &rLink)
+void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink)
{
maOpenTemplateHdl = rLink;
}
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index c6543906639c..7d4cbed2dbe2 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -260,7 +260,7 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con
maTextEditMaxArea = Rectangle( aPos, aEditSize );
}
-void ThumbnailViewItem::setSelectClickHdl (const Link &link)
+void ThumbnailViewItem::setSelectClickHdl (const Link<> &link)
{
maClickHdl = link;
}
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 91878eaa5b48..6c5206d1afe7 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -744,7 +744,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<>( 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/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 55261037a376..569596180b88 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2102,7 +2102,7 @@ void CustomPropertiesControl::Init(VclBuilderContainer& rBuilder)
m_pVertScroll->SetRangeMax( 0 );
m_pVertScroll->SetVisibleSize( 0xFFFF );
- Link aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl );
+ Link<> aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl );
m_pVertScroll->SetScrollHdl( aScrollLink );
}
@@ -2613,7 +2613,7 @@ CmisPropertiesControl::CmisPropertiesControl(SfxTabPage* pParent)
m_rVertScroll.SetRangeMin(0);
m_rVertScroll.SetVisibleSize( 0xFFFF );
- Link aScrollLink = LINK( this, CmisPropertiesControl, ScrollHdl );
+ Link<> aScrollLink = LINK( this, CmisPropertiesControl, ScrollHdl );
m_rVertScroll.SetScrollHdl( aScrollLink );
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index f02af36c770a..95fa7c31c972 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1123,7 +1123,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl()
if ( mbDeleteMatcher )
delete mpMatcher;
- maPreviewIdle.SetIdleHdl( Link() );
+ maPreviewIdle.SetIdleHdl( Link<>() );
::comphelper::disposeComponent( mxFileDlg );
}
@@ -2338,7 +2338,7 @@ ErrCode FileDialogHelper::Execute( SfxItemSet *& rpSet,
return nRet;
}
-void FileDialogHelper::StartExecuteModal( const Link& rEndDialogHdl )
+void FileDialogHelper::StartExecuteModal( const Link<>& rEndDialogHdl )
{
m_aDialogClosedLink = rEndDialogHdl;
m_nError = ERRCODE_NONE;
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5bc78c42855b..8b69def6daee 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -256,8 +256,8 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
void SfxManageStyleSheetPage::dispose()
{
- m_pNameRw->SetGetFocusHdl( Link() );
- m_pNameRw->SetLoseFocusHdl( Link() );
+ m_pNameRw->SetGetFocusHdl( Link<>() );
+ m_pNameRw->SetLoseFocusHdl( Link<>() );
delete pFamilies;
pItem = 0;
pStyle = 0;
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index e120179324ae..9ae21b08e1ed 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -109,7 +109,7 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou
mpPassword1ED->SetAccessibleName(SFX2_RESSTR(STR_PASSWD));
- Link aLink = LINK( this, SfxPasswordDialog, EditModifyHdl );
+ Link<> aLink = LINK( this, SfxPasswordDialog, EditModifyHdl );
mpPassword1ED->SetModifyHdl( aLink );
mpPassword2ED->SetModifyHdl( aLink );
aLink = LINK( this, SfxPasswordDialog, OKHdl );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index af240ce76b44..390afe6b4fe8 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -535,7 +535,7 @@ short SfxTabDialog::Execute()
-void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
+void SfxTabDialog::StartExecuteModal( const Link<>& rEndDialogHdl )
{
if ( !m_pTabCtrl->GetPageCount() )
return;
@@ -559,7 +559,7 @@ void SfxTabDialog::Start( bool bShow )
-void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
+void SfxTabDialog::SetApplyHandler(const Link<>& _rHdl)
{
DBG_ASSERT( m_pApplyBtn, "SfxTabDialog::GetApplyHandler: no apply button enabled!" );
if ( m_pApplyBtn )
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index e4cccd062270..5da01bfa3aab 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -225,7 +225,7 @@ namespace sfx2
}
- sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback )
+ sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback )
{
// Add the menu before the closer button.
const sal_uInt16 nItemCount( m_aToolbox->GetItemCount() );
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 687a6cdd298e..47ec3a6c6f0b 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -215,7 +215,7 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersion
m_pVersionBox = VclPtr<SfxVersionsTabListBox_Impl>::Create(*pContainer, WB_TABSTOP);
- Link aClickLink = LINK( this, SfxVersionDialog, ButtonHdl_Impl );
+ Link<> aClickLink = LINK( this, SfxVersionDialog, ButtonHdl_Impl );
m_pViewButton->SetClickHdl ( aClickLink );
m_pSaveButton->SetClickHdl ( aClickLink );
m_pDeleteButton->SetClickHdl ( aClickLink );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b7a1f6f38d6f..c39452f7a9b1 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2367,12 +2367,12 @@ const OUString& SfxMedium::GetLongName() const
return pImp->m_aLongName;
}
-void SfxMedium::SetDoneLink( const Link& rLink )
+void SfxMedium::SetDoneLink( const Link<>& rLink )
{
pImp->aDoneLink = rLink;
}
-void SfxMedium::Download( const Link& aLink )
+void SfxMedium::Download( const Link<>& aLink )
{
SetDoneLink( aLink );
GetInStream();
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index bd3ba50f01e3..3968db6d66d4 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -65,7 +65,7 @@ DocumentInserter::~DocumentInserter()
delete m_pFileDlg;
}
-void DocumentInserter::StartExecuteModal( const Link& _rDialogClosedLink )
+void DocumentInserter::StartExecuteModal( const Link<>& _rDialogClosedLink )
{
m_aDialogClosedLink = _rDialogClosedLink;
m_nError = ERRCODE_NONE;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3997e4f5f0e9..53f5a0577aa5 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -311,16 +311,16 @@ void SfxTemplateManagerDlg::dispose()
delete maRepositories[i];
// Ignore view events since we are cleaning the object
- mpLocalView->setItemStateHdl(Link());
- mpLocalView->setOpenRegionHdl(Link());
- mpLocalView->setOpenTemplateHdl(Link());
+ mpLocalView->setItemStateHdl(Link<>());
+ mpLocalView->setOpenRegionHdl(Link<>());
+ mpLocalView->setOpenTemplateHdl(Link<>());
- mpRemoteView->setItemStateHdl(Link());
- mpRemoteView->setOpenRegionHdl(Link());
- mpRemoteView->setOpenTemplateHdl(Link());
+ mpRemoteView->setItemStateHdl(Link<>());
+ mpRemoteView->setOpenRegionHdl(Link<>());
+ mpRemoteView->setOpenTemplateHdl(Link<>());
- mpSearchView->setItemStateHdl(Link());
- mpSearchView->setOpenTemplateHdl(Link());
+ mpSearchView->setItemStateHdl(Link<>());
+ mpSearchView->setOpenTemplateHdl(Link<>());
mpTabControl.clear();
mpSearchEdit.clear();
diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx
index e49ef3f81813..86551f3fd0d9 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -18,7 +18,7 @@ public:
TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL);
- void setOpenTemplateHdl (const Link &rLink);
+ void setOpenTemplateHdl (const Link<> &rLink);
void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
const OUString &rTitle, const OUString &rSubtitle,
@@ -28,7 +28,7 @@ protected:
virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
protected:
- Link maOpenTemplateHdl;
+ Link<> maOpenTemplateHdl;
};
#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 249a1f32d827..7e272ac90d65 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -97,8 +97,8 @@ class StyleTreeListBox_Impl : public DropListBox_Impl
{
private:
SvTreeListEntry* pCurEntry;
- Link aDoubleClickLink;
- Link aDropLink;
+ Link<> aDoubleClickLink;
+ Link<> aDropLink;
OUString aParent;
OUString aStyle;
@@ -116,11 +116,11 @@ public:
void Recalc();
- void SetDoubleClickHdl(const Link &rLink)
+ void SetDoubleClickHdl(const Link<> &rLink)
{
aDoubleClickLink = rLink;
}
- void SetDropHdl(const Link &rLink)
+ void SetDropHdl(const Link<> &rLink)
{
aDropLink = rLink;
}
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 3b52c6b3f86c..61cf0048daf1 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -315,7 +315,7 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
pMenu = aConf.CreateBookmarkMenu( aXFrame, GetId() == SID_NEWDOCDIRECT ? OUString(BOOKMARK_NEWMENU) : OUString(BOOKMARK_WIZARDMENU) );
if( pMenu )
{
- pMenu->SetSelectHdl( Link( &(this->GetBindings()), Select_Impl ) );
+ pMenu->SetSelectHdl( Link<>( &(this->GetBindings()), Select_Impl ) );
pMenu->SetActivateHdl( LINK(this, SfxAppMenuControl_Impl, Activate) );
rMenu.SetPopupMenu( nPos, pMenu );
}
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 5814d2b6acf0..b95dc24ee8a1 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -42,7 +42,7 @@ void AsynchronousCall::RequestCall()
{
if (mnCallId == 0)
{
- Link aLink (LINK(this, AsynchronousCall, HandleUserCall));
+ Link<> aLink (LINK(this, AsynchronousCall, HandleUserCall));
mnCallId = Application::PostUserEvent(aLink);
}
}
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index a29d2aaedf97..24fba7dea6fd 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -75,12 +75,12 @@ void SidebarToolBox::dispose()
if (mbAreHandlersRegistered)
{
- SetDropdownClickHdl(Link());
- SetClickHdl(Link());
- SetDoubleClickHdl(Link());
- SetSelectHdl(Link());
- SetActivateHdl(Link());
- SetDeactivateHdl(Link());
+ SetDropdownClickHdl(Link<>());
+ SetClickHdl(Link<>());
+ SetDoubleClickHdl(Link<>());
+ SetSelectHdl(Link<>());
+ SetActivateHdl(Link<>());
+ SetDeactivateHdl(Link<>());
mbAreHandlersRegistered = false;
}
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 1ffc411ffd89..5bfcbc3bc704 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -421,7 +421,7 @@ public:
SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent );
~SfxDialogExecutor_Impl() { delete _pOptions; }
- Link GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); }
+ Link<> GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); }
const SfxItemSet* GetOptions() const { return _pOptions; }
void DisableHelp() { _bHelpDisabled = true; }
};
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 0f86bd0d5631..a3e20858b1e4 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -1019,7 +1019,7 @@ bool Storage::ShouldConvert()
bool Storage::ValidateFAT()
{
- Link aLink = StgIo::GetErrorLink();
+ Link<> aLink = StgIo::GetErrorLink();
ErrCode nErr = pIo->ValidateFATs();
StgIo::SetErrorLink( aLink );
return nErr == ERRCODE_NONE;
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index b9671bf0f33c..11f391efe0fb 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -337,14 +337,14 @@ sal_uLong Validator::FindUnrefedChains()
return FAT_OK;
}
-namespace { struct ErrorLink : public rtl::Static<Link, ErrorLink > {}; }
+namespace { struct ErrorLink : public rtl::Static<Link<>, ErrorLink > {}; }
-void StgIo::SetErrorLink( const Link& rLink )
+void StgIo::SetErrorLink( const Link<>& rLink )
{
ErrorLink::get() = rLink;
}
-const Link& StgIo::GetErrorLink()
+const Link<>& StgIo::GetErrorLink()
{
return ErrorLink::get();
}
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index 511f26af2b3a..8922d809cc01 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -64,8 +64,8 @@ public:
bool Init(); // set up an empty file
bool CommitAll(); // commit everything (root commit)
- static void SetErrorLink( const Link& );
- static const Link& GetErrorLink();
+ static void SetErrorLink( const Link<>& );
+ static const Link<>& GetErrorLink();
sal_uLong ValidateFATs( );
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ec8633e980fb..e208cf6dce55 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -269,8 +269,8 @@ class SmShowSymbolSetWindow : public Control
{
VclPtr<ScrollBar> m_pVScrollBar;
SymbolPtrVec_t aSymbolSet;
- Link aSelectHdlLink;
- Link aDblClickHdlLink;
+ Link<> aSelectHdlLink;
+ Link<> aDblClickHdlLink;
long nLen;
long nRows, nColumns;
long nXOffset, nYOffset;
@@ -295,8 +295,8 @@ public:
void SelectSymbol(sal_uInt16 nSymbol);
sal_uInt16 GetSelectSymbol() const { return nSelectSymbol; }
void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet);
- void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
- void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; }
+ void SetSelectHdl(const Link<>& rLink) { aSelectHdlLink = rLink; }
+ void SetDblClickHdl(const Link<>& rLink) { aDblClickHdlLink = rLink; }
};
class SmShowSymbolSet : public VclHBox
@@ -314,15 +314,15 @@ public:
void SelectSymbol(sal_uInt16 nSymbol) { aSymbolWindow->SelectSymbol(nSymbol); }
sal_uInt16 GetSelectSymbol() const { return aSymbolWindow->GetSelectSymbol(); }
- void SetSelectHdl(const Link& rLink) { aSymbolWindow->SetSelectHdl(rLink); }
- void SetDblClickHdl(const Link& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
+ void SetSelectHdl(const Link<>& rLink) { aSymbolWindow->SetSelectHdl(rLink); }
+ void SetDblClickHdl(const Link<>& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
};
class SmShowSymbol : public Control
{
- Link aDblClickHdlLink;
+ Link<> aDblClickHdlLink;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
@@ -337,7 +337,7 @@ public:
}
void SetSymbol(const SmSym *pSymbol);
- void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
+ void SetDblClickHdl(const Link<> &rLink) { aDblClickHdlLink = rLink; }
};
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 20cfdf5bba11..d0288ac3b3ab 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -941,7 +941,7 @@ SmTextForwarder::~SmTextForwarder()
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
- pEditEngine->SetNotifyHdl( Link() );
+ pEditEngine->SetNotifyHdl( Link<>() );
}
IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify*, aNotify)
@@ -1640,7 +1640,7 @@ void SmEditAccessible::ClearWin()
// (avoid handler being called for already dead object)
EditEngine *pEditEngine = GetEditEngine();
if (pEditEngine)
- pEditEngine->SetNotifyHdl( Link() );
+ pEditEngine->SetNotifyHdl( Link<>() );
pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 5e39c868a17d..6b7975f57e22 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -145,7 +145,7 @@ void SmEditWindow::dispose()
EditEngine *pEditEngine = pEditView->GetEditEngine();
if (pEditEngine)
{
- pEditEngine->SetStatusEventHdl( Link() );
+ pEditEngine->SetStatusEventHdl( Link<>() );
pEditEngine->RemoveView( pEditView.get() );
}
pEditView.reset();
@@ -724,7 +724,7 @@ void SmEditWindow::LoseFocus()
{
EditEngine *pEditEngine = GetEditEngine();
if (pEditEngine)
- pEditEngine->SetStatusEventHdl( Link() );
+ pEditEngine->SetStatusEventHdl( Link<>() );
Window::LoseFocus();
@@ -1105,7 +1105,7 @@ void SmEditWindow::DeleteEditView( SmViewShell & /*rView*/ )
std::unique_ptr<EditEngine> xEditEngine(pEditView->GetEditEngine());
if (xEditEngine)
{
- xEditEngine->SetStatusEventHdl( Link() );
+ xEditEngine->SetStatusEventHdl( Link<>() );
xEditEngine->RemoveView( pEditView.get() );
}
pEditView.reset();
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 06936b8bc76f..7103dc8a1c1b 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
OUString const & rTheRelURIRef,
- Link const & rMaybeFileHdl,
+ Link<> const & rMaybeFileHdl,
bool bCheckFileExists,
bool bIgnoreFragment,
INetURLObject::EncodeMechanism eEncodeMechanism,
@@ -101,14 +101,14 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
return aAbsURIRef.GetMainURL(eDecodeMechanism, eCharset);
}
-namespace { struct MaybeFileHdl : public rtl::Static< Link, MaybeFileHdl > {}; }
+namespace { struct MaybeFileHdl : public rtl::Static< Link<>, MaybeFileHdl > {}; }
-void URIHelper::SetMaybeFileHdl(Link const & rTheMaybeFileHdl)
+void URIHelper::SetMaybeFileHdl(Link<> const & rTheMaybeFileHdl)
{
MaybeFileHdl::get() = rTheMaybeFileHdl;
}
-Link URIHelper::GetMaybeFileHdl()
+Link<> URIHelper::GetMaybeFileHdl()
{
return MaybeFileHdl::get();
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index d4073ac8b0b2..df271c31dd42 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -317,7 +317,7 @@ SvNumberFormatterRegistry_Impl& SvNumberFormatter::GetFormatterRegistry()
return *pFormatterRegistry;
}
-void SvNumberFormatter::SetColorLink( const Link& rColorTableCallBack )
+void SvNumberFormatter::SetColorLink( const Link<>& rColorTableCallBack )
{
aColorLink = rColorTableCallBack;
}
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index 07766378882b..412bc4a3a344 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -83,8 +83,8 @@ namespace svt
ItemId GetCurrentRoadmapItemID() const;
bool SelectRoadmapItemByID( ItemId _nItemID );
- void SetItemSelectHdl( const Link& _rHdl );
- Link GetItemSelectHdl( ) const;
+ void SetItemSelectHdl( const Link<>& _rHdl );
+ Link<> GetItemSelectHdl( ) const;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index d4d4cfb21a46..02a32e96251e 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -130,7 +130,7 @@ namespace svt
GetComboBox().SaveValue();
}
- void ComboBoxCellController::SetModifyHdl(const Link& rLink)
+ void ComboBoxCellController::SetModifyHdl(const Link<>& rLink)
{
GetComboBox().SetModifyHdl(rLink);
}
@@ -215,7 +215,7 @@ namespace svt
}
- void ListBoxCellController::SetModifyHdl(const Link& rLink)
+ void ListBoxCellController::SetModifyHdl(const Link<>& rLink)
{
GetListBox().SetSelectHdl(rLink);
}
@@ -352,7 +352,7 @@ namespace svt
}
- void CheckBoxCellController::SetModifyHdl(const Link& rLink)
+ void CheckBoxCellController::SetModifyHdl(const Link<>& rLink)
{
static_cast<CheckBoxControl &>(GetWindow()).SetModifyHdl(rLink);
}
@@ -441,7 +441,7 @@ namespace svt
}
- void EditCellController::SetModifyHdl(const Link& rLink)
+ void EditCellController::SetModifyHdl(const Link<>& rLink)
{
m_pEditImplementation->SetModifyHdl(rLink);
}
@@ -498,7 +498,7 @@ namespace svt
}
- void SpinCellController::SetModifyHdl(const Link& rLink)
+ void SpinCellController::SetModifyHdl(const Link<>& rLink)
{
GetSpinWindow().SetModifyHdl(rLink);
}
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index c95369f2521c..b70d96a173ec 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1074,7 +1074,7 @@ namespace svt
aController.Clear();
// reset the modify handler
- aOldController->SetModifyHdl(Link());
+ aOldController->SetModifyHdl(Link<>());
if (bHasFocus)
GrabFocus(); // ensure that we have (and keep) the focus
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 1ba6ba2c775f..1dadb4a7b8aa 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -45,7 +45,7 @@ using namespace com::sun::star::uno;
struct HtmlOptions_Impl
{
- ::std::list<Link> aList;
+ ::std::list<Link<>> aList;
sal_Int32 nFlags;
sal_Int32 nExportMode;
sal_Int32 aFontSizeArr[HTML_FONT_COUNT];
@@ -244,7 +244,7 @@ void SvxHtmlOptions::ImplCommit()
void SvxHtmlOptions::CallListeners()
{
- for ( ::std::list<Link>::const_iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter )
+ for ( ::std::list<Link<>>::const_iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter )
iter->Call( this );
}
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 9c0440e6a5cf..22dc5e6a4bde 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -69,7 +69,7 @@ class SvtMenuOptions_Impl : public ConfigItem
private:
- ::std::list<Link> aList;
+ ::std::list<Link<>> aList;
bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section
@@ -87,8 +87,8 @@ class SvtMenuOptions_Impl : public ConfigItem
SvtMenuOptions_Impl();
virtual ~SvtMenuOptions_Impl();
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
+ void AddListenerLink( const Link<>& rLink );
+ void RemoveListenerLink( const Link<>& rLink );
// override methods of baseclass
@@ -126,7 +126,7 @@ class SvtMenuOptions_Impl : public ConfigItem
{
m_eMenuIcons = eState;
SetModified();
- for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this );
Commit();
}
@@ -285,7 +285,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
if ( bMenuSettingsChanged )
m_eMenuIcons = bSystemMenuIcons ? TRISTATE_INDET : static_cast<TriState>(bMenuIcons);
- for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this );
}
@@ -347,14 +347,14 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
return seqPropertyNames;
}
-void SvtMenuOptions_Impl::AddListenerLink( const Link& rLink )
+void SvtMenuOptions_Impl::AddListenerLink( const Link<>& rLink )
{
aList.push_back( rLink );
}
-void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink )
+void SvtMenuOptions_Impl::RemoveListenerLink( const Link<>& rLink )
{
- for ( ::std::list<Link>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<>>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
{
if ( *iter == rLink )
{
@@ -460,12 +460,12 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
return *pMutex;
}
-void SvtMenuOptions::AddListenerLink( const Link& rLink )
+void SvtMenuOptions::AddListenerLink( const Link<>& rLink )
{
m_pDataContainer->AddListenerLink( rLink );
}
-void SvtMenuOptions::RemoveListenerLink( const Link& rLink )
+void SvtMenuOptions::RemoveListenerLink( const Link<>& rLink )
{
m_pDataContainer->RemoveListenerLink( rLink );
}
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 58fb45ae76e7..be76a7607848 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star;
class SvtMiscOptions_Impl : public ConfigItem
{
private:
- ::std::list<Link> aList;
+ ::std::list<Link<>> aList;
bool m_bUseSystemFileDialog;
bool m_bIsUseSystemFileDialogRO;
bool m_bPluginsEnabled;
@@ -206,8 +206,8 @@ class SvtMiscOptions_Impl : public ConfigItem
bool IsShowLinkWarningDialogReadOnly() const
{ return m_bIsShowLinkWarningDialogRO; }
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
+ void AddListenerLink( const Link<>& rLink );
+ void RemoveListenerLink( const Link<>& rLink );
void CallListeners();
@@ -490,14 +490,14 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
-void SvtMiscOptions_Impl::AddListenerLink( const Link& rLink )
+void SvtMiscOptions_Impl::AddListenerLink( const Link<>& rLink )
{
aList.push_back( rLink );
}
-void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
+void SvtMiscOptions_Impl::RemoveListenerLink( const Link<>& rLink )
{
- for ( ::std::list<Link>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<>>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
{
if ( *iter == rLink )
{
@@ -509,7 +509,7 @@ void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
void SvtMiscOptions_Impl::CallListeners()
{
- for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this );
}
@@ -873,12 +873,12 @@ Mutex & SvtMiscOptions::GetInitMutex()
return theSvtMiscOptionsMutex::get();
}
-void SvtMiscOptions::AddListenerLink( const Link& rLink )
+void SvtMiscOptions::AddListenerLink( const Link<>& rLink )
{
m_pDataContainer->AddListenerLink( rLink );
}
-void SvtMiscOptions::RemoveListenerLink( const Link& rLink )
+void SvtMiscOptions::RemoveListenerLink( const Link<>& rLink )
{
m_pDataContainer->RemoveListenerLink( rLink );
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 15ae1fe660ae..9a3b13b239ae 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -421,11 +421,11 @@ class SvtFileView_Impl :public ::svt::IEnumerationResultHandler
{
protected:
VclPtr<SvtFileView> mpAntiImpl;
- Link m_aSelectHandler;
+ Link<> m_aSelectHandler;
::rtl::Reference< ::svt::FileViewContentEnumerator >
m_pContentEnumerator;
- Link m_aCurrentAsyncActionHandler;
+ Link<> m_aCurrentAsyncActionHandler;
::osl::Condition m_aAsyncActionFinished;
::rtl::Reference< ::salhelper::Timer > m_pCancelAsyncTimer;
::svt::EnumerationResult m_eAsyncActionResult;
@@ -453,7 +453,7 @@ public:
OUString maAllFilter;
OUString maCurrentFilter;
Image maFolderImage;
- Link maOpenDoneLink;
+ Link<> maOpenDoneLink;
Reference< XCommandEnvironment > mxCmdEnv;
SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv,
@@ -498,7 +498,7 @@ public:
void SetActualFolder( const INetURLObject& rActualFolder );
- void SetSelectHandler( const Link& _rHdl );
+ void SetSelectHandler( const Link<>& _rHdl );
void InitSelection();
void ResetCursor();
@@ -1328,14 +1328,14 @@ void SvtFileView::GetFocus()
-void SvtFileView::SetSelectHdl( const Link& rHdl )
+void SvtFileView::SetSelectHdl( const Link<>& rHdl )
{
mpImp->SetSelectHandler( rHdl );
}
-void SvtFileView::SetDoubleClickHdl( const Link& rHdl )
+void SvtFileView::SetDoubleClickHdl( const Link<>& rHdl )
{
mpImp->mpView->SetDoubleClickHdl( rHdl );
}
@@ -1371,7 +1371,7 @@ const OUString& SvtFileView::GetViewURL() const
return mpImp->maViewURL;
}
-void SvtFileView::SetOpenDoneHdl( const Link& rHdl )
+void SvtFileView::SetOpenDoneHdl( const Link<>& rHdl )
{
mpImp->maOpenDoneLink = rHdl;
}
@@ -1676,7 +1676,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<>();
// minimum time to wait
boost::scoped_ptr< TimeValue > pTimeout( new TimeValue );
@@ -1844,11 +1844,11 @@ IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, void*, _pSource )
}
-void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl )
+void SvtFileView_Impl::SetSelectHandler( const Link<>& _rHdl )
{
m_aSelectHandler = _rHdl;
- Link aMasterHandler;
+ Link<> aMasterHandler;
if ( m_aSelectHandler.IsSet() )
aMasterHandler = LINK( this, SvtFileView_Impl, SelectionMultiplexer );
@@ -1942,7 +1942,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* )
if ( m_aCurrentAsyncActionHandler.IsSet() )
{
Application::PostUserEvent( m_aCurrentAsyncActionHandler, reinterpret_cast< void* >( eTimeout ) );
- m_aCurrentAsyncActionHandler = Link();
+ m_aCurrentAsyncActionHandler = Link<>();
}
}
@@ -1972,7 +1972,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<>();
}
}
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index a93aa7c39caa..e9d2412f1cb3 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -55,7 +55,7 @@ static bool bEndScrollInvalidate = true;
class IcnViewEdit_Impl : public MultiLineEdit
{
- Link aCallBackHdl;
+ Link<> aCallBackHdl;
Accelerator aAccReturn;
Accelerator aAccEscape;
Idle aIdle;
@@ -75,7 +75,7 @@ public:
const Point& rPos,
const Size& rSize,
const OUString& rData,
- const Link& rNotifyEditEnd );
+ const Link<>& rNotifyEditEnd );
virtual ~IcnViewEdit_Impl();
virtual void dispose() SAL_OVERRIDE;
@@ -130,7 +130,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aVerSBar->SetScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, ScrollUpDownHdl ) );
aHorSBar->SetScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl ) );
- Link aEndScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, EndScrollHdl ) );
+ Link<> aEndScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, EndScrollHdl ) );
aVerSBar->SetEndScrollHdl( aEndScrollHdl );
aHorSBar->SetEndScrollHdl( aEndScrollHdl );
@@ -3250,7 +3250,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect, bool bPaint )
}
IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos,
- const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd ) :
+ const Size& rSize, const OUString& rData, const Link<>& rNotifyEditEnd ) :
MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT),
aCallBackHdl( rNotifyEditEnd ),
bCanceled( false ),
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index c4839b32437d..9203d5656757 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -119,7 +119,7 @@ SvInplaceEdit2::SvInplaceEdit2
vcl::Window* pParent, const Point& rPos,
const Size& rSize,
const OUString& rData,
- const Link& rNotifyEditEnd,
+ const Link<>& rNotifyEditEnd,
const Selection& rSelection,
bool bMulti
) :
@@ -355,7 +355,7 @@ struct SvTreeListBoxImpl
bool m_bEntryMnemonicsEnabled:1;
bool m_bDoingQuickSelection:1;
- Link* m_pLink;
+ Link<>* m_pLink;
vcl::MnemonicEngine m_aMnemonicEngine;
vcl::QuickSelectionEngine m_aQuickSelectionEngine;
@@ -650,7 +650,7 @@ bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTar
bool bSuccess = true;
std::vector<SvTreeListEntry*> aList;
bool bClone = ( pSource->GetModel() != GetModel() );
- Link aCloneLink( pModel->GetCloneLink() );
+ Link<> aCloneLink( pModel->GetCloneLink() );
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
// cache selection to simplify iterating over the selection when doing a D&D
@@ -707,7 +707,7 @@ bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, S
bool bSuccess = true;
std::vector<SvTreeListEntry*> aList;
bool bClone = ( pSource->GetModel() != GetModel() );
- Link aCloneLink( pModel->GetCloneLink() );
+ Link<> aCloneLink( pModel->GetCloneLink() );
if ( bClone )
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
@@ -1411,7 +1411,7 @@ IMPL_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8*, pAction )
return 0;
}
-Link SvTreeListBox::GetDragFinishedHdl() const
+Link<> SvTreeListBox::GetDragFinishedHdl() const
{
AddBoxToDDList_Impl( *this );
return LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl );
@@ -1439,7 +1439,7 @@ void SvTreeListBox::InitTreeView()
nAllItemAccRoleType = SvTreeAccRoleType::NONE;
mnCheckboxItemWidth = 0;
- Link* pLink = new Link( LINK(this,SvTreeListBox, DefaultCompare) );
+ Link<>* pLink = new Link<>( LINK(this,SvTreeListBox, DefaultCompare) );
mpImpl->m_pLink = pLink;
nTreeFlags = SvTreeFlags::RECALCTABS;
@@ -2849,7 +2849,7 @@ void SvTreeListBox::ImplInitStyle()
else
{
GetModel()->SetSortMode( SortNone );
- GetModel()->SetCompareHdl( Link() );
+ GetModel()->SetCompareHdl( Link<>() );
}
pImp->SetStyle( nWindowStyle );
pImp->Resize();
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index bc0673a5cdf2..7376c1be6dc1 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -71,7 +71,7 @@ namespace svt
void ToggleBackgroundColor( const Color& _rGBColor );
void SetInteractive( bool _bInteractive );
- void SetClickHdl( const Link& rLink );
+ void SetClickHdl( const Link<>& rLink );
void Enable( bool bEnable = true);
bool IsEnabled() const;
void GrabFocus();
@@ -92,7 +92,7 @@ namespace svt
{
protected:
const ORoadmap& m_rAntiImpl;
- Link m_aSelectHdl;
+ Link<> m_aSelectHdl;
BitmapEx m_aPicture;
HL_Vector m_aRoadmapSteps;
ItemId m_iCurItemID;
@@ -130,8 +130,8 @@ namespace svt
void setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; }
const BitmapEx& getPicture( ) const { return m_aPicture; }
- void setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; }
- const Link& getSelectHdl( ) const { return m_aSelectHdl; }
+ void setSelectHdl( const Link<>& _rHdl ) { m_aSelectHdl = _rHdl; }
+ const Link<>& getSelectHdl( ) const { return m_aSelectHdl; }
void initItemSize();
const Size& getItemSize() const { return m_aItemSizePixel; }
@@ -507,13 +507,13 @@ namespace svt
}
- void ORoadmap::SetItemSelectHdl( const Link& _rHdl )
+ void ORoadmap::SetItemSelectHdl( const Link<>& _rHdl )
{
m_pImpl->setSelectHdl( _rHdl );
}
- Link ORoadmap::GetItemSelectHdl( ) const
+ Link<> ORoadmap::GetItemSelectHdl( ) const
{
return m_pImpl->getSelectHdl();
}
@@ -825,7 +825,7 @@ namespace svt
}
- void RoadmapItem::SetClickHdl( const Link& rLink )
+ void RoadmapItem::SetClickHdl( const Link<>& rLink )
{
if ( mpDescription )
mpDescription->SetClickHdl( rLink);
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 547dada36dd9..a918c0fbbe8e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -662,7 +662,7 @@ void TabBar::ImplInitControls()
else
mpImpl->mpSizer.disposeAndClear();
- Link aLink = LINK( this, TabBar, ImplClickHdl );
+ Link<> aLink = LINK( this, TabBar, ImplClickHdl );
if ( mnWinStyle & (WB_MINSCROLL | WB_SCROLL) )
{
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 40f3422f1d0f..8051265deda7 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1637,7 +1637,7 @@ const Size& ToolbarMenu::getMenuSize() const
-void ToolbarMenu::SetSelectHdl( const Link& rLink )
+void ToolbarMenu::SetSelectHdl( const Link<>& rLink )
{
mpImpl->maSelectHdl = rLink;
}
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 0a688a37c717..e26fe4985ee1 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -271,7 +271,7 @@ struct ToolbarMenu_Impl
Size maSize;
- Link maSelectHdl;
+ Link<> maSelectHdl;
ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
~ToolbarMenu_Impl();
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index b39d8ad7919c..26021bb2760a 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2264,7 +2264,7 @@ long ValueSet::GetScrollWidth() const
return 0;
}
-void ValueSet::SetHighlightHdl( const Link& rLink )
+void ValueSet::SetHighlightHdl( const Link<>& rLink )
{
maHighlightHdl = rLink;
}
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 90b44eb856f3..b83adb372489 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -264,7 +264,7 @@ void PrinterSetupDialog::dispose()
ModalDialog::dispose();
}
-void PrinterSetupDialog::SetOptionsHdl( const Link& rLink )
+void PrinterSetupDialog::SetOptionsHdl( const Link<>& rLink )
{
m_pBtnOptions->SetClickHdl( rLink );
m_pBtnOptions->Show( rLink.IsSet() );
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 81eefd14759d..2faf23e4f401 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -262,7 +262,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
// create substitute for graphic;
const Size aPrefSize( rSubstitute.GetPrefSize() );
const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() );
- const Link aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
+ const Link<> aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
const GraphicType eOldType = rSubstitute.GetType();
const bool bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index b74c32486607..29fe3424b7ab 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -449,9 +449,9 @@ static sal_uInt32 GetCacheTimeInMs()
return nSeconds * 1000;
}
-void GraphicObject::SetSwapStreamHdl(const Link& rHdl)
+void GraphicObject::SetSwapStreamHdl(const Link<>& rHdl)
{
- delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl );
+ delete mpSwapStreamHdl, mpSwapStreamHdl = new Link<>( rHdl );
sal_uInt32 const nSwapOutTimeout(GetCacheTimeInMs());
if( nSwapOutTimeout )
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index a3b6fff35375..857830c01157 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
-TransferableClipboardListener::TransferableClipboardListener( const Link& rCallback ) :
+TransferableClipboardListener::TransferableClipboardListener( const Link<>& rCallback ) :
aLink( rCallback )
{
}
@@ -83,7 +83,7 @@ void TransferableClipboardListener::AddRemoveListener( vcl::Window* pWin, bool b
void TransferableClipboardListener::ClearCallbackLink()
{
- aLink = Link();
+ aLink = Link<>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index deb1d2946d49..b34f2ab5ca88 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.cxx
@@ -49,7 +49,7 @@ namespace svt
// XEventListener methods
void SAL_CALL DialogClosedListener::disposing( const EventObject& ) throw(RuntimeException, std::exception)
{
- m_aDialogClosedLink = Link();
+ m_aDialogClosedLink = Link<>();
}
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index e31a9db27e53..d0bb2cd9a12c 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -377,7 +377,7 @@ typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList;
struct TransferDataContainer_Impl
{
TDataCntnrEntryList aFmtList;
- Link aFinshedLnk;
+ Link<> aFinshedLnk;
INetBookmark* pBookmk;
Graphic* pGrf;
@@ -598,7 +598,7 @@ bool TransferDataContainer::HasAnyData() const
void TransferDataContainer::StartDrag(
vcl::Window* pWindow, sal_Int8 nDragSourceActions,
- const Link& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage )
+ const Link<>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage )
{
pImpl->aFinshedLnk = rLnk;
TransferableHelper::StartDrag( pWindow, nDragSourceActions,
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 1565914154b6..15901210f71d 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -635,7 +635,7 @@ namespace svt { namespace table
bool lcl_updateScrollbar( vcl::Window& _rParent, VclPtr<ScrollBar>& _rpBar,
bool const i_needBar, long _nVisibleUnits,
long _nPosition, long _nLineSize, long _nRange,
- bool _bHorizontal, const Link& _rScrollHandler )
+ bool _bHorizontal, const Link<>& _rScrollHandler )
{
// do we currently have the scrollbar?
bool bHaveBar = _rpBar != nullptr;
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 4a587c8e3af8..5f7dac675e0f 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -138,7 +138,7 @@ namespace svt { namespace table
RowPos m_nAnchor;
bool m_bUpdatingColWidths;
- Link m_aSelectHdl;
+ Link<> m_aSelectHdl;
AccessibleFactoryAccess m_aFactoryAccess;
IAccessibleTableControl* m_pAccessibleTable;
@@ -251,8 +251,8 @@ namespace svt { namespace table
*/
bool markAllRowsAsSelected();
- void setSelectHandler( Link const & i_selectHandler ) { m_aSelectHdl = i_selectHandler; }
- Link const& getSelectHandler() const { return m_aSelectHdl; }
+ void setSelectHandler( Link<> const & i_selectHandler ) { m_aSelectHdl = i_selectHandler; }
+ Link<> const& getSelectHandler() const { return m_aSelectHdl; }
void commitAccessibleEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue );
void commitCellEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue );
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 1da914e79622..34a1a93a09b2 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -43,7 +43,7 @@ namespace svt { namespace table
friend class TableFunctionSet;
private:
TableControl_Impl& m_rTableControl;
- Link m_aSelectHdl;
+ Link<> m_aSelectHdl;
sal_uLong m_nTipWindowHandle;
public:
@@ -51,8 +51,8 @@ namespace svt { namespace table
virtual ~TableDataWindow();
virtual void dispose() SAL_OVERRIDE;
- inline void SetSelectHdl( const Link& rLink ) { m_aSelectHdl = rLink; }
- inline const Link& GetSelectHdl() const { return m_aSelectHdl; }
+ inline void SetSelectHdl( const Link<>& rLink ) { m_aSelectHdl = rLink; }
+ inline const Link<>& GetSelectHdl() const { return m_aSelectHdl; }
// Window overridables
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 32746ba9d765..ac364521afd3 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -545,7 +545,7 @@ VCLXFileControl::~VCLXFileControl()
{
VclPtr< FileControl > pControl = GetAs< FileControl >();
if ( pControl )
- pControl->GetEdit().SetModifyHdl( Link() );
+ pControl->GetEdit().SetModifyHdl( Link<>() );
}
::com::sun::star::uno::Any VCLXFileControl::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
@@ -595,7 +595,7 @@ void VCLXFileControl::SetWindow( const VclPtr< vcl::Window > &pWindow )
{
VclPtr< FileControl > pPrevFileControl = GetAsDynamic< FileControl >();
if ( pPrevFileControl )
- pPrevFileControl->GetEdit().SetModifyHdl( Link() );
+ pPrevFileControl->GetEdit().SetModifyHdl( Link<>() );
FileControl* pNewFileControl = dynamic_cast<FileControl*>( pWindow.get() );
if ( pNewFileControl )
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 7ce191073b55..b735152ef15d 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -36,8 +36,8 @@ friend class ImpItemEdit;
long nAktPaintRow;
VclPtr<Edit> pEditControl;
OUString aWNamMerk;
- Link aEntryChangedHdl;
- Link aSetDirtyHdl;
+ Link<> aEntryChangedHdl;
+ Link<> aSetDirtyHdl;
ImpItemListRow* pAktChangeEntry;
long nLastWhichOfs;
sal_uInt16 nLastWhich;
@@ -90,10 +90,10 @@ public:
const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
OUString GetNewEntryValue() const { return pEditControl->GetText(); }
- void SetEntryChangedHdl(const Link& rLink) { aEntryChangedHdl=rLink; }
- const Link& GetEntryChangedHdl() const { return aEntryChangedHdl; }
- void SetSetDirtyHdl(const Link& rLink) { aSetDirtyHdl=rLink; }
- const Link& GetSetDirtyHdl() const { return aSetDirtyHdl; }
+ void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; }
+ const Link<>& GetEntryChangedHdl() const { return aEntryChangedHdl; }
+ void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; }
+ const Link<>& GetSetDirtyHdl() const { return aSetDirtyHdl; }
};
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 6937bf9fd8ab..675ffd371939 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -28,9 +28,9 @@ class ContourWindow : public GraphCtrl
tools::PolyPolygon aPolyPoly;
Color aPipetteColor;
Rectangle aWorkRect;
- Link aPipetteLink;
- Link aPipetteClickLink;
- Link aWorkplaceClickLink;
+ Link<> aPipetteLink;
+ Link<> aPipetteClickLink;
+ Link<> aWorkplaceClickLink;
bool bPipetteMode;
bool bWorkplaceMode;
bool bClickValid;
@@ -65,10 +65,10 @@ public:
bool IsWorkplaceMode() const { return bWorkplaceMode; }
const Rectangle& GetWorkRect() const { return aWorkRect; }
- void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
- void SetPipetteClickHdl( const Link& rLink ) { aPipetteClickLink = rLink; }
+ void SetPipetteHdl( const Link<>& rLink ) { aPipetteLink = rLink; }
+ void SetPipetteClickHdl( const Link<>& rLink ) { aPipetteClickLink = rLink; }
- void SetWorkplaceClickHdl( const Link& rLink ) { aWorkplaceClickLink = rLink; }
+ void SetWorkplaceClickHdl( const Link<>& rLink ) { aWorkplaceClickLink = rLink; }
};
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index c8ebc7ff591f..641926c98e72 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -387,7 +387,7 @@ SvxTPView::SvxTPView(vcl::Window *pParent, VclBuilderContainer *pTopLevel)
pTable->set_height_request(aControlSize.Height());
m_pViewData = VclPtr<SvxRedlinTable>::Create(*pTable, 0);
- Link aLink=LINK( this, SvxTPView, PbClickHdl);
+ Link<> aLink=LINK( this, SvxTPView, PbClickHdl);
m_pAccept->SetClickHdl(aLink);
m_pAcceptAll->SetClickHdl(aLink);
@@ -566,20 +566,20 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent)
m_pIbClock2->SetClickHdl( LINK( this, SvxTPFilter,TimeHdl) );
m_pBtnRange->SetClickHdl( LINK( this, SvxTPFilter, RefHandle));
- Link aLink=LINK( this, SvxTPFilter, RowEnableHdl) ;
+ Link<> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ;
m_pCbDate->SetClickHdl(aLink);
m_pCbAuthor->SetClickHdl(aLink);
m_pCbRange->SetClickHdl(aLink);
m_pCbAction->SetClickHdl(aLink);
m_pCbComment->SetClickHdl(aLink);
- Link a2Link=LINK( this, SvxTPFilter, ModifyDate);
+ Link<> a2Link=LINK( this, SvxTPFilter, ModifyDate);
m_pDfDate->SetModifyHdl(a2Link);
m_pTfDate->SetModifyHdl(a2Link);
m_pDfDate2->SetModifyHdl(a2Link);
m_pTfDate2->SetModifyHdl(a2Link);
- Link a3Link=LINK( this, SvxTPFilter, ModifyHdl);
+ Link<> a3Link=LINK( this, SvxTPFilter, ModifyHdl);
m_pEdRange->SetModifyHdl(a3Link);
m_pEdComment->SetModifyHdl(a3Link);
m_pLbAction->SetSelectHdl(a3Link);
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 7900913aacaa..d25f61f46b8b 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -396,7 +396,7 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces
mpImpl->mnLinkedFieldValueMultiplyer = 100 / std::pow(10.0, double(nDecimalPlaces));
// remove modify handler from old linked field
- ImplSetFieldLink( Link() );
+ ImplSetFieldLink( Link<>() );
// remember the new linked field
mpImpl->mpLinkField = pField;
// set modify handler at new linked field
@@ -413,7 +413,7 @@ bool DialControl::IsValueModified()
return mpImpl->mnInitialAngle != mpImpl->mnAngle;
}
-void DialControl::SetModifyHdl( const Link& rLink )
+void DialControl::SetModifyHdl( const Link<>& rLink )
{
mpImpl->maModifyHdl = rLink;
}
@@ -465,7 +465,7 @@ void DialControl::SetRotation( sal_Int32 nAngle, bool bBroadcast )
}
}
-void DialControl::ImplSetFieldLink( const Link& rLink )
+void DialControl::ImplSetFieldLink( const Link<>& rLink )
{
if( mpImpl->mpLinkField )
{
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 713b9e9847e8..3986a6a1a594 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -253,7 +253,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,
m_pTbxShadow->SetSizePixel(aSize);
m_pTbxShadow->SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) );
- Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl);
+ Link<> aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl);
m_pMtrFldDistance->SetModifyHdl( aLink );
m_pMtrFldTextStart->SetModifyHdl( aLink );
m_pMtrFldShadowX->SetModifyHdl( aLink );
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 123368477466..cc38f1ed0849 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -922,12 +922,12 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const
}
// frame border selection
-const Link& FrameSelector::GetSelectHdl() const
+const Link<>& FrameSelector::GetSelectHdl() const
{
return mxImpl->maSelectHdl;
}
-void FrameSelector::SetSelectHdl( const Link& rHdl )
+void FrameSelector::SetSelectHdl( const Link<>& rHdl )
{
mxImpl->maSelectHdl = rHdl;
}
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 4209190be843..ee823a521b37 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -94,7 +94,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper
NotifyInfo aInfo;
ImageMap aIMap;
TargetList aTargetList;
- Link aInfoLink;
+ Link<> aInfoLink;
SfxItemPool* pIMapPool;
SfxItemInfo* pItemInfo;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
@@ -145,8 +145,8 @@ public:
void DoMacroAssign();
void DoPropertyDialog();
- void SetInfoLink( const Link& rLink ) { aInfoLink = rLink; }
- const Link& GetInfoLink() const { return aInfoLink; }
+ void SetInfoLink( const Link<>& rLink ) { aInfoLink = rLink; }
+ const Link<>& GetInfoLink() const { return aInfoLink; }
void SetTargetList( TargetList& rTargetList );
const TargetList& GetTargetList() const { return aTargetList; }
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index c82ac45ded8e..14efaed2b004 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -157,7 +157,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
pCbxRotate->SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl ) );
- Link aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl );
+ Link<> aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl );
pCbxUseGridsnap->SetClickHdl( aLink );
pCbxSynchronize->SetClickHdl( aLink );
pCbxGridVisible->SetClickHdl( aLink );
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index d965b9f5743c..b840b4ec3910 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -235,13 +235,13 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW,
m_pPositionLB->SetSelectHdl(LINK(this, SvxRubyDialog, PositionHdl_Impl));
m_pCharStyleLB->SetSelectHdl(LINK(this, SvxRubyDialog, CharStyleHdl_Impl));
- Link aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl));
+ Link<> aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl));
m_pScrollSB->SetScrollHdl( aScrLk );
m_pScrollSB->SetEndScrollHdl( aScrLk );
- Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
- Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl));
- Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl));
+ Link<> aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
+ Link<> aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl));
+ Link<> aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl));
for(sal_uInt16 i = 0; i < 8; i++)
{
aEditArr[i]->SetModifyHdl(aEditLk);
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 7f022235614a..6b66941b9219 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -632,7 +632,7 @@ void SvxSearchDialog::InitControls_Impl()
m_pSearchLB->SetModifyHdl( LINK( this, SvxSearchDialog, ModifyHdl_Impl ) );
m_pReplaceLB->SetModifyHdl( LINK( this, SvxSearchDialog, ModifyHdl_Impl ) );
- Link aLink = LINK( this, SvxSearchDialog, FocusHdl_Impl );
+ Link<> aLink = LINK( this, SvxSearchDialog, FocusHdl_Impl );
m_pSearchLB->SetGetFocusHdl( aLink );
m_pReplaceLB->SetGetFocusHdl( aLink );
@@ -807,7 +807,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC )
{
m_pCalcGrid->Show();
- Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
+ Link<> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
m_pCalcSearchInLB->SetSelectHdl( aLink );
m_pRowsBtn->SetClickHdl( aLink );
m_pColumnsBtn->SetClickHdl( aLink );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 0b84e42d68f6..dd66ce96a876 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -218,7 +218,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
m_pBtnAssign->SetClickHdl( LINK( this, Svx3DWin, ClickAssignHdl ) );
m_pBtnUpdate->SetClickHdl( LINK( this, Svx3DWin, ClickUpdateHdl ) );
- Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) );
+ Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) );
m_pBtnGeo->SetClickHdl( aLink );
m_pBtnRepresentation->SetClickHdl( aLink );
m_pBtnLight->SetClickHdl( aLink );
@@ -357,7 +357,7 @@ void Svx3DWin::dispose()
void Svx3DWin::Construct()
{
m_pBtnGeo->Check();
- Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) );
+ Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) );
aLink.Call(m_pBtnGeo);
m_pCtlLightPreview->Hide();
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ffc4d3465eaf..40874b41fbcb 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2693,7 +2693,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
DbFilterField::~DbFilterField()
{
if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX)
- static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link() );
+ static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link<>() );
}
@@ -3612,7 +3612,7 @@ void FmXEditCell::disposing()
m_aTextListeners.disposeAndClear(aEvt);
m_aChangeListeners.disposeAndClear(aEvt);
- m_pEditImplementation->SetModifyHdl( Link() );
+ m_pEditImplementation->SetModifyHdl( Link<>() );
if ( m_bOwnEditImplementation )
delete m_pEditImplementation;
m_pEditImplementation = NULL;
@@ -3858,7 +3858,7 @@ void FmXCheckBoxCell::disposing()
m_aItemListeners.disposeAndClear(aEvt);
m_aActionListeners.disposeAndClear(aEvt);
- static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link());
+ static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<>());
m_pBox = NULL;
FmXDataCell::disposing();
@@ -4034,8 +4034,8 @@ void FmXListBoxCell::disposing()
m_aItemListeners.disposeAndClear(aEvt);
m_aActionListeners.disposeAndClear(aEvt);
- m_pBox->SetSelectHdl( Link() );
- m_pBox->SetDoubleClickHdl( Link() );
+ m_pBox->SetSelectHdl( Link<>() );
+ m_pBox->SetDoubleClickHdl( Link<>() );
m_pBox = NULL;
FmXTextCell::disposing();
@@ -4590,7 +4590,7 @@ void FmXFilterCell::disposing()
::com::sun::star::lang::EventObject aEvt(*this);
m_aTextListeners.disposeAndClear(aEvt);
- static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link());
+ static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link<>());
FmXGridCell::disposing();
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 75e63f556b4d..a92cca0876da 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1375,7 +1375,7 @@ namespace svxform
// handler
m_pModelsBox->SetSelectHdl( LINK( this, DataNavigatorWindow, ModelSelectHdl ) );
- Link aLink = LINK( this, DataNavigatorWindow, MenuSelectHdl );
+ Link<> aLink = LINK( this, DataNavigatorWindow, MenuSelectHdl );
m_pModelBtn->SetSelectHdl( aLink );
m_pInstanceBtn->SetSelectHdl( aLink );
aLink = LINK( this, DataNavigatorWindow, MenuActivateHdl );
@@ -2534,7 +2534,7 @@ namespace svxform
void AddDataItemDialog::InitDialog()
{
// set handler
- Link aLink = LINK( this, AddDataItemDialog, CheckHdl );
+ Link<> aLink = LINK( this, AddDataItemDialog, CheckHdl );
m_pRequiredCB->SetClickHdl( aLink );
m_pRelevantCB->SetClickHdl( aLink );
m_pConstraintCB->SetClickHdl( aLink );
@@ -2933,7 +2933,7 @@ namespace svxform
sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ );
m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) );
- Link aLink = LINK( this, NamespaceItemDialog, ClickHdl );
+ Link<> aLink = LINK( this, NamespaceItemDialog, ClickHdl );
m_pAddNamespaceBtn->SetClickHdl( aLink );
m_pEditNamespaceBtn->SetClickHdl( aLink );
m_pDeleteNamespaceBtn->SetClickHdl( aLink );
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 50943bd1a92f..7d2f2671e634 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -391,7 +391,7 @@ namespace svxform
{
if (m_pTransferable)
{
- m_pTransferable->setClipboardListener( Link() );
+ m_pTransferable->setClipboardListener( Link<>() );
m_pTransferable->release();
m_pTransferable = NULL;
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 6cd4924afd5e..3f3ddfd440d6 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1287,7 +1287,7 @@ void FmFormShell::ForgetActiveControl()
}
-void FmFormShell::SetControlActivationHandler( const Link& _rHdl )
+void FmFormShell::SetControlActivationHandler( const Link<>& _rHdl )
{
m_pImpl->SetControlActivationHandler( _rHdl );
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index fe0c4d78d47a..f8e818239a13 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3618,7 +3618,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate
// remove callbacks at the page
if ( pPage )
{
- pPage->GetImpl().SetFormsCreationHdl( Link() );
+ pPage->GetImpl().SetFormsCreationHdl( Link<>() );
}
UpdateForms( true );
}
@@ -3938,7 +3938,7 @@ void FmXFormShell::ForgetActiveControl()
}
-void FmXFormShell::SetControlActivationHandler( const Link& _rHdl )
+void FmXFormShell::SetControlActivationHandler( const Link<>& _rHdl )
{
m_pTextShell->SetControlActivationHandler( _rHdl );
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index f5f86da6cb94..a3ed1a342843 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -107,9 +107,9 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::
}
-Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk)
+Link<> FmRecordCountListener::SetPropChangeHandler(const Link<>& lnk)
{
- Link lnkReturn = m_lnkWhoWantsToKnow;
+ Link<> lnkReturn = m_lnkWhoWantsToKnow;
m_lnkWhoWantsToKnow = lnk;
if (m_xListening.is())
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index e695c6d8b79f..28c6c247dda5 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -433,7 +433,7 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :
css::uno::UNO_QUERY );
Image aDummyImage;
- const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
+ const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
vcl::Font aInfoFont( maInfoBar->GetControlFont() );
maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
@@ -757,7 +757,7 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW));
- const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
+ const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
mpIconView->SetSelectHdl( aSelectHdl );
mpListView->SetSelectHdl( aSelectHdl );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 9fd56751e8a3..ba1d23e2b317 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -510,7 +510,7 @@ bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
return true;
}
-void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProgress )
+void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pProgress )
{
if( !IsReadOnly() )
{
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 5f078aa9d3c7..b339fe9f6913 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -38,7 +38,7 @@ namespace svxform
class DelayedEvent
{
public:
- DelayedEvent( const Link& _rHandler )
+ DelayedEvent( const Link<>& _rHandler )
:m_aHandler( _rHandler )
,m_nEventId( 0 )
{
@@ -62,7 +62,7 @@ namespace svxform
void CancelPendingCall();
private:
- Link m_aHandler;
+ Link<> m_aHandler;
ImplSVEvent * m_nEventId;
private:
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 09ab923081c5..a4289d966beb 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -48,7 +48,7 @@ namespace svxform
class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper
{
private:
- Link m_aClipboardListener;
+ Link<> m_aClipboardListener;
bool m_bDragging : 1;
bool m_bClipboardOwner : 1;
@@ -67,7 +67,7 @@ namespace svxform
void startDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& );
void copyToClipboard( vcl::Window* _pWindow, const GrantAccess& );
- void setClipboardListener( const Link& _rListener ) { m_aClipboardListener = _rListener; }
+ void setClipboardListener( const Link<>& _rListener ) { m_aClipboardListener = _rListener; }
void clear();
@@ -112,7 +112,7 @@ namespace svxform
inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
inline void clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); }
- SVX_DLLPRIVATE void setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
+ SVX_DLLPRIVATE void setClipboardListener( const Link<>& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
protected:
SVX_DLLPRIVATE virtual OLocalExchange* createExchange() const = 0;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index a3d52c147b8b..6e8860756f38 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -54,7 +54,7 @@ class SVX_DLLPRIVATE FmFormPageImpl
::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap > m_aControlShapeMap;
FmFormPage& m_rPage;
- Link m_aFormsCreationHdl;
+ Link<> m_aFormsCreationHdl;
bool m_bFirstActivation;
bool m_bAttemptedFormCreation;
@@ -93,8 +93,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true );
- void SetFormsCreationHdl( const Link& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; }
- const Link& GetFormsCreationHdl() const { return m_aFormsCreationHdl; }
+ void SetFormsCreationHdl( const Link<>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; }
+ const Link<>& GetFormsCreationHdl() const { return m_aFormsCreationHdl; }
protected:
/** finds a form with a given data source signature
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 61ddbf23d301..c6d7404e190e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -432,7 +432,7 @@ public:
SAL_DLLPRIVATE void GetTextAttributeState( SfxItemSet& _rSet );
SAL_DLLPRIVATE bool IsActiveControl( bool _bCountRichTextOnly = false ) const;
SAL_DLLPRIVATE void ForgetActiveControl();
- SAL_DLLPRIVATE void SetControlActivationHandler( const Link& _rHdl );
+ SAL_DLLPRIVATE void SetControlActivationHandler( const Link<>& _rHdl );
/// classifies our host document
SAL_DLLPRIVATE ::svxform::DocumentType
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index e00e532a5f91..fc679e30156d 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -108,7 +108,7 @@ namespace svx
SfxViewFrame* m_pViewFrame;
// invalidating slots
SfxBindings& m_rBindings;
- Link m_aControlActivationHandler;
+ Link<> m_aControlActivationHandler;
AutoTimer m_aClipboardInvalidation;
bool m_bNeedClipboardInvalidation;
@@ -123,7 +123,7 @@ namespace svx
void GetTextAttributeState( SfxItemSet& _rSet );
bool IsActiveControl( bool _bCountRichTextOnly = false ) const;
void ForgetActiveControl();
- void SetControlActivationHandler( const Link& _rHdl ) { m_aControlActivationHandler = _rHdl; }
+ void SetControlActivationHandler( const Link<>& _rHdl ) { m_aControlActivationHandler = _rHdl; }
/** to be called when a form in our document has been activated
*/
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 51d94e1f861b..926fbe71d0f8 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -120,7 +120,7 @@ struct FrameSelectorImpl : public Resource
FrameSelFlags mnFlags; /// Flags for enabled frame borders.
FrameBorderPtrVec maAllBorders; /// Pointers to all frame borders.
FrameBorderPtrVec maEnabBorders; /// Pointers to enables frame borders.
- Link maSelectHdl; /// Selection handler.
+ Link<> maSelectHdl; /// Selection handler.
long mnCtrlSize; /// Size of the control (always square).
long mnArrowSize; /// Size of an arrow image.
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index bd379ce49d40..7cfeeb1294b0 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -683,7 +683,7 @@ class DbFilterField
{
::com::sun::star::uno::Sequence< OUString > m_aValueList;
OUString m_aText;
- Link m_aCommitLink;
+ Link<> m_aCommitLink;
sal_Int16 m_nControlClass;
bool m_bFilterList : 1;
bool m_bFilterListFilled : 1;
@@ -704,8 +704,8 @@ public:
const OUString& GetText() const {return m_aText;}
void SetText(const OUString& rText);
- void SetCommitHdl( const Link& rLink ) { m_aCommitLink = rLink; }
- const Link& GetCommitHdl() const { return m_aCommitLink; }
+ void SetCommitHdl( const Link<>& rLink ) { m_aCommitLink = rLink; }
+ const Link<>& GetCommitHdl() const { return m_aCommitLink; }
protected:
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 6e2294b56e1d..a0d41c24755c 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -171,7 +171,7 @@ void AreaPropertyPanel::Initialize()
mpLbFillType->SetAccessibleName(OUString( "Fill")); //wj acc
mpLbFillAttr->SetAccessibleName(OUString( "Fill")); //wj acc
- Link aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl );
+ Link<> aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl );
mpLbFillType->SetSelectHdl( aLink );
aLink = LINK( this, AreaPropertyPanel, SelectFillAttrHdl );
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 9d31ad746ade..097b01c877b2 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -75,7 +75,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
mrAreaPropertyPanel(rPanel),
mpBindings(NULL)
{
- Link aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl);
+ Link<> aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl);
maMtrTrgrCenterX->SetModifyHdl( aLink );
maMtrTrgrCenterY->SetModifyHdl( aLink );
maMtrTrgrAngle->SetModifyHdl( aLink );
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 004fef29dc0b..d63d3524e0b9 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -243,7 +243,7 @@ void LinePropertyPanel::Initialize()
FillLineStyleList();
SelectLineStyle();
- Link aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl );
+ Link<> aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl );
mpLBStyle->SetSelectHdl( aLink );
mpLBStyle->SetAccessibleName(OUString( "Style"));
mpLBStyle->AdaptDropDownLineCountToMaximum();
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index b4bf1af137ba..6a0a8fa53d9e 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -179,7 +179,7 @@ void LineWidthControl::Initialize()
maVSWidth->SetImage(maIMGCusGray);
maVSWidth->SetSelItem(0);
- Link aLink = LINK( this, LineWidthControl, VSSelectHdl ) ;
+ Link<> aLink = LINK( this, LineWidthControl, VSSelectHdl ) ;
maVSWidth->SetSelectHdl(aLink);
aLink = LINK(this, LineWidthControl, MFModifyHdl);
maMFWidth->SetModifyHdl(aLink);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 29f93b25ddc2..ff514d95b4b4 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -66,7 +66,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId)
meLNSpaceUnit = SFX_MAPUNIT_100TH_MM;
- Link aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler);
+ Link<> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler);
mpSpacing1Button->SetClickHdl(aLink);
mpSpacing115Button->SetClickHdl(aLink);
mpSpacing15Button->SetClickHdl(aLink);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index db3241acfc04..e69668101c28 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -199,7 +199,7 @@ void ParaPropertyPanel::ReSize(bool /* bSize */)
void ParaPropertyPanel::InitToolBoxIndent()
{
- Link aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl );
+ Link<> aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl );
mpLeftIndent->SetModifyHdl( aLink );
mpRightIndent->SetModifyHdl( aLink );
mpFLineIndent->SetModifyHdl( aLink );
@@ -232,7 +232,7 @@ void ParaPropertyPanel::InitToolBoxIndent()
void ParaPropertyPanel::InitToolBoxSpacing()
{
- Link aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl );
+ Link<> aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl );
mpTopDist->SetModifyHdl(aLink);
mpBottomDist->SetModifyHdl( aLink );
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index bd1489431c3c..7ada52b9a09e 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -64,7 +64,7 @@ TextCharacterSpacingControl::TextCharacterSpacingControl (
{
initial();
FreeResource();
- Link aLink = LINK(this, TextCharacterSpacingControl, KerningSelectHdl);
+ Link<> aLink = LINK(this, TextCharacterSpacingControl, KerningSelectHdl);
maLBKerning->SetSelectHdl(aLink);
aLink =LINK(this, TextCharacterSpacingControl, KerningModifyHdl);
maEditKerning->SetModifyHdl(aLink);
@@ -146,7 +146,7 @@ void TextCharacterSpacingControl::initial()
maVSSpacing->AddItem( maImgCus, 0, maStrCus, 0 );
maVSSpacing->SetNoSelection();
- Link aLink = LINK(this, TextCharacterSpacingControl,VSSelHdl );
+ Link<> aLink = LINK(this, TextCharacterSpacingControl,VSSelHdl );
maVSSpacing->SetSelectHdl(aLink);
maVSSpacing->StartSelection();
maVSSpacing->Show();
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index b6d9e09a803b..484e5fd74cfa 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -196,7 +196,7 @@ void TextPropertyPanel::EndUnderlinePopupMode()
void TextPropertyPanel::InitToolBoxFont()
{
- Link aLink = LINK(this, TextPropertyPanel, UnderlineClickHdl);
+ Link<> aLink = LINK(this, TextPropertyPanel, UnderlineClickHdl);
mpToolBoxFont->SetDropdownClickHdl(aLink);
}
@@ -205,7 +205,7 @@ void TextPropertyPanel::InitToolBoxSpacing()
const sal_uInt16 nId = mpToolBoxSpacing->GetItemId(UNO_SPACING);
mpToolBoxSpacing->SetItemBits(nId, mpToolBoxSpacing->GetItemBits(nId) | ToolBoxItemBits::DROPDOWNONLY);
- Link aLink = LINK(this, TextPropertyPanel, SpacingClickHdl);
+ Link<> aLink = LINK(this, TextPropertyPanel, SpacingClickHdl);
mpToolBoxSpacing->SetDropdownClickHdl ( aLink );
mpToolBoxSpacing->SetSelectHdl( aLink );
}
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index a0eae0efb4b2..690578bf71e4 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -86,7 +86,7 @@ void TextUnderlineControl::initial()
GetSettings().GetStyleSettings().GetMenuColor() :
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
- Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ;
+ Link<> aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ;
maPBOptions->SetClickHdl(aLink);
maVSUnderline->SetStyle( maVSUnderline->GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT );
diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx
index ecb55c8dea68..adec049b539f 100644
--- a/svx/source/svdraw/sdrundomanager.cxx
+++ b/svx/source/svdraw/sdrundomanager.cxx
@@ -100,7 +100,7 @@ void SdrUndoManager::Clear()
}
}
-void SdrUndoManager::SetEndTextEditHdl(const Link& rLink)
+void SdrUndoManager::SetEndTextEditHdl(const Link<>& rLink)
{
maEndTextEditHdl = rLink;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0d4ee090e7d6..4899c4b97947 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -505,7 +505,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
}
}
Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj);
- Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
+ Link<> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI);
bOk = !rStr.isEmpty();
@@ -774,8 +774,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
else
{
pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
- pTextEditOutliner->SetBeginPasteOrDropHdl(Link());
- pTextEditOutliner->SetEndPasteOrDropHdl(Link());
+ pTextEditOutliner->SetBeginPasteOrDropHdl(Link<>());
+ pTextEditOutliner->SetEndPasteOrDropHdl(Link<>());
}
}
if (pTextEditOutliner != NULL)
@@ -856,7 +856,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// reset the callback link and let the undo manager cleanup all text edit
// undo actions to get the stack back to the form before the text edit
- pSdrUndoManager->SetEndTextEditHdl(Link());
+ pSdrUndoManager->SetEndTextEditHdl(Link<>());
}
else
{
@@ -907,8 +907,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// Set old CalcFieldValue-Handler again, this
// has to happen before Obj::EndTextEdit(), as this does UpdateFields().
pTEOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
- pTEOutliner->SetBeginPasteOrDropHdl(Link());
- pTEOutliner->SetEndPasteOrDropHdl(Link());
+ pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
+ pTEOutliner->SetEndPasteOrDropHdl(Link<>());
const bool bUndo = IsUndoEnabled();
if( bUndo )
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b5577781ad69..4afabbe9b7d8 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -97,7 +97,7 @@ OLEObjCache::OLEObjCache()
{
nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
pTimer = new AutoTimer();
- Link aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
+ Link<> aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
pTimer->SetTimeoutHdl(aLink);
pTimer->SetTimeout(20000);
@@ -251,7 +251,7 @@ void SdrLinkList::Clear()
aList.clear();
}
-unsigned SdrLinkList::FindEntry(const Link& rLink) const
+unsigned SdrLinkList::FindEntry(const Link<>& rLink) const
{
unsigned nAnz=GetLinkCount();
for (unsigned i=0; i<nAnz; i++) {
@@ -260,15 +260,15 @@ unsigned SdrLinkList::FindEntry(const Link& rLink) const
return 0xFFFF;
}
-void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos)
+void SdrLinkList::InsertLink(const Link<>& rLink, unsigned nPos)
{
unsigned nFnd=FindEntry(rLink);
if (nFnd==0xFFFF) {
if (rLink.IsSet()) {
if(nPos==0xFFFF)
- aList.push_back(new Link(rLink));
+ aList.push_back(new Link<>(rLink));
else
- aList.insert(aList.begin() + nPos, new Link(rLink));
+ aList.insert(aList.begin() + nPos, new Link<>(rLink));
} else {
OSL_FAIL("SdrLinkList::InsertLink(): Tried to insert a link that was not set already.");
}
@@ -277,11 +277,11 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos)
}
}
-void SdrLinkList::RemoveLink(const Link& rLink)
+void SdrLinkList::RemoveLink(const Link<>& rLink)
{
unsigned nFnd=FindEntry(rLink);
if (nFnd!=0xFFFF) {
- Link* pLink = aList[nFnd];
+ Link<>* pLink = aList[nFnd];
aList.erase( aList.begin() + nFnd );
delete pLink;
} else {
@@ -545,7 +545,7 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange
-SvdProgressInfo::SvdProgressInfo( Link *_pLink )
+SvdProgressInfo::SvdProgressInfo( Link<> *_pLink )
{
DBG_ASSERT(_pLink!=NULL,"SvdProgressInfo(): No Link stated!");
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8afbb4f969a4..edea77372da3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3336,25 +3336,25 @@ SdrObject* SdrObjFactory::MakeNewObject(
return pObj;
}
-void SdrObjFactory::InsertMakeObjectHdl(const Link& rLink)
+void SdrObjFactory::InsertMakeObjectHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjHdl();
rLL.InsertLink(rLink);
}
-void SdrObjFactory::RemoveMakeObjectHdl(const Link& rLink)
+void SdrObjFactory::RemoveMakeObjectHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjHdl();
rLL.RemoveLink(rLink);
}
-void SdrObjFactory::InsertMakeUserDataHdl(const Link& rLink)
+void SdrObjFactory::InsertMakeUserDataHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl();
rLL.InsertLink(rLink);
}
-void SdrObjFactory::RemoveMakeUserDataHdl(const Link& rLink)
+void SdrObjFactory::RemoveMakeUserDataHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl();
rLL.RemoveLink(rLink);
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 84ef3242fd46..71b4f7e7c649 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -126,8 +126,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeContourTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
void decomposeBlockTextPrimitive(
@@ -141,8 +141,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeBlockTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
void decomposeStretchTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB)
@@ -152,8 +152,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeStretchTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence();
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 6d053e47ddb3..252d39ab0558 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -791,7 +791,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
}
// clean up outliner
- rOutliner.SetDrawPortionHdl(Link());
+ rOutliner.SetDrawPortionHdl(Link<>());
rOutliner.Clear();
rOutliner.setVisualizedPage(0);
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 3c733ef96ed7..c715a4dbb765 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -82,7 +82,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
pOutliner->SetVertical( false );
// Deregister on outliner, might be reused from outliner cache
- pOutliner->SetNotifyHdl( Link() );
+ pOutliner->SetNotifyHdl( Link<>() );
}
else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) )
{
@@ -91,7 +91,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
pOutliner->SetVertical( false );
// Deregister on outliner, might be reused from outliner cache
- pOutliner->SetNotifyHdl( Link() );
+ pOutliner->SetNotifyHdl( Link<>() );
}
else
{
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index a241d615c8e0..e0c83401f254 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -154,7 +154,7 @@ void SdrTableRTFParser::Read( SvStream& rStream )
{
EditEngine& rEdit = const_cast< EditEngine& >( mpOutliner->GetEditEngine() );
- Link aOldLink( rEdit.GetImportHdl() );
+ Link<> aOldLink( rEdit.GetImportHdl() );
rEdit.SetImportHdl( LINK( this, SdrTableRTFParser, RTFImportHdl ) );
mpOutliner->Read( rStream, OUString(), EE_FORMAT_RTF );
rEdit.SetImportHdl( aOldLink );
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 68ab4fe1c114..022bf9bbedd4 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -125,7 +125,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,
appendEntry( 1, SVX_RESSTR( RID_SVXSTR_MORENUMBERING ), ::GetImage( rFrame, ".uno:OutlineBullet", false ) );
SetOutputSizePixel( getMenuSize() );
- Link aLink = LINK( this, NumberingPopup, VSSelectHdl );
+ Link<> aLink = LINK( this, NumberingPopup, VSSelectHdl );
mpValueSet->SetSelectHdl( aLink );
SetSelectHdl( aLink );
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 5cdf8b7a10fe..0aac5298c2d8 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -45,7 +45,7 @@ private:
VclPtr<PushButton> mpButtonPicker;
VclPtr<FixedLine> mpAutomaticSeparator;
OUString maCommand;
- Link maSelectedLink;
+ Link<> maSelectedLink;
PaletteManager& mrPaletteManager;
BorderColorStatus& mrBorderColorStatus;
@@ -75,7 +75,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
- void SetSelectedHdl( const Link& rLink ) { maSelectedLink = rLink; }
+ void SetSelectedHdl( const Link<>& rLink ) { maSelectedLink = rLink; }
};
#endif
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 09008172a790..c212d634234f 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -452,11 +452,11 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
{
case KEY_RETURN:
nHandled = true;
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
break;
case KEY_TAB:
bRelease = false;
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
bRelease = true;
break;
@@ -524,7 +524,7 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
switch ( pKEvt->GetKeyCode().GetCode() )
{
case KEY_RETURN:
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
nHandled = true;
break;
case KEY_TAB:
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e84b027fd233..7daff1e20708 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -132,7 +132,7 @@ public:
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
- void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; }
+ void SetVisibilityListener( const Link<>& aVisListener ) { aVisibilityListener = aVisListener; }
void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; }
@@ -146,7 +146,7 @@ private:
sal_uInt16 nCurSel;
bool bRelease;
Size aLogicalSize;
- Link aVisibilityListener;
+ Link<> aVisibilityListener;
bool bVisible;
Reference< XDispatchProvider > m_xDispatchProvider;
Reference< XFrame > m_xFrame;
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 5c68c3592ac7..26a7269d685a 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -174,7 +174,7 @@ namespace {
SvxDrawPage* mpUnoPage;
- Link maOldCalcFieldValueHdl;
+ Link<> maOldCalcFieldValueHdl;
sal_Int32 mnPageNumber;
SdrPage* mpCurrentPage;
SdrModel* mpDoc;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 0cc0b43c5f9e..348f9a0c7791 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -435,7 +435,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
- mpView->GetTextEditOutliner()->SetNotifyHdl( Link() );
+ mpView->GetTextEditOutliner()->SetNotifyHdl( Link<>() );
// destroy view forwarder, OutlinerView no longer
// valid (no need for UpdateData(), it's been
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 991ee29da563..edbd37fd4c7e 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -206,7 +206,7 @@ void SAL_CALL GalleryTheme::update( )
if( mpTheme )
{
- const Link aDummyLink;
+ const Link<> aDummyLink;
mpTheme->Actualize( aDummyLink );
}
}
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index a0fbabb66600..434c7d2018d3 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -515,11 +515,11 @@ public:
void SetRootAtom( const Atom* pAtom );
- void SetCollapsingHdl(const Link& rNewHdl){maCollapsingHdl=rNewHdl;}
- const Link& GetCollapsingHdl() const { return maCollapsingHdl; }
+ void SetCollapsingHdl(const Link<>& rNewHdl){maCollapsingHdl=rNewHdl;}
+ const Link<>& GetCollapsingHdl() const { return maCollapsingHdl; }
- void SetExpandingHdl(const Link& rNewHdl){maExpandingHdl=rNewHdl;}
- const Link& GetExpandingHdl() const { return maExpandingHdl; }
+ void SetExpandingHdl(const Link<>& rNewHdl){maExpandingHdl=rNewHdl;}
+ const Link<>& GetExpandingHdl() const { return maExpandingHdl; }
virtual BOOL Expand( SvTreeListEntry* pParent );
virtual BOOL Collapse( SvTreeListEntry* pParent );
@@ -538,8 +538,8 @@ private:
Image maImgExpanded;
Image maImgCollapsed;
bool mbRecursiveGuard;
- Link maCollapsingHdl;
- Link maExpandingHdl;
+ Link<> maCollapsingHdl;
+ Link<> maExpandingHdl;
};
typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 572773475374..b84fc43f21aa 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -167,11 +167,11 @@ private:
Point m_aOldRBPos; ///< Right/Bottom of last VisArea
// (used in Invalidate by Cursor)
- Link m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set
+ Link<> m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set
into a fly. A macro can be then becalled */
- Link m_aChgLnk; /**< link will be called by every attribute/
+ Link<> m_aChgLnk; /**< link will be called by every attribute/
format changes at cursor position.*/
- Link m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived
+ Link<> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived
SwShellCrsr* m_pCurCrsr; ///< current cursor
SwShellCrsr* m_pCrsrStk; ///< stack for the cursor
@@ -486,16 +486,16 @@ public:
bool IsOverReadOnlyPos( const Point& rPt ) const;
// Methods for aFlyMacroLnk.
- void SetFlyMacroLnk( const Link& rLnk ) { m_aFlyMacroLnk = rLnk; }
- const Link& GetFlyMacroLnk() const { return m_aFlyMacroLnk; }
+ void SetFlyMacroLnk( const Link<>& rLnk ) { m_aFlyMacroLnk = rLnk; }
+ const Link<>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; }
// Methods returning/altering link for changes of attributes/formates.
- void SetChgLnk( const Link &rLnk ) { m_aChgLnk = rLnk; }
- const Link& GetChgLnk() const { return m_aChgLnk; }
+ void SetChgLnk( const Link<> &rLnk ) { m_aChgLnk = rLnk; }
+ const Link<>& GetChgLnk() const { return m_aChgLnk; }
// Methods returning/altering ling for "graphic completely loaded".
- void SetGrfArrivedLnk( const Link &rLnk ) { m_aGrfArrivedLnk = rLnk; }
- const Link& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; }
+ void SetGrfArrivedLnk( const Link<> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
+ const Link<>& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; }
//Call ChgLink. When within an action calling will be delayed.
void CallChgLnk();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 71ab46719bcd..6daed2fb3549 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -258,7 +258,7 @@ class SW_DLLPUBLIC SwDoc :
::boost::scoped_ptr<SwNodes> m_pNodes; //< document content (Nodes Array)
SwAttrPool* mpAttrPool; //< the attribute pool
SwPageDescs maPageDescs; //< PageDescriptors
- Link maOle2Link; //< OLE 2.0-notification
+ Link<> maOle2Link; //< OLE 2.0-notification
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
*/
@@ -1361,8 +1361,8 @@ public:
::sw::IShellCursorSupplier * GetIShellCursorSupplier();
// OLE 2.0-notification.
- inline void SetOle2Link(const Link& rLink) {maOle2Link = rLink;}
- inline const Link& GetOle2Link() const {return maOle2Link;}
+ inline void SetOle2Link(const Link<>& rLink) {maOle2Link = rLink;}
+ inline const Link<>& GetOle2Link() const {return maOle2Link;}
// insert section (the ODF kind of section, not the nodesarray kind)
SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
@@ -1439,7 +1439,7 @@ public:
// Call into intransparent Basic / JavaScript.
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
bool bChkPtr = false, SbxArray* pArgs = 0,
- const Link* pCallBack = 0 );
+ const Link<>* pCallBack = 0 );
/** Adjust left margin via object bar (similar to adjustment of numerations).
One can either change the margin "by" adding or subtracting a given
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index aa3b2edc390b..d0cdeaa50b6c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1226,8 +1226,8 @@ sal_uLong SwCursor::Find( const SfxItemSet& rSet, bool bNoCollections,
{
// switch off OLE-notifications
SwDoc* pDoc = GetDoc();
- Link aLnk( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aLnk( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
bool bReplace = ( pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
!rSet.Count() ) ) ||
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 8468eb4e21d1..62e9e799fb18 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -70,8 +70,8 @@ sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
{
// switch off OLE-notifications
SwDoc* pDoc = GetDoc();
- Link aLnk( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aLnk( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
bool const bStartUndo =
pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFmtColl;
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 6486526dc161..1d0c30e78af4 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -626,8 +626,8 @@ sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes,
{
// switch off OLE-notifications
SwDoc* pDoc = GetDoc();
- Link aLnk( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aLnk( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
bool const bStartUndo = pDoc->GetIDocumentUndoRedo().DoesUndo() && bReplace;
if (bStartUndo)
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index c61482eff6ab..5cb1e0dfc637 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -366,7 +366,7 @@ SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrL
void DocumentDrawModelManager::DrawNotifyUndoHdl()
{
- mpDrawModel->SetNotifyUndoActionHdl( Link() );
+ mpDrawModel->SetNotifyUndoActionHdl( Link<>() );
}
}
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index e7519bf2caef..e28666606618 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -131,7 +131,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
}
sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bCheckPtr, SbxArray* pArgs, const Link* )
+ bool bCheckPtr, SbxArray* pArgs, const Link<>* )
{
if( !mpDocShell ) // we can't do that without a DocShell!
return 0;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index fe2089555398..be5fb3f9c861 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1836,7 +1836,7 @@ static void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut,
}
// No Link here, we want to load the graphic synchronously!
- const_cast<SvxBrushItem&>(rBrush).SetDoneLink( Link() );
+ const_cast<SvxBrushItem&>(rBrush).SetDoneLink( Link<>() );
GraphicObject *pGrf = const_cast<GraphicObject*>(rBrush.GetGraphicObject());
// Outsource drawing of background with a background color
@@ -1984,7 +1984,7 @@ void DrawGraphic(
rSh.GetOut()->GetOutDevType() == OUTDEV_PRINTER )
{
pBrush->PurgeMedium();
- const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( Link() );
+ const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( Link<>() );
}
else
const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( LINK(
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index f2007a1d6821..ab2b0df98d36 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -68,7 +68,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
bReadOnly = true;
pDoc = pDocSh->GetDoc();
xDocShellRef = pDocSh;
- pDoc->SetOle2Link( Link() );
+ pDoc->SetOle2Link( Link<>() );
pDoc->GetIDocumentUndoRedo().DoUndo(false);
pDoc->acquire();
uno::Reference< embed::XStorage > refStg;
@@ -114,7 +114,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg
bReadOnly = false;
pDoc = pDocSh->GetDoc();
xDocShellRef = pDocSh;
- pDoc->SetOle2Link( Link() );
+ pDoc->SetOle2Link( Link<>() );
pDoc->GetIDocumentUndoRedo().DoUndo(false);
pDoc->acquire();
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 9761a38ba60c..7af7b015a9aa 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -141,11 +141,11 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
// JP 10.02.2000, Bug 72806: dont modify the doc for getting the
// correct charstyle.
bool bResetMod = !pDoc->getIDocumentState().IsModified();
- Link aOle2Lnk;
+ Link<> aOle2Lnk;
if ( bResetMod )
{
aOle2Lnk = pDoc->GetOle2Link();
- ( (SwDoc*) pDoc )->SetOle2Link( Link() );
+ ( (SwDoc*) pDoc )->SetOle2Link( Link<>() );
}
pRet = IsPoolUserFmt( nId )
@@ -263,11 +263,11 @@ SwCharFmt* SwTxtRuby::GetCharFmt()
// JP 10.02.2000, Bug 72806: dont modify the doc for getting the
// correct charstyle.
const bool bResetMod = !pDoc->getIDocumentState().IsModified();
- Link aOle2Lnk;
+ Link<> aOle2Lnk;
if( bResetMod )
{
aOle2Lnk = pDoc->GetOle2Link();
- const_cast<SwDoc*>(pDoc)->SetOle2Link( Link() );
+ const_cast<SwDoc*>(pDoc)->SetOle2Link( Link<>() );
}
pRet = IsPoolUserFmt( nId )
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 2fcf22f80ed9..fcec80704d1b 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -87,8 +87,8 @@ sal_uLong SwReader::Read( const Reader& rOptions )
GetDoc();
// while reading, do not call OLE-Modified
- Link aOLELink( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aOLELink( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
pDoc->SetInReading( true );
pDoc->SetInXMLImport( 0 != dynamic_cast< XMLReader* >(po) );
@@ -503,7 +503,7 @@ SwDoc* Reader::GetTemplateDoc()
if( pDocSh->DoInitNew( 0 ) )
{
pTemplate = pDocSh->GetDoc();
- pTemplate->SetOle2Link( Link() );
+ pTemplate->SetOle2Link( Link<>() );
// always FALSE
pTemplate->GetIDocumentUndoRedo().DoUndo( false );
pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode );
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 93abca315423..9c2bde214c7f 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1765,7 +1765,7 @@ void SwHTMLParser::InsertLink()
sRel = rOption.GetString();
break;
case HTML_O_HREF:
- sHRef = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), rOption.GetString(), Link(), false );
+ sHRef = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), rOption.GetString(), Link<>(), false );
break;
case HTML_O_TYPE:
sType = rOption.GetString();
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index b256f8aa4f7d..622eaa7341a0 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1345,7 +1345,7 @@ void SwHTMLParser::NewForm( bool bAppend )
if( !aAction.isEmpty() )
{
- aAction = URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), aAction, Link(), false);
+ aAction = URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), aAction, Link<>(), false);
}
else
{
@@ -1866,7 +1866,7 @@ void SwHTMLParser::InsertInput()
// Die URL erst nach dem Einfuegen setzen, weil sich der
// Download der Grafik erst dann am XModel anmelden kann,
// wenn das Control eingefuegt ist.
- aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link(), false));
+ aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link<>(), false));
xPropSet->setPropertyValue("ImageURL",
aTmp );
}
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 84e90e5ea894..5bed2bbfe84f 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1230,7 +1230,7 @@ ANCHOR_SETEVENT:
{
if( !sHRef.isEmpty() )
{
- sHRef = URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), sHRef, Link(), false );
+ sHRef = URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), sHRef, Link<>(), false );
}
else
{
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 5e7abaff8f59..4bfa12171a3f 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -199,7 +199,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
{
aBulletSrc = rOption.GetString();
if( !InternalImgToPrivateURL(aBulletSrc) )
- aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link(), false );
+ aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link<>(), false );
}
break;
case HTML_O_WIDTH:
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 6c1ac2b9fe42..bd03a2eb0282 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -283,11 +283,11 @@ void SwHTMLParser::NewDivision( int nToken )
OUString aURL;
if( nPos == -1 )
{
- aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef, Link(), false);
+ aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef, Link<>(), false);
}
else
{
- aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.copy( 0, nPos ), Link(), false );
+ aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.copy( 0, nPos ), Link<>(), false );
aURL += OUString(sfx2::cTokenSeparator);
if( nPos2 == -1 )
{
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 3ff535072fe2..b43afd5ce6ca 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2974,7 +2974,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
if( !rImageURL.isEmpty() )
{
- pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), rImageURL, Link(), false) );
+ pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), rImageURL, Link<>(), false) );
pBrushItem->SetGraphicPos( GPOS_TILED );
}
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 88cb86c71dc1..fe99845e7474 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1573,7 +1573,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
if( !aURL.isEmpty() )
{
- aBrushItem.SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject( rParser.GetBaseURL()), aURL, Link(), false ) );
+ aBrushItem.SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject( rParser.GetBaseURL()), aURL, Link<>(), false ) );
aBrushItem.SetGraphicPos( eRepeat );
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0c6f9e667aa5..607691ca655f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -606,8 +606,8 @@ void SwHTMLParser::Continue( int nToken )
}
// waehrend des einlesens kein OLE-Modified rufen
- Link aOLELink( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aOLELink( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
bool bModified = pDoc->getIDocumentState().IsModified();
bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index daef1e6c8095..7b03c6449f7b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -259,7 +259,7 @@ OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
// Need the more sophisticated url converter.
if (!aName.isEmpty())
aName = URIHelper::SmartRel2Abs(
- INetURLObject(sBaseURL), aName, Link(), false);
+ INetURLObject(sBaseURL), aName, Link<>(), false);
return aName;
}
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 7026d43d35f2..e3833679e5c1 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -137,7 +137,7 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS )
m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText());
- Link aLk = LINK(this,SwBreakDlg,ClickHdl);
+ Link<> aLk = LINK(this,SwBreakDlg,ClickHdl);
m_pPageBtn->SetClickHdl( aLk );
m_pLineBtn->SetClickHdl( aLk );
m_pColumnBtn->SetClickHdl( aLk );
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9e461fc14622..9511cd2f9043 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -254,7 +254,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
OUString sURL = m_pURLED->GetText();
if(!sURL.isEmpty())
{
- sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
+ sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link<>(), false );
// #i100683# file URLs should be normalized in the UI
if ( sURL.startsWith("file:") )
sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL);
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 691023c23b52..7a053dadc51b 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -562,7 +562,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet)
m_pPict->SetBorderStyle( WindowBorderStyle::MONO );
// Install handler
- Link aLk = LINK(this, SwDropCapsPage, ModifyHdl);
+ Link<> aLk = LINK(this, SwDropCapsPage, ModifyHdl);
m_pDropCapsField->SetModifyHdl( aLk );
m_pLinesField->SetModifyHdl( aLk );
m_pDistanceField->SetModifyHdl( aLk );
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 72f201c365f9..578909554f0b 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -425,7 +425,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
get(m_pOKPB,"ok");
m_pAuthenticationCB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl));
- Link aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
+ Link<> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
m_pSeparateAuthenticationRB->SetClickHdl( aRBLink );
m_pSMTPAfterPOPRB->SetClickHdl( aRBLink );
m_pOKPB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl));
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 9764b8f22cb6..5f0cc8b5222c 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -121,7 +121,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
m_pUseCharUnit->Hide();
}
- Link aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl);
+ Link<> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl);
m_pShowStandardizedPageCount->SetClickHdl(aLink);
}
@@ -523,7 +523,7 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet
m_pLbLevel->SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 );
m_pEdDelim->SetText( sDelim );
- Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl );
+ Link<> aLk = LINK( this, SwCaptionOptPage, ModifyHdl );
m_pCategoryBox->SetModifyHdl( aLk );
m_pNumberingSeparatorED->SetModifyHdl( aLk );
m_pTextEdit->SetModifyHdl( aLk );
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 4b02931e58eb..3186484c52a4 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -341,7 +341,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
get(m_pPaperFromSetupCB, "papertray");
get(m_pFaxLB, "fax");
- Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
+ Link<> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
m_pGrfCB->SetClickHdl( aLk );
m_pRightPageCB->SetClickHdl( aLk );
m_pLeftPageCB->SetClickHdl( aLk );
@@ -609,14 +609,14 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,
pListBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
pLabelBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
pIdxBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl);
+ Link<> aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl);
pStandardBox->SetLoseFocusHdl( aFocusLink );
pTitleBox ->SetLoseFocusHdl( aFocusLink );
pListBox ->SetLoseFocusHdl( aFocusLink );
pLabelBox ->SetLoseFocusHdl( aFocusLink );
pIdxBox ->SetLoseFocusHdl( aFocusLink );
- Link aModifyHeightLink( LINK( this, SwStdFontTabPage, ModifyHeightHdl));
+ Link<> aModifyHeightLink( LINK( this, SwStdFontTabPage, ModifyHeightHdl));
pStandardHeightLB->SetModifyHdl( aModifyHeightLink );
pTitleHeightLB-> SetModifyHdl( aModifyHeightLink );
pListHeightLB-> SetModifyHdl( aModifyHeightLink );
@@ -1147,7 +1147,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte
get(pFixPropRB,"fixprop");
get(pVarRB,"var");
- Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
+ Link<> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
pNumFormattingCB->SetClickHdl(aLnk);
pNumFmtFormattingCB->SetClickHdl(aLnk);
pHeaderCB->SetClickHdl(aLnk);
@@ -1827,7 +1827,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
pDeletedLB->RemoveEntry(4);
pDeletedLB->RemoveEntry(3);
- Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
+ Link<> aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
pInsertLB->SetSelectHdl( aLk );
pDeletedLB->SetSelectHdl( aLk );
pChangedLB->SetSelectHdl( aLk );
@@ -2359,7 +2359,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S
get(m_pLenNF, "ignorelen");
get(m_pStoreRsidCB, "storeRSID");
- Link aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
+ Link<> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
m_pAutoRB->SetClickHdl( aLnk );
m_pWordRB->SetClickHdl( aLnk );
m_pCharRB->SetClickHdl( aLnk );
@@ -2588,7 +2588,7 @@ void SwTestTabPage::Reset( const SfxItemSet* )
void SwTestTabPage::Init()
{
// handler
- Link aLk = LINK( this, SwTestTabPage, AutoClickHdl );
+ Link<> aLk = LINK( this, SwTestTabPage, AutoClickHdl );
m_pTest1CBox->SetClickHdl( aLk );
m_pTest2CBox->SetClickHdl( aLk );
m_pTest3CBox->SetClickHdl( aLk );
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 1d8a63103802..ff9455e8af4f 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -101,7 +101,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits
m_pWindow->Show();
m_pScrollBar->Show();
- Link aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl);
+ Link<> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl);
m_pScrollBar->SetScrollHdl(aScrollLink);
m_pScrollBar->SetEndScrollHdl(aScrollLink);
m_pScrollBar->EnableDrag();
@@ -172,8 +172,8 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData)
long nEDYPos = m_pWindow->LogicToPixel(Size(RSC_SP_CTRL_DESC_Y, RSC_SP_CTRL_DESC_Y), MAP_APPFONT).Height();
long nFTYPos = nEDYPos + nEDHeight - nFTHeight;
- Link aFocusLink = LINK(this, SwAddressControl_Impl, GotFocusHdl_Impl);
- Link aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl);
+ Link<> aFocusLink = LINK(this, SwAddressControl_Impl, GotFocusHdl_Impl);
+ Link<> aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl);
Edit* pLastEdit = 0;
sal_Int32 nVisibleLines = 0;
sal_uIntPtr nLines = 0;
@@ -420,7 +420,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
m_pCustomizePB->SetClickHdl(LINK(this, SwCreateAddressListDialog, CustomizeHdl_Impl));
m_pOK->SetClickHdl(LINK(this, SwCreateAddressListDialog, OkHdl_Impl));
- Link aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl);
+ Link<> aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl);
m_pStartPB->SetClickHdl(aLk);
m_pPrevPB->SetClickHdl(aLk);
m_pSetNoNF->SetModifyHdl(LINK(this, SwCreateAddressListDialog, DBNumCursorHdl_Impl));
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 7ade01841ee4..1eb60f31b841 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -40,11 +40,11 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
get(m_pDownPB, "down");
m_pFieldsLB->SetSelectHdl(LINK(this, SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl));
- Link aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl );
+ Link<> aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl );
m_pAddPB->SetClickHdl(aAddRenameLk);
m_pRenamePB->SetClickHdl(aAddRenameLk);
m_pDeletePB->SetClickHdl(LINK(this, SwCustomizeAddressListDialog, DeleteHdl_Impl ));
- Link aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl);
+ Link<> aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl);
m_pUpPB->SetClickHdl(aUpDownLk);
m_pDownPB->SetClickHdl(aUpDownLk);
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 3a235582c605..341bedef6873 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -302,7 +302,7 @@ short SwMailMergeWizard::Execute()
return RET_CANCEL;
}
-void SwMailMergeWizard::StartExecuteModal( const Link& rEndDialogHdl )
+void SwMailMergeWizard::StartExecuteModal( const Link<>& rEndDialogHdl )
{
::svt::RoadmapWizard::StartExecuteModal( rEndDialogHdl );
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 3c455092c585..152df21a6af9 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -88,7 +88,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP
m_pSettingsWIN->SetSelectHdl(LINK(this, SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl));
m_pHideEmptyParagraphsCB->SetClickHdl(LINK(this, SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl));
- Link aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl);
+ Link<> aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl);
m_pPrevSetIB->SetClickHdl(aLink);
m_pNextSetIB->SetClickHdl(aLink);
}
@@ -340,13 +340,13 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
get(m_pDependentRB, "dependent");
get(m_pCountryED, "country");
- Link aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl);
+ Link<> aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl);
m_pNewPB->SetClickHdl(aCustomizeHdl);
m_pCustomizePB->SetClickHdl(aCustomizeHdl);
m_pDeletePB->SetClickHdl(LINK(this, SwSelectAddressBlockDialog, DeleteHdl_Impl));
- Link aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl);
+ Link<> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl);
m_pNeverRB->SetClickHdl(aLk);
m_pAlwaysRB->SetClickHdl(aLk);
m_pDependentRB->SetClickHdl(aLk);
@@ -558,10 +558,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_pAddressElementsLB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl ));
m_pDragED->SetModifyHdl(LINK(this, SwCustomizeAddressBlockDialog, EditModifyHdl_Impl));
m_pDragED->SetSelectionChangedHdl( LINK( this, SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl));
- Link aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl);
+ Link<> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl);
m_pFieldCB->SetModifyHdl(aFieldsLink);
m_pFieldCB->SetSelectHdl(aFieldsLink);
- Link aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl);
+ Link<> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl);
m_pInsertFieldIB->SetClickHdl(aImgButtonHdl);
m_pRemoveFieldIB->SetClickHdl(aImgButtonHdl);
m_pUpIB->SetClickHdl(aImgButtonHdl);
@@ -816,7 +816,7 @@ class SwAssignFieldsControl : public Control
SwMailMergeConfigItem* m_rConfigItem;
- Link m_aModifyHdl;
+ Link<> m_aModifyHdl;
long m_nLBStartTopPos;
long m_nYOffset;
@@ -836,7 +836,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
void Init(SwMailMergeConfigItem& rConfigItem);
- void SetModifyHdl(const Link& rModifyHdl)
+ void SetModifyHdl(const Link<>& rModifyHdl)
{
m_aModifyHdl = rModifyHdl;
m_aModifyHdl.Call(this);
@@ -897,8 +897,8 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
//each position in this sequence matches the position in the header array rHeaders
//if no assignment is available an empty sequence will be returned
uno::Sequence< OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
- Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
- Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
+ Link<> aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
+ Link<> aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
//fill the controls
long nControlWidth = aOutputSize.Width() / 3;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 2f93a750f1b1..2071361d0d76 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -140,7 +140,7 @@ public:
class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener
{
- Link m_aSelectionLink;
+ Link<> m_aSelectionLink;
VclPtr<SwCustomizeAddressBlockDialog> m_pParentDialog;
using VclMultiLineEdit::Notify;
@@ -160,7 +160,7 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;}
+ void SetSelectionChangedHdl( const Link<>& rLink ) {m_aSelectionLink = rLink;}
void SetText( const OUString& rStr ) SAL_OVERRIDE;
OUString GetAddress();
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 76035a2f3ef2..15c91b1e365e 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -61,14 +61,14 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent)
m_pCurrentDocRB->Check();
DocSelectHdl(m_pNewDocRB);
- Link aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl);
+ Link<> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl);
m_pCurrentDocRB->SetClickHdl(aDocSelectLink);
m_pNewDocRB->SetClickHdl(aDocSelectLink);
m_pLoadDocRB->SetClickHdl(aDocSelectLink);
m_pLoadTemplateRB->SetClickHdl(aDocSelectLink);
m_pRecentDocRB->SetClickHdl(aDocSelectLink);
- Link aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl);
+ Link<> aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl);
m_pBrowseDocPB->SetClickHdl(aFileSelectHdl);
m_pBrowseTemplatePB->SetClickHdl(aFileSelectHdl);
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 171478787c69..36fa922db9b4 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -258,13 +258,13 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent)
m_bIsTabPage = true;
m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl));
- Link aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
+ Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
m_pPersonalizedCB->SetClickHdl(aIndividualLink);
- Link aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
+ Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
m_pFemalePB->SetClickHdl(aGreetingLink);
m_pMalePB->SetClickHdl(aGreetingLink);
m_pAssignPB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, AssignHdl_Impl));
- Link aLBoxLink = LINK(this, SwMailMergeGreetingsPage, GreetingSelectHdl_Impl);
+ Link<> aLBoxLink = LINK(this, SwMailMergeGreetingsPage, GreetingSelectHdl_Impl);
m_pFemaleLB->SetSelectHdl(aLBoxLink);
m_pMaleLB->SetSelectHdl(aLBoxLink);
m_pFemaleColumnLB->SetSelectHdl(aLBoxLink);
@@ -273,7 +273,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent)
m_pNeutralCB->SetSelectHdl(aLBoxLink);
m_pNeutralCB->SetModifyHdl(aLBoxLink);
- Link aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl);
+ Link<> aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl);
m_pPrevSetIB->SetClickHdl(aDataLink);
m_pNextSetIB->SetClickHdl(aDataLink);
@@ -447,9 +447,9 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWi
m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL );
m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl));
- Link aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
+ Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
m_pPersonalizedCB->SetClickHdl(aIndividualLink);
- Link aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
+ Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
m_pFemalePB->SetClickHdl(aGreetingLink);
m_pMalePB->SetClickHdl(aGreetingLink);
m_pOK->SetClickHdl(LINK(this, SwMailBodyDialog, OKHdl));
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index e00f986e5ef0..a0f99e956e59 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -118,7 +118,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( m_sExampleURL, aValues );
- Link aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl));
+ Link<> aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl));
m_pExampleFrame = new SwOneExampleFrame( *m_pExampleContainerWIN,
EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL );
@@ -134,7 +134,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_pZoomLB->SelectEntryPos(0); //page size
m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl));
- Link aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl);
+ Link<> aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl);
m_pLeftMF->SetUpHdl(aFrameHdl);
m_pLeftMF->SetDownHdl(aFrameHdl);
m_pLeftMF->SetLoseFocusHdl(aFrameHdl);
@@ -146,7 +146,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
::SetFieldUnit( *m_pLeftMF, eFieldUnit );
::SetFieldUnit( *m_pTopMF, eFieldUnit );
- Link aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl );
+ Link<> aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl );
m_pUpPB->SetClickHdl(aUpDownHdl);
m_pDownPB->SetClickHdl(aUpDownHdl);
m_pAlignToBodyCB->SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl));
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 5fc51147d4c5..db1b8e6fab00 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -271,7 +271,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage(SwMailMergeWizard* _pParent)
if(!rConfigItem.IsMailAvailable())
m_pSendMailRB->Hide();
- Link aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl);
+ Link<> aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl);
m_pSaveStartDocRB->SetClickHdl(aLink);
m_pSaveMergedDocRB->SetClickHdl(aLink);
m_pPrintRB->SetClickHdl(aLink);
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 28920d03090f..4b7bbfe27794 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -35,7 +35,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)
get(m_pLetterHint, "letterft");
get(m_pMailHint, "emailft");
- Link aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl);
+ Link<> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl);
m_pLetterRB->SetClickHdl(aLink);
m_pMailRB->SetClickHdl(aLink);
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 0c5cf3cc19c5..644ffab4a855 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -48,7 +48,7 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP
get(m_pEditPB, "edit");
m_pEditPB->SetClickHdl( LINK( this, SwMailMergePrepareMergePage, EditDocumentHdl_Impl));
- Link aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl));
+ Link<> aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl));
m_pFirstPB->SetClickHdl( aMoveLink );
m_pPrevPB->SetClickHdl( aMoveLink );
m_pNextPB->SetClickHdl( aMoveLink );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a372be0067d2..28d8bbd25233 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -168,7 +168,7 @@ IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl)
return 0;
}
-void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link& rLink )
+void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<>& rLink )
{
m_aHandler = rLink;
pDlg->SetApplyHandler(LINK(this, AbstractApplyTabDialog_Impl, ApplyHdl));
@@ -598,7 +598,7 @@ AbstractMailMergeWizard_Impl::~AbstractMailMergeWizard_Impl()
pDlg.disposeAndClear();
}
-void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link& rEndDialogHdl )
+void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link<>& rEndDialogHdl )
{
aEndDlgHdl = rEndDialogHdl;
pDlg->StartExecuteModal(
@@ -616,7 +616,7 @@ IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDial
(void) pDialog; // unused in non-debug
aEndDlgHdl.Call( this );
- aEndDlgHdl = Link();
+ aEndDlgHdl = Link<>();
return 0L;
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 8384f03b98c3..7ef801594e14 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -137,8 +137,8 @@ public:
}
DECL_LINK(ApplyHdl, void*);
private:
- Link m_aHandler;
- virtual void SetApplyHdl( const Link& rLink ) SAL_OVERRIDE;
+ Link<> m_aHandler;
+ virtual void SetApplyHdl( const Link<>& rLink ) SAL_OVERRIDE;
};
class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
@@ -350,7 +350,7 @@ class SwMailMergeWizard;
class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard
{
VclPtr<SwMailMergeWizard> pDlg;
- Link aEndDlgHdl;
+ Link<> aEndDlgHdl;
DECL_LINK( EndDialogHdl, SwMailMergeWizard* );
public:
@@ -358,7 +358,7 @@ public:
: pDlg(p)
{}
virtual ~AbstractMailMergeWizard_Impl();
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
virtual long GetResult() SAL_OVERRIDE;
virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 65a40c87b2d9..d72739d5c533 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1874,7 +1874,7 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent,
get(pEndSuffixFT,"endsuffix_label");
get(pEndSuffixED,"endsuffix");
- Link aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl));
+ Link<> aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl));
pFtnNtAtTextEndCB->SetClickHdl( aLk );
pFtnNtNumCB->SetClickHdl( aLk );
pEndNtAtTextEndCB->SetClickHdl( aLk );
@@ -2165,7 +2165,7 @@ SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxIt
get(m_pBeforeMF, "before");
get(m_pAfterMF, "after");
get(m_pPreviewWin, "preview");
- Link aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl);
+ Link<> aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl);
m_pBeforeMF->SetModifyHdl(aLk);
m_pAfterMF->SetModifyHdl(aLk);
}
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 96c7e92e3b09..f549fbf747ab 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -142,7 +142,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
SetMetric(*m_pSizeHeightField, aMetric);
// Install handlers
- Link aLk = LINK(this, SwEnvFmtPage, ModifyHdl);
+ Link<> aLk = LINK(this, SwEnvFmtPage, ModifyHdl);
m_pAddrLeftField->SetUpHdl( aLk );
m_pAddrTopField->SetUpHdl( aLk );
m_pSendLeftField->SetUpHdl( aLk );
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index bfcbb44dc61d..d1d4d27ca74a 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -38,7 +38,7 @@ using namespace ::comphelper;
void SwVisitingCardPage::InitFrameControl()
{
- Link aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl));
+ Link<> aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl));
m_pExampleWIN->Show();
pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN,
EX_SHOW_BUSINESS_CARDS, &aLink );
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 4a73392b0166..cba7b7082166 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -321,7 +321,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
SetMetric(*m_pPHeightField, aMetric);
// Install handlers
- Link aLk = LINK(this, SwLabFmtPage, ModifyHdl);
+ Link<> aLk = LINK(this, SwLabFmtPage, ModifyHdl);
m_pHDistField->SetModifyHdl( aLk );
m_pVDistField->SetModifyHdl( aLk );
m_pWidthField->SetModifyHdl( aLk );
@@ -606,7 +606,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec)
get(m_pOKPB, "ok");
m_pOKPB->SetClickHdl(LINK(this, SwSaveLabelDlg, OkHdl));
- Link aLk(LINK(this, SwSaveLabelDlg, ModifyHdl));
+ Link<> aLk(LINK(this, SwSaveLabelDlg, ModifyHdl));
m_pMakeCB->SetModifyHdl(aLk);
m_pTypeED->SetModifyHdl(aLk);
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 9443dfcb9622..ae5970d4f4f6 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -45,7 +45,7 @@ SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
SetExchangeSupport();
// Install handlers
- Link aLk = LINK(this, SwLabPrtPage, CountHdl);
+ Link<> aLk = LINK(this, SwLabPrtPage, CountHdl);
m_pPageButton->SetClickHdl( aLk );
m_pSingleButton->SetClickHdl( aLk );
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 25397c3f66ef..ff483c39a3c4 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -264,7 +264,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
m_pAllRB->Check(true);
// Install handlers
- Link aLk = LINK(this, SwMailMergeDlg, ButtonHdl);
+ Link<> aLk = LINK(this, SwMailMergeDlg, ButtonHdl);
m_pOkBTN->SetClickHdl(aLk);
m_pPathPB->SetClickHdl(LINK(this, SwMailMergeDlg, InsertPathHdl));
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 12ebb825233a..f7deb4c63f95 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -44,7 +44,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
get(m_pNextPB, "next");
get(m_pEditPB, "edit");
- Link aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl);
+ Link<> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl);
m_pEditPB->SetClickHdl(aButtonLk);
if( bNextButton )
{
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index b94c049dd59f..3f4c1d9f48bb 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -75,7 +75,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
m_pUsedDBTLB->SetSpaceBetweenEntries(0);
m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND));
- Link aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
+ Link<> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
m_pUsedDBTLB->SetSelectHdl(aLink);
m_pUsedDBTLB->SetDeselectHdl(aLink);
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index bb18eb27fe82..c8328c445b03 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -52,7 +52,7 @@ class SwFldDBPage : public SwFldPage
OUString m_sOldColumnName;
sal_uLong m_nOldFormat;
sal_uInt16 m_nOldSubType;
- Link m_aOldNumSelectHdl;
+ Link<> m_aOldNumSelectHdl;
DECL_LINK( TypeHdl, ListBox* );
DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0);
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f8dc98f74e6a..c7d3761069c2 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
}
}
}
- m_pSelectionLB->SetSelectHdl(Link());
+ m_pSelectionLB->SetSelectHdl(Link<>());
}
else
{
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index f079e8787d90..967ce6d8a7b5 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -168,13 +168,13 @@ void SwFldFuncPage::Reset(const SfxItemSet* )
m_pSelectionLB->SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl));
m_pFormatLB->SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
m_pMacroBT->SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl));
- Link aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl));
+ Link<> aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl));
m_pListAddPB->SetClickHdl(aListModifyLk);
m_pListRemovePB->SetClickHdl(aListModifyLk);
m_pListUpPB->SetClickHdl(aListModifyLk);
m_pListDownPB->SetClickHdl(aListModifyLk);
m_pListItemED->SetReturnActionLink(aListModifyLk);
- Link aListEnableLk = LINK(this, SwFldFuncPage, ListEnableHdl);
+ Link<> aListEnableLk = LINK(this, SwFldFuncPage, ListEnableHdl);
m_pListItemED->SetModifyHdl(aListEnableLk);
m_pListItemsLB->SetSelectHdl(aListEnableLk);
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index ac5e749bf732..2b073110aa7d 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -64,7 +64,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
m_pNextBtn->SetClickHdl( LINK( this, SwJavaEditDialog, NextHdl ) );
m_pOKBtn->SetClickHdl( LINK( this, SwJavaEditDialog, OKHdl ) );
- Link aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
+ Link<> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
m_pUrlRB->SetClickHdl(aLk);
m_pEditRB->SetClickHdl(aLk);
m_pUrlPB->SetClickHdl(LINK(this, SwJavaEditDialog, InsertFileHdl));
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 0d645d34da9d..c4b915af4190 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -476,9 +476,9 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
m_pDefaultVS->SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
- Link aCLNrLk = LINK(this, SwColumnPage, ColModify);
+ Link<> aCLNrLk = LINK(this, SwColumnPage, ColModify);
m_pCLNrEdt->SetModifyHdl(aCLNrLk);
- Link aLk = LINK(this, SwColumnPage, GapModify);
+ Link<> aLk = LINK(this, SwColumnPage, GapModify);
aDistEd1.SetModifyHdl(aLk);
aDistEd2.SetModifyHdl(aLk);
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index b43f86fa9a07..374265889c87 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -130,7 +130,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
xNameAccess = xObjs->getEmbeddedObjects();
}
- Link aLk = LINK( this, SwCaptionDialog, ModifyHdl );
+ Link<> aLk = LINK( this, SwCaptionDialog, ModifyHdl );
m_pCategoryBox->SetModifyHdl( aLk );
m_pTextEdit->SetModifyHdl( aLk );
m_pNumberingSeparatorED->SetModifyHdl ( aLk );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 5fa3585fad84..f8a8a500a8d0 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -676,7 +676,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet)
SetExchangeSupport();
- Link aLk = LINK(this, SwFrmPage, RangeModifyHdl);
+ Link<> aLk = LINK(this, SwFrmPage, RangeModifyHdl);
m_aWidthED.SetLoseFocusHdl( aLk );
m_aHeightED.SetLoseFocusHdl( aLk );
m_pAtHorzPosED->SetLoseFocusHdl( aLk );
@@ -3063,7 +3063,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
}
else
pNextLB->SelectEntryPos(0);
- Link aLink(LINK(this, SwFrmAddPage, ChainModifyHdl));
+ Link<> aLink(LINK(this, SwFrmAddPage, ChainModifyHdl));
pPrevLB->SetSelectHdl(aLink);
pNextLB->SetSelectHdl(aLink);
}
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 49cba0337bcf..df2a7378ddaa 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -95,7 +95,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet)
SetExchangeSupport();
- Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
+ Link<> aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
m_pLeftMarginED->SetUpHdl(aLk);
m_pLeftMarginED->SetDownHdl(aLk);
m_pLeftMarginED->SetFirstHdl(aLk);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 8e8f90cc24ee..fefe6b925a25 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -495,7 +495,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
}
else
{
- Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl));
+ Link<> aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl));
pExampleFrame = new SwOneExampleFrame(
*m_pExampleContainerWIN, EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate);
@@ -874,7 +874,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl));
- Link aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
+ Link<> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
m_pAddStylesCB->SetClickHdl(aLk);
m_pFromHeadingsCB->SetClickHdl(aLk);
m_pTOXMarksCB->SetClickHdl(aLk);
@@ -885,7 +885,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
m_pInitialCapsCB->SetClickHdl(aLk);
m_pKeyAsEntryCB->SetClickHdl(aLk);
- Link aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
+ Link<> aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
m_pTitleED->SetModifyHdl(aModifyLk);
m_pLevelNF->SetModifyHdl(aModifyLk);
m_pSortAlgorithmLB->SetSelectHdl(aModifyLk);
@@ -1526,7 +1526,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
class SwTOXEdit : public Edit
{
SwFormToken aFormToken;
- Link aPrevNextControlLink;
+ Link<> aPrevNextControlLink;
bool bNextControl;
VclPtr<SwTokenWindow> m_pParent;
public:
@@ -1545,7 +1545,7 @@ public:
virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
bool IsNextControl() const {return bNextControl;}
- void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;}
+ void SetPrevNextLink( const Link<>& rLink ) {aPrevNextControlLink = rLink;}
const SwFormToken& GetFormToken()
{
@@ -1613,7 +1613,7 @@ void SwTOXEdit::AdjustSize()
class SwTOXButton : public PushButton
{
SwFormToken aFormToken;
- Link aPrevNextControlLink;
+ Link<> aPrevNextControlLink;
bool bNextControl;
VclPtr<SwTokenWindow> m_pParent;
public:
@@ -1632,7 +1632,7 @@ public:
virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
bool IsNextControl() const {return bNextControl;}
- void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;}
+ void SetPrevNextLink(const Link<>& rLink) {aPrevNextControlLink = rLink;}
const SwFormToken& GetFormToken() const {return aFormToken;}
void SetCharStyleName(const OUString& rSet, sal_uInt16 nPoolId)
@@ -2135,8 +2135,8 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
else
m_pLevelFT->SetText(sLevelStr);
- Link aLink = m_pLevelLB->GetSelectHdl();
- m_pLevelLB->SetSelectHdl(Link());
+ Link<> aLink = m_pLevelLB->GetSelectHdl();
+ m_pLevelLB->SetSelectHdl(Link<>());
m_pLevelLB->Select( m_pLevelLB->GetEntry( bToxIsIndex ? 1 : 0 ) );
m_pLevelLB->SetSelectHdl(aLink);
@@ -2731,7 +2731,7 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
sAdditionalAccnameString2 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING2);
sAdditionalAccnameString3 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING3);
- Link aLink(LINK(this, SwTokenWindow, ScrollHdl));
+ Link<> aLink(LINK(this, SwTokenWindow, ScrollHdl));
m_pLeftScrollWin->SetClickHdl(aLink);
m_pRightScrollWin->SetClickHdl(aLink);
}
@@ -2768,8 +2768,8 @@ void SwTokenWindow::dispose()
for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
{
VclPtr<Control> pControl = (*it);
- pControl->SetGetFocusHdl( Link() );
- pControl->SetLoseFocusHdl( Link() );
+ pControl->SetGetFocusHdl( Link<>() );
+ pControl->SetLoseFocusHdl( Link<>() );
pControl.disposeAndClear();
}
aControlList.clear();
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 5d31733e90ca..9fb0662c407b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -992,7 +992,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog
VclPtr<OKButton> m_pOKBT;
- Link aShortNameCheckLink;
+ Link<> aShortNameCheckLink;
SwWrtShell& rWrtSh;
@@ -1014,7 +1014,7 @@ public:
OUString GetEntryText(ToxAuthorityField eField) const;
- void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;}
+ void SetCheckNameHdl(const Link<>& rLink) {aShortNameCheckLink = rLink;}
};
@@ -1347,7 +1347,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit)
{
- Link aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl);
+ Link<> aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl);
long nResult = aAllowed.Call(pEdit);
m_pActionBT->Enable(nResult > 0);
if(nResult)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index b1413b3d60e1..46132d095073 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -1072,7 +1072,7 @@ void SwGlossaryDlg::ShowPreview()
//create example
if (!pExampleFrame)
{
- Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl));
+ Link<> aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl));
pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN,
EX_SHOW_ONLINE_LAYOUT, &aLink );
}
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 86f38ed7a559..0cd2f805018c 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -116,7 +116,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent,
m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() );
m_pAlign2FT->SetText( m_pAlignFT->GetText() );
- Link aLk = LINK(this, SwNumPositionTabPage, DistanceHdl);
+ Link<> aLk = LINK(this, SwNumPositionTabPage, DistanceHdl);
m_pDistBorderMF->SetUpHdl(aLk);
m_pDistNumMF->SetUpHdl(aLk);
m_pIndentMF->SetUpHdl(aLk);
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 43a013598177..6a2b42a12f58 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -187,7 +187,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
}
m_pMaxHeightPageBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightPage));
m_pMaxHeightBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightMetric));
- Link aLk = LINK(this, SwFootNotePage, HeightModify);
+ Link<> aLk = LINK(this, SwFootNotePage, HeightModify);
m_pMaxHeightEdit->SetLoseFocusHdl( aLk );
m_pDistEdit->SetLoseFocusHdl( aLk );
m_pLineDistEdit->SetLoseFocusHdl( aLk );
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 100a2c4d8d67..f725eba0734d 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -76,7 +76,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
get(m_pPrintCB,"checkCB_PRINT");
get(m_pColorLB,"listLB_COLOR");
- Link aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl);
+ Link<> aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl);
m_pCharsPerLineNF->SetUpHdl(aLink);
m_pCharsPerLineNF->SetDownHdl(aLink);
m_pCharsPerLineNF->SetLoseFocusHdl(aLink);
@@ -84,7 +84,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
m_pLinesPerPageNF->SetDownHdl(aLink);
m_pLinesPerPageNF->SetLoseFocusHdl(aLink);
- Link aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl);
+ Link<> aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl);
m_pTextSizeMF->SetUpHdl(aSizeLink);
m_pTextSizeMF->SetDownHdl(aSizeLink);
m_pTextSizeMF->SetLoseFocusHdl(aSizeLink);
@@ -95,12 +95,12 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
m_pCharWidthMF->SetDownHdl(aSizeLink);
m_pCharWidthMF->SetLoseFocusHdl(aSizeLink);
- Link aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl);
+ Link<> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl);
m_pNoGridRB->SetClickHdl(aGridTypeHdl);
m_pLinesGridRB->SetClickHdl(aGridTypeHdl);
m_pCharsGridRB->SetClickHdl(aGridTypeHdl);
- Link aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl);
+ Link<> aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl);
m_pColorLB->SetSelectHdl(aModifyLk);
m_pPrintCB->SetClickHdl(aModifyLk);
m_pRubyBelowCB->SetClickHdl(aModifyLk);
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 3856070dbf63..1fd265201f01 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -178,7 +178,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
}
// initialise
- Link aLk = LINK(this,SwSortDlg, CheckHdl);
+ Link<> aLk = LINK(this,SwSortDlg, CheckHdl);
m_pKeyCB1->SetClickHdl( aLk );
m_pKeyCB2->SetClickHdl( aLk );
m_pKeyCB3->SetClickHdl( aLk );
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 5f888f3f7497..ecf49356c47c 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -216,7 +216,7 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) :
m_pDocumentStartRB->Check();
m_pPageStartNF->Enable(false);
m_pPageStartNF->SetValue(lcl_GetCurrentPage(mpSh));
- Link aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl);
+ Link<> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl);
m_pDocumentStartRB->SetClickHdl(aStartPageHdl);
m_pPageStartRB->SetClickHdl(aStartPageHdl);
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 63fb7aa83277..20e3cb9b28f0 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -147,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
}
mpKeepColumn->SaveValue();
- Link aLk( LINK(this, SwConvertTableDlg, BtnHdl) );
+ Link<> aLk( LINK(this, SwConvertTableDlg, BtnHdl) );
mpTabBtn->SetClickHdl( aLk );
mpSemiBtn->SetClickHdl( aLk );
mpParaBtn->SetClickHdl( aLk );
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 00ee90230378..9d60ec655343 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -137,7 +137,7 @@ void SwFormatTablePage::Init()
m_aRightMF.SetMetricFieldMin(-999999);
//handler
- Link aLk = LINK( this, SwFormatTablePage, AutoClickHdl );
+ Link<> aLk = LINK( this, SwFormatTablePage, AutoClickHdl );
m_pFullBtn->SetClickHdl( aLk );
m_pFreeBtn->SetClickHdl( aLk );
m_pLeftBtn->SetClickHdl( aLk );
@@ -845,9 +845,9 @@ void SwTableColumnPage::Reset( const SfxItemSet* )
void SwTableColumnPage::Init(bool bWeb)
{
FieldUnit aMetric = ::GetDfltMetric(bWeb);
- Link aLkUp = LINK( this, SwTableColumnPage, UpHdl );
- Link aLkDown = LINK( this, SwTableColumnPage, DownHdl );
- Link aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl );
+ Link<> aLkUp = LINK( this, SwTableColumnPage, UpHdl );
+ Link<> aLkDown = LINK( this, SwTableColumnPage, DownHdl );
+ Link<> aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl );
for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
{
aValueTbl[i] = i;
@@ -858,7 +858,7 @@ void SwTableColumnPage::Init(bool bWeb)
}
SetMetric(*m_pSpaceED, aMetric);
- Link aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
+ Link<> aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
m_pUpBtn->SetClickHdl( aLk );
m_pDownBtn->SetClickHdl( aLk );
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 5ff495ddafe8..9e1500a926df 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -209,7 +209,7 @@ void SwAutoFormatDlg::dispose()
void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
{
- Link aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) );
+ Link<> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) );
m_pBtnBorder->SetClickHdl( aLk );
m_pBtnFont->SetClickHdl( aLk );
m_pBtnPattern->SetClickHdl( aLk );
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 495412f51b25..d85c98de3bc8 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -460,8 +460,8 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
// (for OLE; after Statement from MM)
bool bIsModified = m_pDoc->getIDocumentState().IsModified();
m_pDoc->GetIDocumentUndoRedo().LockUndoNoModifiedPosition();
- Link aOldOLELnk( m_pDoc->GetOle2Link() );
- m_pDoc->SetOle2Link( Link() );
+ Link<> aOldOLELnk( m_pDoc->GetOle2Link() );
+ m_pDoc->SetOle2Link( Link<>() );
// Suppress SfxProgress when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 7537d0e0d48c..c6fd4d17f3a8 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -460,7 +460,7 @@ void SwDocShell::RemoveLink()
m_xBasePool.clear();
}
sal_Int8 nRefCt = static_cast< sal_Int8 >(m_pDoc->release());
- m_pDoc->SetOle2Link(Link());
+ m_pDoc->SetOle2Link(Link<>());
m_pDoc->SetDocShell( 0 );
if( !nRefCt )
delete m_pDoc;
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index c5d4bd1e2e28..8a635706d20a 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -509,7 +509,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
pContainer->CopyString( SotClipboardFormatId::STRING, sDBName );
pContainer->StartDrag( this, DND_ACTION_COPY | DND_ACTION_LINK,
- Link() );
+ Link<>() );
}
}
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index 8e44685b868f..bb5aadf78863 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -127,7 +127,7 @@ void CancelableDialog::dispose()
Dialog::dispose();
}
-void CancelableDialog::SetCancelHdl( const Link& rLink )
+void CancelableDialog::SetCancelHdl( const Link<>& rLink )
{
m_pCancelButton->SetClickHdl( rLink );
}
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index aa8e2c95beea..242ed2e1a0a7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1694,8 +1694,8 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
if( pStream && pRead )
{
- Link aOldLink( rSh.GetChgLnk() );
- rSh.SetChgLnk( Link() );
+ Link<> aOldLink( rSh.GetChgLnk() );
+ rSh.SetChgLnk( Link<>() );
const SwPosition& rInsPos = *rSh.GetCrsr()->Start();
SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
@@ -2303,7 +2303,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
SwTransferable::_CheckForURLOrLNKFile( rData, sTxt, &sDesc );
aBkmk = INetBookmark(
- URIHelper::SmartRel2Abs(INetURLObject(), sTxt, Link(), false ),
+ URIHelper::SmartRel2Abs(INetURLObject(), sTxt, Link<>(), false ),
sDesc );
bCheckForGrf = true;
bCheckForImageMap = SW_PASTESDR_REPLACE == nAction;
@@ -2573,7 +2573,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
//Own FileFormat? --> insert, not for StarWriter/Web
- OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false );
+ OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link<>(), false );
const SfxFilter* pFlt = SW_PASTESDR_SETATTR == nAction
? 0 : SwIoSystem::GetFileFilter(sFileURL);
if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
@@ -3768,8 +3768,8 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise )
::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
// #i58448#
- Link aSavedOle2Link( pDoc->GetOle2Link() );
- pDoc->SetOle2Link( Link() );
+ Link<> aSavedOle2Link( pDoc->GetOle2Link() );
+ pDoc->SetOle2Link( Link<>() );
bool bIsModified = pDoc->getIDocumentState().IsModified();
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 2ea841068127..a2df960c99a0 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -94,7 +94,7 @@ void SwAnnotationWin::SetPostItText()
ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection());
// get text from SwPostItField and insert into our textview
- Engine()->SetModifyHdl( Link() );
+ Engine()->SetModifyHdl( Link<>() );
Engine()->EnableUndo( false );
if( mpFld->GetTextObject() )
Engine()->SetText( *mpFld->GetTextObject() );
@@ -261,7 +261,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
GetOutlinerView()->SetAttribs(DefaultItem());
// lets insert an undo step so the initial text can be easily deleted
// but do not use UpdateData() directly, would set modified state again and reentrance into Mgr
- Engine()->SetModifyHdl( Link() );
+ Engine()->SetModifyHdl( Link<>() );
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
boost::scoped_ptr<SwField> pOldField;
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index e43bb81fe90c..96ccdfef97b6 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -348,7 +348,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
GetTextView() &&
GetTextView()->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel(), true ))
{
- Link aLink = LINK(this, SidebarTxtControl, OnlineSpellCallback);
+ Link<> aLink = LINK(this, SidebarTxtControl, OnlineSpellCallback);
GetTextView()->ExecuteSpellPopup(rCEvt.GetMousePosPixel(),&aLink);
}
else
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 42d31065aec8..75f6097e9c59 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -79,7 +79,7 @@ SidebarTextEditSource::~SidebarTextEditSource()
{
if ( mrSidebarTxtControl.GetTextView() )
{
- mrSidebarTxtControl.GetTextView()->GetOutliner()->SetNotifyHdl( Link() );
+ mrSidebarTxtControl.GetTextView()->GetOutliner()->SetNotifyHdl( Link<>() );
}
}
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index ff2869c0450f..db20ee70bcef 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -921,8 +921,8 @@ void SwSidebarWin::SetReadonly(bool bSet)
void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem)
{
- Link pLink = Engine()->GetModifyHdl();
- Engine()->SetModifyHdl( Link() );
+ Link<> pLink = Engine()->GetModifyHdl();
+ Engine()->SetModifyHdl( Link<>() );
ESelection aOld = GetOutlinerView()->GetSelection();
ESelection aNewSelection( 0, 0, Engine()->GetParagraphCount()-1, EE_TEXTPOS_ALL );
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 2c85b7e514e8..a4d51ae14ceb 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -352,7 +352,7 @@ OUString SwReadOnlyPopup::SaveGraphic( sal_uInt16 nId )
{
if ( !aBrushItem.GetGraphicLink().isEmpty() )
sGrfName = aBrushItem.GetGraphicLink();
- aBrushItem.SetDoneLink( Link() );
+ aBrushItem.SetDoneLink( Link<>() );
const Graphic *pGrf = aBrushItem.GetGraphic();
if ( pGrf )
{
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 6be1c310a92a..361e5a743c3c 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -25,7 +25,7 @@
// numerical input
class SW_DLLPUBLIC NumEditAction: public NumericField
{
- Link aActionLink;
+ Link<> aActionLink;
protected:
void Action();
@@ -34,14 +34,14 @@ public:
NumEditAction( vcl::Window* pParent, const ResId& rResId ) :
NumericField(pParent, rResId) {}
- void SetActionHdl( const Link& rLink ) { aActionLink = rLink;}
- const Link& GetActionHdl() const { return aActionLink; }
+ void SetActionHdl( const Link<>& rLink ) { aActionLink = rLink;}
+ const Link<>& GetActionHdl() const { return aActionLink; }
};
// call a link when KEY_RETURN is pressed
class SW_DLLPUBLIC ReturnActionEdit : public Edit
{
- Link aReturnActionLink;
+ Link<> aReturnActionLink;
public:
ReturnActionEdit(vcl::Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle)
@@ -49,7 +49,7 @@ public:
}
virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE;
- void SetReturnActionLink(const Link& rLink)
+ void SetReturnActionLink(const Link<>& rLink)
{ aReturnActionLink = rLink;}
};
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 260a7fcc96e1..837c2f7019ab 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -123,7 +123,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
SwInsDBColumns aDBColumns;
const SwDBData aDBData;
- Link aOldNumFmtLnk;
+ Link<> aOldNumFmtLnk;
OUString sNoTmpl;
SwView* pView;
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 879da6302939..8f5c7fe6120d 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -42,7 +42,7 @@ public:
virtual ~CancelableDialog();
virtual void dispose() SAL_OVERRIDE;
- void SetCancelHdl( const Link& rLink );
+ void SetCancelHdl( const Link<>& rLink );
void Show();
};
diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx
index 0649254bf2cf..8d0eec4ff2b8 100644
--- a/sw/source/uibase/inc/docfnote.hxx
+++ b/sw/source/uibase/inc/docfnote.hxx
@@ -26,7 +26,7 @@ class SwWrtShell;
class SwFootNoteOptionDlg :public SfxTabDialog
{
SwWrtShell &rSh;
- Link aOldOkHdl;
+ Link<> aOldOkHdl;
sal_uInt16 m_nFootNoteId;
sal_uInt16 m_nEndNoteId;
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 6d7be0611eaa..d2f035c6eec4 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -31,7 +31,7 @@ private:
SwView* pView;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
- Link aOldLnk;
+ Link<> aOldLnk;
sal_uInt16 nPageCount; // page count for progress view
sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index e13634dc04a7..3d17a815dc4d 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -62,7 +62,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
{
VclPtr<ScrollBar> aVScrollBar;
SwAddressPreview_Impl* pImpl;
- Link m_aSelectHdl;
+ Link<> m_aSelectHdl;
void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected);
@@ -111,7 +111,7 @@ public:
SwMailMergeConfigItem& rConfigItem,
const ::com::sun::star::uno::Sequence< OUString>* pAssignments = 0);
- void SetSelectHdl (const Link& rLink) {m_aSelectHdl = rLink;}
+ void SetSelectHdl (const Link<>& rLink) {m_aSelectHdl = rLink;}
};
// iterate over an address block or a greeting line the iterator returns the
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 6bcfb25aebb7..78449ae283af 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -90,7 +90,7 @@ public:
void updateRoadmapItemLabel( WizardState _nState );
virtual short Execute() SAL_OVERRIDE;
- virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+ virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index 0dbbb48bf9bf..dfff3adc1c10 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.hxx
@@ -26,8 +26,8 @@ class SwNavigationPI;
class SwHelpToolBox: public ToolBox, public DropTargetHelper
{
- Link aDoubleClickLink;
- Link aRightClickLink; // link gets mouse event as parameter !!!
+ Link<> aDoubleClickLink;
+ Link<> aRightClickLink; // link gets mouse event as parameter !!!
using ToolBox::DoubleClick;
@@ -39,15 +39,15 @@ protected:
public:
SwHelpToolBox(SwNavigationPI* pParent, const ResId &);
virtual ~SwHelpToolBox();
- void SetDoubleClickLink(const Link &); // inline
- void SetRightClickLink(const Link &); // inline
+ void SetDoubleClickLink(const Link<> &); // inline
+ void SetRightClickLink(const Link<> &); // inline
};
-inline void SwHelpToolBox::SetDoubleClickLink(const Link &rLink) {
+inline void SwHelpToolBox::SetDoubleClickLink(const Link<> &rLink) {
aDoubleClickLink = rLink;
}
-inline void SwHelpToolBox::SetRightClickLink(const Link &rLink) {
+inline void SwHelpToolBox::SetRightClickLink(const Link<> &rLink) {
aRightClickLink = rLink;
}
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index 314b0b624060..b18bbdce2a09 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -48,10 +48,10 @@ public:
void set(MetricField *pField);
const MetricField* get() const { return m_pField; }
MetricField* get() { return m_pField; }
- void SetUpHdl(const Link& rLink) { m_pField->SetUpHdl(rLink); }
- void SetDownHdl(const Link& rLink) { m_pField->SetDownHdl(rLink); }
- void SetModifyHdl(const Link& rLink) { m_pField->SetModifyHdl(rLink); }
- void SetLoseFocusHdl(const Link& rLink) { m_pField->SetLoseFocusHdl(rLink); }
+ void SetUpHdl(const Link<>& rLink) { m_pField->SetUpHdl(rLink); }
+ void SetDownHdl(const Link<>& rLink) { m_pField->SetDownHdl(rLink); }
+ void SetModifyHdl(const Link<>& rLink) { m_pField->SetModifyHdl(rLink); }
+ void SetLoseFocusHdl(const Link<>& rLink) { m_pField->SetLoseFocusHdl(rLink); }
void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); }
void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); }
void Disable(bool bChild = true) { m_pField->Disable(bChild); }
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 69121137d3e5..7fb471182a7d 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -84,8 +84,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
OUString sAutoFormat;
VclPtr<SvxTPView> pTPView;
VclPtr<SvxRedlinTable> pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
- Link aOldSelectHdl;
- Link aOldDeselectHdl;
+ Link<> aOldSelectHdl;
+ Link<> aOldDeselectHdl;
bool bOnlyFormatedRedlines;
bool bHasReadonlySel;
bool bRedlnAutoFmt;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index a4af88ff19b1..2f4da99cf181 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -258,9 +258,9 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer
OUString aButtonTexts[TOKEN_END]; // Text of the buttons
OUString aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons
OUString sCharStyle;
- Link aButtonSelectedHdl;
+ Link<> aButtonSelectedHdl;
VclPtr<Control> pActiveCtrl;
- Link aModifyHdl;
+ Link<> aModifyHdl;
OUString accessibleName;
OUString sAdditionalAccnameString1;
OUString sAdditionalAccnameString2;
@@ -298,10 +298,10 @@ public:
OUString GetPattern() const;
- void SetButtonSelectedHdl(const Link& rLink)
+ void SetButtonSelectedHdl(const Link<>& rLink)
{ aButtonSelectedHdl = rLink;}
- void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;}
+ void SetModifyHdl(const Link<>& rLink){aModifyHdl = rLink;}
Control* GetActiveControl()
{ return pActiveCtrl;}
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 655c7d35fab0..98d754b1cb2d 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -166,7 +166,7 @@ public:
return m_bEditingPositionSet;
}
- void StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl );
+ void StartDocumentInserter( const OUString& rFactory, const Link<>& rEndDialogHdl );
SfxMedium* CreateMedium();
void InitRequest( const SfxRequest& rRequest );
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index d4cd7078b685..36ffb80ba680 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -75,7 +75,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
VclPtr<SwFrmCtrlWindow> aTopWindow;
Idle aLoadedIdle;
- Link aInitializedLink;
+ Link<> aInitializedLink;
MenuResource aMenuRes;
OUString sArgumentURL;
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
public:
SwOneExampleFrame(vcl::Window& rWin,
sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT,
- const Link* pInitalizedLink = 0,
+ const Link<>* pInitalizedLink = 0,
const OUString* pURL = 0);
~SwOneExampleFrame();
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 7880165f7371..210277882e01 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -160,7 +160,7 @@ public:
void Invalidate();
// select table cells for editing of formulas in the ribbonbar
- inline void SelTblCells( const Link &rLink, bool bMark = true );
+ inline void SelTblCells( const Link<> &rLink, bool bMark = true );
inline void EndSelTblCells();
// leave per word or per line selection mode. Is usually called in MB-Up.
@@ -420,7 +420,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
// call into the dark Basic/JavaScript
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
bool bCheckPtr = false, SbxArray* pArgs = 0,
- const Link* pCallBack = 0 );
+ const Link<>* pCallBack = 0 );
// a click at the given field. the cursor is on it.
// execute the predefined actions.
@@ -561,7 +561,7 @@ private:
bool m_bRetainSelection :1; // Do not remove selections
Point m_aStart;
- Link m_aSelTblLink;
+ Link<> m_aSelTblLink;
// resets the cursor stack after movement by PageUp/-Down
SAL_DLLPRIVATE void _ResetCursorStack();
@@ -616,7 +616,7 @@ inline void SwWrtShell::ResetCursorStack()
_ResetCursorStack();
}
-inline void SwWrtShell::SelTblCells(const Link &rLink, bool bMark )
+inline void SwWrtShell::SelTblCells(const Link<> &rLink, bool bMark )
{
SetSelTblCells( true );
m_bClearMark = bMark;
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index ed6208ca7c06..9bae5285d1d7 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -182,7 +182,7 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow()
if(pView && !pView->GetDocShell()->IsReadOnly() &&
!pView->GetWrtShell().HasReadonlySel() )
{
- Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
+ Link<> aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
pPopup = new PopupMenu;
SwGlossaryList* pGlossaryList = ::GetGlossaryList();
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 5e724117f2d2..1a199517b7d0 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1927,9 +1927,9 @@ SwBaseShell::~SwBaseShell()
if( rView.GetCurShell() == this )
rView.ResetSubShell();
- Link aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
+ Link<> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
if( aTmp == rView.GetWrtShell().GetGrfArrivedLnk() )
- rView.GetWrtShell().SetGrfArrivedLnk( Link() );
+ rView.GetWrtShell().SetGrfArrivedLnk( Link<>() );
}
void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 66ff08c66ec5..c53f78670309 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -94,7 +94,7 @@ PageMarginControl::PageMarginControl(
SelectValueSetItem();
SetFieldUnit( *maLeftMarginEdit.get(), eFUnit );
- Link aLinkLR = LINK( this, PageMarginControl, ModifyLRMarginHdl );
+ Link<> aLinkLR = LINK( this, PageMarginControl, ModifyLRMarginHdl );
maLeftMarginEdit->SetModifyHdl( aLinkLR );
SetMetricValue( *maLeftMarginEdit.get(), mnPageLeftMargin, meUnit );
@@ -102,7 +102,7 @@ PageMarginControl::PageMarginControl(
maRightMarginEdit->SetModifyHdl( aLinkLR );
SetMetricValue( *maRightMarginEdit.get(), mnPageRightMargin, meUnit );
- Link aLinkUL = LINK( this, PageMarginControl, ModifyULMarginHdl );
+ Link<> aLinkUL = LINK( this, PageMarginControl, ModifyULMarginHdl );
SetFieldUnit( *maTopMarginEdit.get(), eFUnit );
maTopMarginEdit->SetModifyHdl( aLinkUL );
SetMetricValue( *maTopMarginEdit.get(), mnPageTopMargin, meUnit );
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 8dede92c9980..3bc07bbbdaf4 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -48,7 +48,7 @@ PageOrientationControl::PageOrientationControl(
SW_RES(STR_LANDSCAPE), 0 );
}
- Link aLink = LINK(this, PageOrientationControl,ImplOrientationHdl );
+ Link<> aLink = LINK(this, PageOrientationControl,ImplOrientationHdl );
mpOrientationValueSet->SetSelectHdl(aLink);
mpOrientationValueSet->SetNoSelection();
mpOrientationValueSet->StartSelection();
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 89ac394d3443..a4b11c9ae026 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -237,7 +237,7 @@ void PagePropertyPanel::Initialize()
{
// popup for page orientation
const sal_uInt16 nIdOrientation = mpToolBoxOrientation->GetItemId(UNO_ORIENTATION);
- Link aLink = LINK( this, PagePropertyPanel, ClickOrientationHdl );
+ Link<> aLink = LINK( this, PagePropertyPanel, ClickOrientationHdl );
mpToolBoxOrientation->SetDropdownClickHdl( aLink );
mpToolBoxOrientation->SetSelectHdl( aLink );
mpToolBoxOrientation->SetItemImage( nIdOrientation, mImgPortrait);
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 2dfe37c4b8c6..78369ee77f29 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -113,7 +113,7 @@ void WrapPropertyPanel::dispose()
void WrapPropertyPanel::Initialize()
{
- Link aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl);
+ Link<> aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl);
mpRBNoWrap->SetClickHdl(aLink);
mpRBWrapLeft->SetClickHdl(aLink);
mpRBWrapRight->SetClickHdl(aLink);
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 93853c2f41a7..3ede0e371744 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -238,7 +238,7 @@ void SwView_Impl::AddTransferable(SwTransferable& rTransferable)
rTransferable.m_refCount--;
}
-void SwView_Impl::StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl )
+void SwView_Impl::StartDocumentInserter( const OUString& rFactory, const Link<>& rEndDialogHdl )
{
delete m_pDocInserter;
m_pDocInserter = new ::sfx2::DocumentInserter( rFactory );
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index add57844f094..51e037600da4 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -736,7 +736,7 @@ bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
if (pOLV->IsWrongSpelledWordAtPos( aPos ))
{
bRet = true;
- Link aLink = LINK(this, SwView, OnlineSpellCallback);
+ Link<> aLink = LINK(this, SwView, OnlineSpellCallback);
pOLV->ExecuteSpellPopup( aPos,&aLink );
}
return bRet;
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 70c506f138f1..663ebe73b67d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -780,7 +780,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
// Handler
- Link aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
+ Link<> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
aContentToolBox->SetSelectHdl( aLk );
aGlobalToolBox->SetSelectHdl( aLk );
aDocListBox->SetSelectHdl(LINK(this, SwNavigationPI,
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index a7446c3a4096..8898a1aa8964 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -64,7 +64,7 @@ bool SwOneExampleFrame::bShowServiceNotAvailableMessage = true;
SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
sal_uInt32 nFlags,
- const Link* pInitializedLink,
+ const Link<>* pInitializedLink,
const OUString* pURL ) :
aTopWindow(VclPtr<SwFrmCtrlWindow>::Create(&rWin, this)),
aMenuRes(SW_RES(RES_FRMEX_MENU)),
@@ -457,7 +457,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
aPop.InsertItem(ITEM_UP, rArr.GetString(rArr.FindIndex(ST_MENU_UP )));
aPop.InsertItem(ITEM_DOWN, rArr.GetString(rArr.FindIndex(ST_MENU_DOWN )));
- Link aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
+ Link<> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
aPop.SetSelectHdl(aSelLk);
if(EX_SHOW_ONLINE_LAYOUT == nStyleFlags)
{
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index 252e523ef42e..0f97fbce9e52 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -160,7 +160,7 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pA
sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
bool bChkPtr, SbxArray* pArgs,
- const Link* pCallBack )
+ const Link<>* pCallBack )
{
return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs, pCallBack );
}
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index bcb508c8c06e..08c72bb8c92c 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -39,7 +39,7 @@ ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle )
mbHasVertBar( false ),
maScrollVis( None )
{
- Link aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
+ Link<> aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
maVScrollBar->SetScrollHdl( aLink );
maHScrollBar->SetScrollHdl( aLink );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 50106d844729..05b233013916 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -159,8 +159,8 @@ class VCLXToolkit : public VCLXToolkit_Impl,
::cppu::OInterfaceContainerHelper m_aTopWindowListeners;
::cppu::OInterfaceContainerHelper m_aKeyHandlers;
::cppu::OInterfaceContainerHelper m_aFocusListeners;
- ::Link m_aEventListenerLink;
- ::Link m_aKeyListenerLink;
+ ::Link<> m_aEventListenerLink;
+ ::Link<> m_aKeyListenerLink;
bool m_bEventListener;
bool m_bKeyListener;
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index ad5a61fcde51..f72c1c00cf7f 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -43,7 +43,7 @@ sal_Int32 SvtSysLocaleOptions::nRefCount = 0;
namespace
{
struct CurrencyChangeLink
- : public rtl::Static<Link, CurrencyChangeLink> {};
+ : public rtl::Static<Link<>, CurrencyChangeLink> {};
}
class SvtSysLocaleOptions_Impl : public utl::ConfigItem
@@ -679,7 +679,7 @@ OUString SvtSysLocaleOptions::CreateCurrencyConfigString(
}
// static
-void SvtSysLocaleOptions::SetCurrencyChangeLink( const Link& rLink )
+void SvtSysLocaleOptions::SetCurrencyChangeLink( const Link<>& rLink )
{
MutexGuard aGuard( GetMutex() );
DBG_ASSERT( !CurrencyChangeLink::get().IsSet(), "SvtSysLocaleOptions::SetCurrencyChangeLink: already set" );
@@ -687,7 +687,7 @@ void SvtSysLocaleOptions::SetCurrencyChangeLink( const Link& rLink )
}
// static
-const Link& SvtSysLocaleOptions::GetCurrencyChangeLink()
+const Link<>& SvtSysLocaleOptions::GetCurrencyChangeLink()
{
MutexGuard aGuard( GetMutex() );
return CurrencyChangeLink::get();
@@ -697,7 +697,7 @@ void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p
{
if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
{
- const Link& rLink = GetCurrencyChangeLink();
+ const Link<>& rLink = GetCurrencyChangeLink();
if ( rLink.IsSet() )
rLink.Call( NULL );
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index e5dd6b2da1e1..d33c570cc68c 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -125,10 +125,10 @@ public:
*/
class ProgressHandler_Impl: public ::cppu::WeakImplHelper1< XProgressHandler >
{
- Link m_aProgress;
+ Link<> m_aProgress;
public:
- ProgressHandler_Impl( const Link& rLink )
+ ProgressHandler_Impl( const Link<>& rLink )
: m_aProgress( rLink )
{}
// XProgressHandler
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index e0ea07c1b85f..1f20c31ccafc 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -176,7 +176,7 @@ UUIInteractionHelper::handleRequest(
) {
// we are not in the main thread, let it handle that stuff
HandleData aHD(rRequest);
- Link aLink(&aHD,handlerequest);
+ Link<> aLink(&aHD,handlerequest);
Application::PostUserEvent(aLink,this);
SolarMutexReleaser aReleaser;
aHD.wait();
@@ -232,7 +232,7 @@ UUIInteractionHelper::getStringFromRequest(
) {
// we are not in the main thread, let it handle that stuff
HandleData aHD(rRequest);
- Link aLink(&aHD,getstringfromrequest);
+ Link<> aLink(&aHD,getstringfromrequest);
Application::PostUserEvent(aLink,this);
SolarMutexReleaser aReleaser;
aHD.wait();
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 06ff359bf3ca..0911605a7863 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -63,7 +63,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
get(m_pBtnRename, "rename");
get(m_pBtnCancel, "cancel");
- Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) );
+ Link<> aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) );
m_pBtnOverwrite->SetClickHdl( aLink );
m_pBtnRename->SetClickHdl( aLink );
m_pBtnCancel->SetClickHdl( aLink );
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 4e0a6396b8cf..d993e836a535 100644
--- a/vcl/inc/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
@@ -37,8 +37,8 @@ public:
ImplIdleMgr();
~ImplIdleMgr();
- bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority );
- void RemoveIdleHdl( const Link& rLink );
+ bool InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPriority );
+ void RemoveIdleHdl( const Link<>& rLink );
void RestartIdler()
{ if ( maTimer.IsActive() ) maTimer.Start(); }
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 4d653054db98..71d86f270257 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -95,7 +95,7 @@ private:
sal_Int32 mnMRUCount;
sal_Int32 mnMaxMRUCount;
- Link maSelectionChangedHdl;
+ Link<> maSelectionChangedHdl;
bool mbCallSelectionChangedHdl;
boost::ptr_vector<ImplEntryType> maEntries;
@@ -154,7 +154,7 @@ public:
void SetSelectionAnchor( sal_Int32 nPos ) { mnSelectionAnchor = nPos; }
sal_Int32 GetSelectionAnchor() const { return mnSelectionAnchor; }
- void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; }
+ void SetSelectionChangedHdl( const Link<>& rLnk ) { maSelectionChangedHdl = rLnk; }
void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; }
void SetMRUCount( sal_Int32 n ) { mnMRUCount = n; }
@@ -229,13 +229,13 @@ private:
bool mbCenter : 1; ///< center Text output
bool mbEdgeBlending : 1;
- Link maScrollHdl;
- Link maSelectHdl;
- Link maCancelHdl;
- Link maDoubleClickHdl;
- Link maMRUChangedHdl;
- Link maFocusHdl;
- Link maListItemSelectHdl;
+ Link<> maScrollHdl;
+ Link<> maSelectHdl;
+ Link<> maCancelHdl;
+ Link<> maDoubleClickHdl;
+ Link<> maMRUChangedHdl;
+ Link<> maFocusHdl;
+ Link<> maListItemSelectHdl;
vcl::QuickSelectionEngine maQuickSelectionEngine;
@@ -334,23 +334,23 @@ public:
long GetEntryHeight() const { return mnMaxHeight; }
long GetMaxEntryWidth() const { return mnMaxWidth; }
- void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; }
- const Link& GetScrollHdl() const { return maScrollHdl; }
- void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- const Link& GetSelectHdl() const { return maSelectHdl; }
- void SetCancelHdl( const Link& rLink ) { maCancelHdl = rLink; }
- const Link& GetCancelHdl() const { return maCancelHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
- void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; }
- const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; }
- void SetFocusHdl( const Link& rLink ) { maFocusHdl = rLink ; }
- const Link& GetFocusHdl() const { return maFocusHdl; }
+ void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; }
+ const Link<>& GetScrollHdl() const { return maScrollHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+ const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetCancelHdl( const Link<>& rLink ) { maCancelHdl = rLink; }
+ const Link<>& GetCancelHdl() const { return maCancelHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetMRUChangedHdl( const Link<>& rLink ) { maMRUChangedHdl = rLink; }
+ const Link<>& GetMRUChangedHdl() const { return maMRUChangedHdl; }
+ void SetFocusHdl( const Link<>& rLink ) { maFocusHdl = rLink ; }
+ const Link<>& GetFocusHdl() const { return maFocusHdl; }
boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
- void SetListItemSelectHdl( const Link& rLink ) { maListItemSelectHdl = rLink ; }
- const Link& GetListItemSelectHdl() const { return maListItemSelectHdl; }
+ void SetListItemSelectHdl( const Link<>& rLink ) { maListItemSelectHdl = rLink ; }
+ const Link<>& GetListItemSelectHdl() const { return maListItemSelectHdl; }
bool IsSelectionChanged() const { return mbSelectionChanged; }
sal_uInt16 GetSelectModifier() const { return mnSelectModifier; }
@@ -392,7 +392,7 @@ private:
bool mbAutoHScroll : 1; // AutoHScroll an oder aus
bool mbEdgeBlending : 1;
- Link maScrollHdl; // because it is needed by ImplListBoxWindow itself
+ Link<> maScrollHdl; // because it is needed by ImplListBoxWindow itself
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
protected:
@@ -471,22 +471,22 @@ public:
long GetEntryHeight() const { return maLBWindow->GetEntryHeight(); }
long GetMaxEntryWidth() const { return maLBWindow->GetMaxEntryWidth(); }
- void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; }
- const Link& GetScrollHdl() const { return maScrollHdl; }
- void SetSelectHdl( const Link& rLink ) { maLBWindow->SetSelectHdl( rLink ); }
- const Link& GetSelectHdl() const { return maLBWindow->GetSelectHdl(); }
- void SetCancelHdl( const Link& rLink ) { maLBWindow->SetCancelHdl( rLink ); }
- const Link& GetCancelHdl() const { return maLBWindow->GetCancelHdl(); }
- void SetDoubleClickHdl( const Link& rLink ) { maLBWindow->SetDoubleClickHdl( rLink ); }
- const Link& GetDoubleClickHdl() const { return maLBWindow->GetDoubleClickHdl(); }
+ void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; }
+ const Link<>& GetScrollHdl() const { return maScrollHdl; }
+ void SetSelectHdl( const Link<>& rLink ) { maLBWindow->SetSelectHdl( rLink ); }
+ const Link<>& GetSelectHdl() const { return maLBWindow->GetSelectHdl(); }
+ void SetCancelHdl( const Link<>& rLink ) { maLBWindow->SetCancelHdl( rLink ); }
+ const Link<>& GetCancelHdl() const { return maLBWindow->GetCancelHdl(); }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maLBWindow->SetDoubleClickHdl( rLink ); }
+ const Link<>& GetDoubleClickHdl() const { return maLBWindow->GetDoubleClickHdl(); }
boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
- void SetFocusHdl( const Link& rLink ) { maLBWindow->SetFocusHdl( rLink ); }
- const Link& GetFocusHdl() const { return maLBWindow->GetFocusHdl(); }
- void SetListItemSelectHdl( const Link& rLink ) { maLBWindow->SetListItemSelectHdl( rLink ); }
- const Link& GetListItemSelectHdl() const { return maLBWindow->GetListItemSelectHdl(); }
- void SetSelectionChangedHdl( const Link& rLnk ) { maLBWindow->GetEntryList()->SetSelectionChangedHdl( rLnk ); }
+ void SetFocusHdl( const Link<>& rLink ) { maLBWindow->SetFocusHdl( rLink ); }
+ const Link<>& GetFocusHdl() const { return maLBWindow->GetFocusHdl(); }
+ void SetListItemSelectHdl( const Link<>& rLink ) { maLBWindow->SetListItemSelectHdl( rLink ); }
+ const Link<>& GetListItemSelectHdl() const { return maLBWindow->GetListItemSelectHdl(); }
+ void SetSelectionChangedHdl( const Link<>& rLnk ) { maLBWindow->GetEntryList()->SetSelectionChangedHdl( rLnk ); }
void SetCallSelectionChangedHdl( bool bCall ) { maLBWindow->GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
bool IsSelectionChanged() const { return maLBWindow->IsSelectionChanged(); }
sal_uInt16 GetSelectModifier() const { return maLBWindow->GetSelectModifier(); }
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 29a53c5e01ba..6baed716244b 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -118,8 +118,8 @@ private:
void ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0 );
- void ImplSetAnimationNotifyHdl( const Link& rLink );
- Link ImplGetAnimationNotifyHdl() const;
+ void ImplSetAnimationNotifyHdl( const Link<>& rLink );
+ Link<> ImplGetAnimationNotifyHdl() const;
sal_uLong ImplGetAnimationLoopCount() const;
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 6f1efd6946de..2dc3d82baf60 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -87,7 +87,7 @@ private:
std::set<VclPtr<vcl::Window>> m_aDocumentWindowList;
// the link object needed for Application::addEventListener
- Link m_aWindowEventLink;
+ Link<> m_aWindowEventLink;
// the UNO XAccessibilityEventListener for Documents and other non VCL objects
const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 1b2796ee65a9..932ebe516212 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -340,7 +340,7 @@ struct ImplSVData
std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList;
std::unordered_map< int, OUString >* mpPaperNames;
- Link maDeInitHook;
+ Link<> maDeInitHook;
};
void ImplDeInitSVData();
@@ -399,7 +399,7 @@ struct ImplFocusDelData : public ImplDelData
struct ImplSVEvent
{
void* mpData;
- Link* mpLink;
+ Link<>* mpLink;
VclPtr<vcl::Window> mpWindow;
ImplDelData maDelData;
bool mbCall;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 61d247bd270b..71e841eb5491 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -129,7 +129,7 @@ struct ImplToolBoxPrivateData
void ImplClearLayoutData() { delete m_pLayoutData; m_pLayoutData = NULL; }
// called when dropdown items are clicked
- Link maDropdownClickHdl;
+ Link<> maDropdownClickHdl;
Timer maDropdownTimer; // for opening dropdown items on "long click"
// large or small buttons ?
@@ -141,7 +141,7 @@ struct ImplToolBoxPrivateData
ImplSVEvent * mnEventId;
// called when menu button is clicked and before the popup menu is executed
- Link maMenuButtonHdl;
+ Link<> maMenuButtonHdl;
// a dummy item representing the custom menu button
ImplToolItem maMenubuttonItem;
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index fbbd14159ec1..5fa5bef1c340 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -23,7 +23,7 @@
struct ImplIdleData
{
- Link maIdleHdl;
+ Link<> maIdleHdl;
sal_uInt16 mnPriority;
bool mbTimeout;
};
@@ -52,7 +52,7 @@ ImplIdleMgr::~ImplIdleMgr()
delete mpIdleList;
}
-bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority )
+bool ImplIdleMgr::InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPriority )
{
size_t nPos = (size_t)-1;
size_t n = mpIdleList->size();
@@ -86,7 +86,7 @@ bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority )
return true;
}
-void ImplIdleMgr::RemoveIdleHdl( const Link& rLink )
+void ImplIdleMgr::RemoveIdleHdl( const Link<>& rLink )
{
if (mbInDestruction)
return;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 07cbab812cc9..5a397f430965 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -143,7 +143,7 @@ struct ImplHotKey
ImplHotKey* mpNext;
void* mpUserData;
vcl::KeyCode maKeyCode;
- Link maLink;
+ Link<> maLink;
};
struct ImplEventHook
@@ -641,7 +641,7 @@ void Application::ImplCallEventListeners( VclSimpleEvent* pEvent )
pSVData->maAppData.mpEventListeners->Call( pEvent );
}
-void Application::AddEventListener( const Link& rEventListener )
+void Application::AddEventListener( const Link<>& rEventListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( !pSVData->maAppData.mpEventListeners )
@@ -649,14 +649,14 @@ void Application::AddEventListener( const Link& rEventListener )
pSVData->maAppData.mpEventListeners->addListener( rEventListener );
}
-void Application::RemoveEventListener( const Link& rEventListener )
+void Application::RemoveEventListener( const Link<>& rEventListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->maAppData.mpEventListeners )
pSVData->maAppData.mpEventListeners->removeListener( rEventListener );
}
-void Application::AddKeyListener( const Link& rKeyListener )
+void Application::AddKeyListener( const Link<>& rKeyListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( !pSVData->maAppData.mpKeyListeners )
@@ -664,7 +664,7 @@ void Application::AddKeyListener( const Link& rKeyListener )
pSVData->maAppData.mpKeyListeners->addListener( rKeyListener );
}
-void Application::RemoveKeyListener( const Link& rKeyListener )
+void Application::RemoveKeyListener( const Link<>& rKeyListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->maAppData.mpKeyListeners )
@@ -897,11 +897,11 @@ void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin )
}
}
-ImplSVEvent * Application::PostUserEvent( const Link& rLink, void* pCaller )
+ImplSVEvent * Application::PostUserEvent( const Link<>& rLink, void* pCaller )
{
ImplSVEvent* pSVEvent = new ImplSVEvent;
pSVEvent->mpData = pCaller;
- pSVEvent->mpLink = new Link( rLink );
+ pSVEvent->mpLink = new Link<>( rLink );
pSVEvent->mpWindow = NULL;
pSVEvent->mbCall = true;
vcl::Window* pDefWindow = ImplGetDefaultWindow();
@@ -934,7 +934,7 @@ void Application::RemoveUserEvent( ImplSVEvent * nUserEvent )
}
}
-bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio )
+bool Application::InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPrio )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -945,7 +945,7 @@ bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio )
return pSVData->maAppData.mpIdleMgr->InsertIdleHdl( rLink, nPrio );
}
-void Application::RemoveIdleHdl( const Link& rLink )
+void Application::RemoveIdleHdl( const Link<>& rLink )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -965,7 +965,7 @@ void Application::DisableNoYieldMode()
pSVData->maAppData.mbNoYield = false;
}
-void Application::AddPostYieldListener( const Link& i_rListener )
+void Application::AddPostYieldListener( const Link<>& i_rListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( ! pSVData->maAppData.mpPostYieldListeners )
@@ -973,7 +973,7 @@ void Application::AddPostYieldListener( const Link& i_rListener )
pSVData->maAppData.mpPostYieldListeners->addListener( i_rListener );
}
-void Application::RemovePostYieldListener( const Link& i_rListener )
+void Application::RemovePostYieldListener( const Link<>& i_rListener )
{
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->maAppData.mpPostYieldListeners )
@@ -1416,7 +1416,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper )
return pSVData->mxDisplayConnection.get();
}
-void Application::SetFilterHdl( const Link& rLink )
+void Application::SetFilterHdl( const Link<>& rLink )
{
ImplGetSVData()->maGDIData.mpGrfConverter->SetFilterHdl( rLink );
}
@@ -1620,7 +1620,7 @@ Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM
return pSVData->mpDefInst->createFolderPicker( xSM );
}
-void Application::setDeInitHook(Link const & hook) {
+void Application::setDeInitHook(Link<> const & hook) {
ImplSVData * pSVData = ImplGetSVData();
assert(!pSVData->maDeInitHook.IsSet());
pSVData->maDeInitHook = hook;
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 325c9b659b18..00c4ffd525e2 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -48,16 +48,16 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
return;
// Copy the list, because this can be destroyed when calling a Link...
- std::list<Link> aCopy( m_aListeners );
- std::list<Link>::iterator aIter( aCopy.begin() );
- std::list<Link>::const_iterator aEnd( aCopy.end() );
+ std::list<Link<>> aCopy( m_aListeners );
+ std::list<Link<>>::iterator aIter( aCopy.begin() );
+ std::list<Link<>>::const_iterator aEnd( aCopy.end() );
if( pEvent->IsA( VclWindowEvent::StaticType() ) )
{
VclWindowEvent* pWinEvent = static_cast<VclWindowEvent*>(pEvent);
ImplDelData aDel( pWinEvent->GetWindow() );
while ( aIter != aEnd && ! aDel.IsDead() )
{
- Link &rLink = *aIter;
+ Link<> &rLink = *aIter;
// check this hasn't been removed in some re-enterancy scenario fdo#47368
if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) != m_aListeners.end() )
rLink.Call( pEvent );
@@ -68,7 +68,7 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
{
while ( aIter != aEnd )
{
- Link &rLink = *aIter;
+ Link<> &rLink = *aIter;
if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) != m_aListeners.end() )
rLink.Call( pEvent );
++aIter;
@@ -83,9 +83,9 @@ bool VclEventListeners::Process( VclSimpleEvent* pEvent ) const
bool bProcessed = false;
// Copy the list, because this can be destroyed when calling a Link...
- std::list<Link> aCopy( m_aListeners );
- std::list<Link>::iterator aIter( aCopy.begin() );
- std::list<Link>::const_iterator aEnd( aCopy.end() );
+ std::list<Link<>> aCopy( m_aListeners );
+ std::list<Link<>>::iterator aIter( aCopy.begin() );
+ std::list<Link<>>::const_iterator aEnd( aCopy.end() );
while ( aIter != aEnd )
{
if( (*aIter).Call( pEvent ) != 0 )
@@ -98,12 +98,12 @@ bool VclEventListeners::Process( VclSimpleEvent* pEvent ) const
return bProcessed;
}
-void VclEventListeners::addListener( const Link& rListener )
+void VclEventListeners::addListener( const Link<>& rListener )
{
m_aListeners.push_back( rListener );
}
-void VclEventListeners::removeListener( const Link& rListener )
+void VclEventListeners::removeListener( const Link<>& rListener )
{
m_aListeners.remove( rListener );
}
@@ -116,10 +116,10 @@ VclEventListeners2::~VclEventListeners2()
{
}
-void VclEventListeners2::addListener( const Link& i_rLink )
+void VclEventListeners2::addListener( const Link<>& i_rLink )
{
// ensure uniqueness
- for( std::list< Link >::const_iterator it = m_aListeners.begin(); it != m_aListeners.end(); ++it )
+ for( std::list< Link<> >::const_iterator it = m_aListeners.begin(); it != m_aListeners.end(); ++it )
{
if( *it == i_rLink )
return;
@@ -127,7 +127,7 @@ void VclEventListeners2::addListener( const Link& i_rLink )
m_aListeners.push_back( i_rLink );
}
-void VclEventListeners2::removeListener( const Link& i_rLink )
+void VclEventListeners2::removeListener( const Link<>& i_rLink )
{
size_t n = m_aIterators.size();
for( size_t i = 0; i < n; i++ )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3128f11cd554..ef0c8c310685 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -106,7 +106,7 @@ void Button::dispose()
void Button::SetCommandHandler(const OUString& aCommand)
{
maCommand = aCommand;
- SetClickHdl(Link(NULL, dispatchCommandHandler));
+ SetClickHdl(Link<>(NULL, dispatchCommandHandler));
}
void Button::Click()
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 79c6933614cf..e57c296a991c 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -321,7 +321,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const
}
}
-bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller )
+bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link<>& rHandler, void* pCaller )
{
ImplDelData aCheckDelete;
ImplAddDel( &aCheckDelete );
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 1f6830b72a3f..fbbcad1e6160 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2151,7 +2151,7 @@ ImplListBox::ImplListBox( vcl::Window* pParent, WinBits nWinStyle ) :
mpHScrollBar = VclPtr<ScrollBar>::Create( this, WB_HSCROLL | WB_DRAG );
mpScrollBarBox = VclPtr<ScrollBarBox>::Create( this );
- Link aLink( LINK( this, ImplListBox, ScrollBarHdl ) );
+ Link<> aLink( LINK( this, ImplListBox, ScrollBarHdl ) );
mpVScrollBar->SetScrollHdl( aLink );
mpHScrollBar->SetScrollHdl( aLink );
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 3e1df3ee6937..d1f36aaf1989 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -241,7 +241,7 @@ void IdleFormatter::DoIdleFormat( TextView* pV, sal_uInt16 nMaxRestarts )
if ( mnRestarts > nMaxRestarts )
{
mnRestarts = 0;
- ((Link&)GetIdleHdl()).Call( this );
+ ((Link<>&)GetIdleHdl()).Call( this );
}
else
{
@@ -255,7 +255,7 @@ void IdleFormatter::ForceTimeout()
{
Stop();
mnRestarts = 0;
- ((Link&)GetIdleHdl()).Call( this );
+ ((Link<>&)GetIdleHdl()).Call( this );
}
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 961679796fc7..6886843ebc1f 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2171,9 +2171,9 @@ void GraphicFilter::ResetLastError()
pErrorEx->nFilterError = pErrorEx->nStreamError = 0UL;
}
-const Link GraphicFilter::GetFilterCallback() const
+const Link<> GraphicFilter::GetFilterCallback() const
{
- const Link aLink( LINK( const_cast<GraphicFilter*>(this), GraphicFilter, FilterCallback ) );
+ const Link<> aLink( LINK( const_cast<GraphicFilter*>(this), GraphicFilter, FilterCallback ) );
return aLink;
}
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 4ab246f0d713..e0ce99a20959 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -669,7 +669,7 @@ bool Animation::Adjust( short nLuminancePercent, short nContrastPercent,
return bRet;
}
-bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress )
+bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
{
DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" );
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index d3d6db4deca4..9451b160969e 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2445,12 +2445,12 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal,
}
}
-bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress )
+bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link<>* pProgress )
{
return ImplVectorizer::ImplVectorize( *this, rPolyPoly, nFlags, pProgress );
}
-bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress )
+bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link<>* pProgress )
{
return ImplVectorizer::ImplVectorize( *this, rMtf, cReduce, nFlags, pProgress );
}
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 8790b2baf58b..42ac92d0b859 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -38,7 +38,7 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent( sal_uInt8 base, sal_uInt16
return (sal_uInt8) (color1+color2);
}
-bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress )
+bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
{
bool bRet = false;
@@ -111,7 +111,7 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
}
bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
- const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
+ const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -256,7 +256,7 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
return bRet;
}
-bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
+bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -385,7 +385,7 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
return bRet;
}
-bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
+bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
{
bool bRet = ImplMakeGreyscales( 256 );
@@ -511,7 +511,7 @@ bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link*
return bRet;
}
-bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
+bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
{
bool bRet = ImplMakeGreyscales( 256 );
@@ -623,7 +623,7 @@ bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
return bRet;
}
-bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
+bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
{
bool bRet = false;
BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
@@ -671,7 +671,7 @@ bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pPr
return bRet;
}
-bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
+bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -756,7 +756,7 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgr
return bRet;
}
-bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
+bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
{
sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
pFilterParam->maMosaicTileSize.mnTileWidth : 4;
@@ -941,7 +941,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
return nRet;
}
-bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
+bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
{
bool bRet = ( GetBitCount() <= 8 ) || Convert( BMP_CONVERSION_8BIT_COLORS );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 80cb6f832b29..41f1e9254d4d 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -649,7 +649,7 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
fGamma, bInvert, msoBrightness );
}
-bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress )
+bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
{
return !!aBitmap && aBitmap.Filter( eFilter, pFilterParam, pProgress );
}
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 80522e76ecdb..40bd87c8ffca 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -476,12 +476,12 @@ void Graphic::StopAnimation( OutputDevice* pOutDev, long nExtraData )
mpImpGraphic->ImplStopAnimation( pOutDev, nExtraData );
}
-void Graphic::SetAnimationNotifyHdl( const Link& rLink )
+void Graphic::SetAnimationNotifyHdl( const Link<>& rLink )
{
mpImpGraphic->ImplSetAnimationNotifyHdl( rLink );
}
-Link Graphic::GetAnimationNotifyHdl() const
+Link<> Graphic::GetAnimationNotifyHdl() const
{
return mpImpGraphic->ImplGetAnimationNotifyHdl();
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 0aace4e88651..58bb314a1a10 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -914,15 +914,15 @@ void ImpGraphic::ImplStopAnimation( OutputDevice* pOutDev, long nExtraData )
mpAnimation->Stop( pOutDev, nExtraData );
}
-void ImpGraphic::ImplSetAnimationNotifyHdl( const Link& rLink )
+void ImpGraphic::ImplSetAnimationNotifyHdl( const Link<>& rLink )
{
if( mpAnimation )
mpAnimation->SetNotifyHdl( rLink );
}
-Link ImpGraphic::ImplGetAnimationNotifyHdl() const
+Link<> ImpGraphic::ImplGetAnimationNotifyHdl() const
{
- Link aLink;
+ Link<> aLink;
if( mpAnimation )
aLink = mpAnimation->GetNotifyHdl();
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index bdb5f3114eeb..fb640216d483 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -634,7 +634,7 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr )
namespace ImplVectorizer {
bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
- sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress )
+ sal_uInt8 cReduce, sal_uLong nFlags, const Link<>* pProgress )
{
bool bRet = false;
@@ -737,7 +737,7 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
bool ImplVectorize( const Bitmap& rMonoBmp,
tools::PolyPolygon& rPolyPoly,
- sal_uLong nFlags, const Link* pProgress )
+ sal_uLong nFlags, const Link<>* pProgress )
{
std::unique_ptr<Bitmap> xBmp(new Bitmap( rMonoBmp ));
BitmapReadAccess* pRAcc;
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 4e1ec38b7b17..c2e7a48b7e43 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -27,9 +27,9 @@
namespace ImplVectorizer
{
bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
- sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress );
+ sal_uInt8 cReduce, sal_uLong nFlags, const Link<>* pProgress );
bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly,
- sal_uLong nFlags, const Link* pProgress );
+ sal_uLong nFlags, const Link<>* pProgress );
};
#endif
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index bf5c5eef4ae8..6b181b6155a9 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -145,7 +145,7 @@ public:
std::vector< PropertyValue > maUIProperties;
std::vector< bool > maUIPropertyEnabled;
PropertyToIndexMap maPropertyToIndex;
- Link maOptionChangeHdl;
+ Link<> maOptionChangeHdl;
ControlDependencyMap maControlDependencies;
ChoiceDisableMap maChoiceDisableMap;
bool mbFirstPage;
@@ -1635,7 +1635,7 @@ OUString PrinterController::makeEnabled( const OUString& i_rProperty )
return aDependency;
}
-void PrinterController::setOptionChangeHdl( const Link& i_rHdl )
+void PrinterController::setOptionChangeHdl( const Link<>& i_rHdl )
{
mpImplData->maOptionChangeHdl = i_rHdl;
}
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 06ba4a37390d..d278e9aa71b0 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.cxx
@@ -26,7 +26,7 @@
namespace vcl
{
-EventPoster::EventPoster( const Link& rLink )
+EventPoster::EventPoster( const Link<>& rLink )
: m_aLink(rLink)
{
m_nId = 0;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9e6d4bf12dae..3381ef6f5991 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -334,7 +334,7 @@ struct DialogImpl
{
long mnResult;
bool mbStartedModal;
- Link maEndDialogHdl;
+ Link<> maEndDialogHdl;
DialogImpl() : mnResult( -1 ), mbStartedModal( false ) {}
};
@@ -864,7 +864,7 @@ short Dialog::Execute()
}
// virtual
-void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
+void Dialog::StartExecuteModal( const Link<>& rEndDialogHdl )
{
if ( !ImplStartExecuteModal() )
return;
@@ -921,7 +921,7 @@ void Dialog::EndDialog( long nResult )
ImplEndExecuteModal();
mpDialogImpl->maEndDialogHdl.Call( this );
- mpDialogImpl->maEndDialogHdl = Link();
+ mpDialogImpl->maEndDialogHdl = Link<>();
mpDialogImpl->mbStartedModal = false;
mpDialogImpl->mnResult = -1;
}
@@ -945,7 +945,7 @@ void Dialog::EndAllDialogs( vcl::Window* pParent )
if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) )
{
pModDialog->EndDialog( RET_CANCEL );
- pModDialog->PostUserEvent( Link() );
+ pModDialog->PostUserEvent( Link<>() );
}
pModDialog = pTempModDialog;
}
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 9c954125779d..bd2b36d39c39 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -243,31 +243,31 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent )
Application::ImplCallEventListeners(pEvent);
}
-void Window::AddEventListener( const Link& rEventListener )
+void Window::AddEventListener( const Link<>& rEventListener )
{
mpWindowImpl->maEventListeners.addListener( rEventListener );
}
-void Window::RemoveEventListener( const Link& rEventListener )
+void Window::RemoveEventListener( const Link<>& rEventListener )
{
mpWindowImpl->maEventListeners.removeListener( rEventListener );
}
-void Window::AddChildEventListener( const Link& rEventListener )
+void Window::AddChildEventListener( const Link<>& rEventListener )
{
mpWindowImpl->maChildEventListeners.addListener( rEventListener );
}
-void Window::RemoveChildEventListener( const Link& rEventListener )
+void Window::RemoveChildEventListener( const Link<>& rEventListener )
{
mpWindowImpl->maChildEventListeners.removeListener( rEventListener );
}
-ImplSVEvent * Window::PostUserEvent( const Link& rLink, void* pCaller )
+ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller )
{
ImplSVEvent* pSVEvent = new ImplSVEvent;
pSVEvent->mpData = pCaller;
- pSVEvent->mpLink = new Link( rLink );
+ pSVEvent->mpLink = new Link<>( rLink );
pSVEvent->mpWindow = this;
pSVEvent->mbCall = true;
ImplAddDel( &(pSVEvent->maDelData) );
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index c9a43087cdf7..3bfa40a049d9 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1633,7 +1633,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle)
{
SetType(WINDOW_SCROLLWINDOW);
- Link aLink( LINK( this, VclScrolledWindow, ScrollBarHdl ) );
+ Link<> aLink( LINK( this, VclScrolledWindow, ScrollBarHdl ) );
m_pVScroll->SetScrollHdl(aLink);
m_pHScroll->SetScrollHdl(aLink);
}
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e972321a7f53..a70a3d0c1a17 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -353,12 +353,12 @@ void Menu::ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos )
}
}
-void Menu::AddEventListener( const Link& rEventListener )
+void Menu::AddEventListener( const Link<>& rEventListener )
{
maEventListeners.addListener( rEventListener );
}
-void Menu::RemoveEventListener( const Link& rEventListener )
+void Menu::RemoveEventListener( const Link<>& rEventListener )
{
maEventListeners.removeListener( rEventListener );
}
@@ -2648,13 +2648,13 @@ bool MenuBar::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventId )
return false;
}
-sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link& i_rLink, const OUString& i_rToolTip, sal_uInt16 i_nPos )
+sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link<>& i_rLink, const OUString& i_rToolTip, sal_uInt16 i_nPos )
{
IMenuBarWindow* pMenuWin = getMenuBarWindow();
return pMenuWin ? pMenuWin->AddMenuBarButton(i_rImage, i_rLink, i_rToolTip, i_nPos) : 0;
}
-void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& rLink )
+void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink )
{
IMenuBarWindow* pMenuWin = getMenuBarWindow();
if (!pMenuWin)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index ef83cacb83da..83754722d925 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -1080,7 +1080,7 @@ void MenuBarWindow::GetFocus()
return xAcc;
}
-sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i_rLink, const OUString& i_rToolTip, sal_uInt16 i_nPos )
+sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<>& i_rLink, const OUString& i_rToolTip, sal_uInt16 i_nPos )
{
// find first free button id
sal_uInt16 nId = IID_DOCUMENTCLOSE;
@@ -1107,7 +1107,7 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i
return nId;
}
-void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& rLink )
+void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink )
{
std::map< sal_uInt16, AddButtonEntry >::iterator it = m_aAddButtons.find( nId );
if( it != m_aAddButtons.end() )
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 348d167e6469..3f10c6303954 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -66,8 +66,8 @@ private:
struct AddButtonEntry
{
sal_uInt16 m_nId;
- Link m_aSelectLink;
- Link m_aHighlightLink;
+ Link<> m_aSelectLink;
+ Link<> m_aHighlightLink;
AddButtonEntry() : m_nId( 0 ) {}
};
@@ -138,8 +138,8 @@ public:
Size MinCloseButtonSize();
/// Add an arbitrary button to the menubar that will appear next to the close button.
- virtual sal_uInt16 AddMenuBarButton(const Image&, const Link&, const OUString&, sal_uInt16 nPos) SAL_OVERRIDE;
- virtual void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link&) SAL_OVERRIDE;
+ virtual sal_uInt16 AddMenuBarButton(const Image&, const Link<>&, const OUString&, sal_uInt16 nPos) SAL_OVERRIDE;
+ virtual void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<>&) SAL_OVERRIDE;
virtual Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId) SAL_OVERRIDE;
virtual void RemoveMenuBarButton(sal_uInt16 nId) SAL_OVERRIDE;
virtual bool HandleMenuButtonEvent(sal_uInt16 i_nButtonId) SAL_OVERRIDE;
diff --git a/vcl/source/window/menuwindow.hxx b/vcl/source/window/menuwindow.hxx
index 391bc08e3625..16d2b8870ea2 100644
--- a/vcl/source/window/menuwindow.hxx
+++ b/vcl/source/window/menuwindow.hxx
@@ -21,12 +21,12 @@
#define INCLUDED_VCL_SOURCE_WINDOW_MENUWINDOW_HXX
#include <sal/types.h>
+#include <tools/link.hxx>
#include <tools/solar.h>
#include <vcl/event.hxx>
class HelpEvent;
class Image;
-class Link;
class Menu;
class MenuBar;
class Rectangle;
@@ -84,8 +84,8 @@ public:
virtual void KillActivePopup() = 0;
/// Add an arbitrary button to the menubar that will appear next to the close button.
- virtual sal_uInt16 AddMenuBarButton(const Image&, const Link&, const OUString&, sal_uInt16 nPos) = 0;
- virtual void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link&) = 0;
+ virtual sal_uInt16 AddMenuBarButton(const Image&, const Link<>&, const OUString&, sal_uInt16 nPos) = 0;
+ virtual void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<>&) = 0;
virtual Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId) = 0;
virtual void RemoveMenuBarButton(sal_uInt16 nId) = 0;
virtual bool HandleMenuButtonEvent(sal_uInt16 i_nButtonId) = 0;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 99ac9bcb4fa4..13028b927695 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -51,7 +51,7 @@ public:
TaskPaneList* mpTaskPaneList;
Size maMaxOutSize;
OUString maRepresentedURL;
- Link maCloseHdl;
+ Link<> maCloseHdl;
};
SystemWindow::ImplData::ImplData()
@@ -992,12 +992,12 @@ void SystemWindow::SetApplicationID(const OUString &rApplicationID)
mpWindowImpl->mpFrame->SetApplicationID( rApplicationID );
}
-void SystemWindow::SetCloseHdl(const Link& rLink)
+void SystemWindow::SetCloseHdl(const Link<>& rLink)
{
mpImplData->maCloseHdl = rLink;
}
-const Link& SystemWindow::GetCloseHdl() const
+const Link<>& SystemWindow::GetCloseHdl() const
{
return mpImplData->maCloseHdl;
}
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 481122834fc5..a743f6c1b31f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1717,12 +1717,12 @@ long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
return nIndex;
}
-void ToolBox::SetDropdownClickHdl( const Link& rLink )
+void ToolBox::SetDropdownClickHdl( const Link<>& rLink )
{
mpData->maDropdownClickHdl = rLink;
}
-const Link& ToolBox::GetDropdownClickHdl() const
+const Link<>& ToolBox::GetDropdownClickHdl() const
{
return mpData->maDropdownClickHdl;
}
@@ -1767,7 +1767,7 @@ PopupMenu* ToolBox::GetMenu() const
return mpData->mpMenu;
}
-void ToolBox::SetMenuButtonHdl( const Link& rLink )
+void ToolBox::SetMenuButtonHdl( const Link<>& rLink )
{
mpData->maMenuButtonHdl = rLink;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ce4edf81670b..6cccd1879333 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -815,7 +815,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<>( pEv, ContextMenuEventLink ) );
}
else
bRet = ! ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, true, &aChildPos );
@@ -1996,7 +1996,7 @@ void ImplHandleClose( vcl::Window* pWindow )
if (pSysWin)
{
// See if the custom close handler is set.
- const Link& rLink = pSysWin->GetCloseHdl();
+ const Link<>& rLink = pSysWin->GetCloseHdl();
if (rLink.IsSet())
{
rLink.Call(pSysWin);
@@ -2010,7 +2010,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<>( pEv, DelayedCloseEventLink ) );
}
}
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index d95f700809c8..03f08e4f30c6 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -676,7 +676,7 @@ sal_IntPtr WindowEventHandler(void *, void * p)
return 0;
}
-static Link g_aEventListenerLink( NULL, WindowEventHandler );
+static Link<> g_aEventListenerLink( NULL, WindowEventHandler );
/*****************************************************************************/
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 97727a727d54..73ca34b6ce69 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -483,11 +483,11 @@ static long RefreshMenusUnity(void*, void*)
return 0;
}
-static Link* getRefreshLinkInstance()
+static Link<>* getRefreshLinkInstance()
{
- static Link* pLink = NULL;
+ static Link<>* pLink = NULL;
if(!pLink) {
- pLink = new Link(NULL, &RefreshMenusUnity);
+ pLink = new Link<>(NULL, &RefreshMenusUnity);
}
return pLink;
}
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 17cb311f57fb..80f2bffa2695 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -105,7 +105,7 @@ private:
XSecController* mpXSecController;
bool mbError;
bool mbODFPre1_2;
- Link maStartVerifySignatureHdl;
+ Link<> maStartVerifySignatureHdl;
private:
DECL_LINK( SignatureCreationResultListener, XMLSignatureCreationResult*);
@@ -130,7 +130,7 @@ public:
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.
// Default handler will verify all.
- void SetStartVerifySignatureHdl( const Link& rLink );
+ void SetStartVerifySignatureHdl( const Link<>& rLink );
// Get the security environment
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > GetSecurityEnvironment();
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index b8756c244620..84004ae5ef70 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -85,7 +85,7 @@ void XMLSignatureHelper::SetStorage(
}
-void XMLSignatureHelper::SetStartVerifySignatureHdl( const Link& rLink )
+void XMLSignatureHelper::SetStartVerifySignatureHdl( const Link<>& rLink )
{
maStartVerifySignatureHdl = rLink;
}
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 64e3deaba755..25934703dc7c 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -32,7 +32,7 @@
using namespace com::sun::star;
-ImplXMLSignatureListener::ImplXMLSignatureListener(const Link& rCreationResultListenerListener, const Link& rVerifyResultListenerListener, const Link& rStartSignatureElement)
+ImplXMLSignatureListener::ImplXMLSignatureListener(const Link<>& rCreationResultListenerListener, const Link<>& rVerifyResultListenerListener, const Link<>& rStartSignatureElement)
{
maCreationResultListenerListener = rCreationResultListenerListener;
maVerifyResultListenerListener = rVerifyResultListenerListener;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index abe0a393164b..f93aa392e810 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -49,15 +49,15 @@ class ImplXMLSignatureListener : public cppu::WeakImplHelper3
>
{
private:
- Link maCreationResultListenerListener;
- Link maVerifyResultListenerListener;
- Link maStartVerifySignatureElementListener;
+ Link<> maCreationResultListenerListener;
+ Link<> maVerifyResultListenerListener;
+ Link<> maStartVerifySignatureElementListener;
com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
public:
- ImplXMLSignatureListener(const Link& rCreationResultListenerListener, const Link& rVerifyResultListenerListener, const Link& rStartVerifySignatureElement);
+ ImplXMLSignatureListener(const Link<>& rCreationResultListenerListener, const Link<>& rVerifyResultListenerListener, const Link<>& rStartVerifySignatureElement);
virtual ~ImplXMLSignatureListener();
void setNextHandler(com::sun::star::uno::Reference<