summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/SidebarWin.hxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx7
3 files changed, 6 insertions, 7 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 8208d2a330e5..ff90443fccc2 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -188,7 +188,7 @@ class SwSidebarWin : public vcl::Window
void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
SfxItemSet DefaultItem();
- DECL_LINK(ModifyHdl, void*);
+ DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void);
DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
DECL_LINK_TYPED(DeleteHdl, void*, void);
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)