diff options
Diffstat (limited to 'sc/source')
57 files changed, 118 insertions, 118 deletions
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); |