diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 11:48:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
| commit | 81bec2e5535aeef7d6ae76f92124537d528f5c23 (patch) | |
| tree | 121866ab62bb6b8286b078707098f16076389644 /sw/source | |
| parent | c784b1a339ab59b7cf5caacd10be5945ec3e0f9f (diff) | |
convert Link<> to typed
Change-Id: I87d4697fe032e3095406becdda026447edd1d68a
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index f8a25e3e8795..ef2218179941 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -98,7 +98,7 @@ void SwAnnotationWin::SetPostItText() ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection()); // get text from SwPostItField and insert into our textview - Engine()->SetModifyHdl( Link<>() ); + Engine()->SetModifyHdl( Link<LinkParamNone*,void>() ); Engine()->EnableUndo( false ); if( mpField->GetTextObject() ) Engine()->SetText( *mpField->GetTextObject() ); @@ -265,7 +265,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<LinkParamNone*,void>() ); IDocumentUndoRedo & rUndoRedo( DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo()); boost::scoped_ptr<SwField> pOldField; diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 18098655fc26..92dcd6c83f16 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -918,8 +918,8 @@ void SwSidebarWin::SetReadonly(bool bSet) void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem) { - Link<> pLink = Engine()->GetModifyHdl(); - Engine()->SetModifyHdl( Link<>() ); + Link<LinkParamNone*,void> pLink = Engine()->GetModifyHdl(); + Engine()->SetModifyHdl( Link<LinkParamNone*,void>() ); ESelection aOld = GetOutlinerView()->GetSelection(); ESelection aNewSelection( 0, 0, Engine()->GetParagraphCount()-1, EE_TEXTPOS_ALL ); @@ -1182,10 +1182,9 @@ IMPL_LINK_TYPED(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) GetOutlinerView()->Scroll( 0, nDiff ); } -IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl) +IMPL_LINK_NOARG_TYPED(SwSidebarWin, ModifyHdl, LinkParamNone*, void) { mrView.GetDocShell()->SetModified(); - return 0; } IMPL_LINK_NOARG_TYPED(SwSidebarWin, DeleteHdl, void*, void) |