diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
| commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
| tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sw | |
| parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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
Diffstat (limited to 'sw')
101 files changed, 215 insertions, 215 deletions
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 ); } |