summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/impedit.hxx6
-rw-r--r--editeng/source/outliner/outlin2.cxx4
-rw-r--r--forms/source/richtext/richtextmodel.cxx4
-rw-r--r--forms/source/richtext/richtextmodel.hxx2
-rw-r--r--include/editeng/editeng.hxx4
-rw-r--r--include/editeng/outliner.hxx4
-rw-r--r--sc/source/ui/app/inputhdl.cxx3
-rw-r--r--sc/source/ui/app/inputwin.cxx11
-rw-r--r--sc/source/ui/inc/inputhdl.hxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx8
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-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
15 files changed, 31 insertions, 38 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 106483720d8e..06eb7a2f7e63 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1605,12 +1605,12 @@ OUString EditEngine::GetText( sal_Int32 nPara ) const
return aStr;
}
-void EditEngine::SetModifyHdl( const Link<>& rLink )
+void EditEngine::SetModifyHdl( const Link<LinkParamNone*,void>& rLink )
{
pImpEditEngine->SetModifyHdl( rLink );
}
-Link<> EditEngine::GetModifyHdl() const
+Link<LinkParamNone*,void> EditEngine::GetModifyHdl() const
{
return pImpEditEngine->GetModifyHdl();
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index dd135898607c..50c583f00814 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -486,7 +486,7 @@ private:
Link<MoveParagraphsInfo&,void> aEndMovingParagraphsHdl;
Link<PasteOrDropInfos&,void> aBeginPasteOrDropHdl;
Link<PasteOrDropInfos&,void> aEndPasteOrDropHdl;
- Link<> aModifyHdl;
+ Link<LinkParamNone*,void> aModifyHdl;
Link<> maBeginDropHdl;
Link<> maEndDropHdl;
@@ -818,8 +818,8 @@ public:
bool IsModified() const { return aEditDoc.IsModified(); }
void SetModifyFlag( bool b ) { aEditDoc.SetModified( b ); }
- void SetModifyHdl( const Link<>& rLink ) { aModifyHdl = rLink; }
- Link<> GetModifyHdl() const { return aModifyHdl; }
+ void SetModifyHdl( const Link<LinkParamNone*,void>& rLink ) { aModifyHdl = rLink; }
+ Link<LinkParamNone*,void> GetModifyHdl() const { return aModifyHdl; }
bool IsInSelectionMode() { return bInSelection; }
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 805e65188e4b..745c307985dc 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -108,12 +108,12 @@ sal_uLong Outliner::GetTextHeight() const
return pEditEngine->GetTextHeight();
}
-void Outliner::SetModifyHdl( const Link<>& rLink )
+void Outliner::SetModifyHdl( const Link<LinkParamNone*,void>& rLink )
{
pEditEngine->SetModifyHdl( rLink );
}
-Link<> Outliner::GetModifyHdl() const
+Link<LinkParamNone*,void> Outliner::GetModifyHdl() const
{
return pEditEngine->GetModifyHdl();
}
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 2bbe7f70d632..5d1aeccb4c79 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -552,7 +552,7 @@ namespace frm
}
- IMPL_LINK_NOARG( ORichTextModel, OnEngineContentModified )
+ IMPL_LINK_NOARG_TYPED( ORichTextModel, OnEngineContentModified, LinkParamNone*, void )
{
if ( !m_bSettingEngineText )
{
@@ -564,8 +564,6 @@ namespace frm
// On the other hand, the API *requires* us to notify changes in the "Text"
// property immediately ...
}
-
- return 0L;
}
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index c39edc98a964..ff0caf5ec23f 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -168,7 +168,7 @@ namespace frm
*/
void impl_smlock_setEngineText( const OUString& _rText );
- DECL_LINK( OnEngineContentModified, void* );
+ DECL_LINK_TYPED( OnEngineContentModified, LinkParamNone*, void );
static ::com::sun::star::uno::Sequence< sal_Int8 > getEditEngineTunnelId();
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 0e0c4becaaf6..bb4444b2bf1a 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -343,8 +343,8 @@ public:
void SetModified();
bool IsModified() const;
- void SetModifyHdl( const Link<>& rLink );
- Link<> GetModifyHdl() const;
+ void SetModifyHdl( const Link<LinkParamNone*,void>& rLink );
+ Link<LinkParamNone*,void> GetModifyHdl() const;
bool IsInSelectionMode() const;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 18d01e354452..78fd2dec88fa 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -775,8 +775,8 @@ public:
void SetPaintFirstLineHdl(const Link<PaintFirstLineInfo*,void>& rLink) { maPaintFirstLineHdl = rLink; }
- void SetModifyHdl( const Link<>& rLink );
- Link<> GetModifyHdl() const;
+ void SetModifyHdl( const Link<LinkParamNone*,void>& rLink );
+ Link<LinkParamNone*,void> GetModifyHdl() const;
void SetNotifyHdl( const Link<>& rLink );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 777c8b8fc7e6..6bb0d37b9fa4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2066,7 +2066,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView )
}
}
-IMPL_LINK_NOARG(ScInputHandler, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(ScInputHandler, ModifyHdl, LinkParamNone*, void)
{
if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) &&
pEngine && pEngine->GetUpdateMode() && pInputWin )
@@ -2081,7 +2081,6 @@ IMPL_LINK_NOARG(ScInputHandler, ModifyHdl)
lcl_RemoveTabs(aText);
pInputWin->SetTextString(aText);
}
- return 0;
}
/**
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6293db35be83..a717f00fdd38 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1238,10 +1238,9 @@ void ScMultiTextWnd::Resize()
SetScrollBarRange();
}
-IMPL_LINK(ScMultiTextWnd, ModifyHdl, EENotify*, pNotify)
+IMPL_LINK_NOARG_TYPED(ScMultiTextWnd, ModifyHdl, LinkParamNone*, void)
{
- ScTextWnd::NotifyHdl( pNotify );
- return 0;
+ ScTextWnd::NotifyHdl(nullptr);
}
IMPL_LINK_TYPED(ScMultiTextWnd, NotifyHdl, EENotify&, rNotify, void)
@@ -1816,7 +1815,7 @@ void ScTextWnd::StartEditEngine()
pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT );
}
-IMPL_LINK_NOARG(ScTextWnd, NotifyHdl)
+IMPL_LINK_NOARG_TYPED(ScTextWnd, NotifyHdl, LinkParamNone*, void)
{
if (pEditView && !bInputMode)
{
@@ -1828,8 +1827,6 @@ IMPL_LINK_NOARG(ScTextWnd, NotifyHdl)
if ( pHdl && !pHdl->IsInOwnChange() )
pHdl->InputChanged( pEditView, true ); // #i20282# InputChanged must know if called from modify handler
}
-
- return 0;
}
void ScTextWnd::StopEditEngine( bool bAll )
@@ -1846,7 +1843,7 @@ void ScTextWnd::StopEditEngine( bool bAll )
aString = pEditEngine->GetText();
bIsInsertMode = pEditView->IsInsertMode();
bool bSelection = pEditView->HasSelection();
- pEditEngine->SetModifyHdl(Link<>());
+ pEditEngine->SetModifyHdl(Link<LinkParamNone*,void>());
DELETEZ(pEditView);
DELETEZ(pEditEngine);
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index e53d7de3c16b..581cee95db7d 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -158,7 +158,7 @@ private:
void SkipClosingPar();
bool GetFuncName( OUString& aStart, OUString& aResult ); // fdo75264
void ShowArgumentsTip( OUString& rSelText );
- DECL_LINK( ModifyHdl, void* );
+ DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void );
DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* );
DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* );
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index e4b10edc5ae8..d1fb1a2f221e 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -67,7 +67,7 @@ public:
virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE;
virtual const OUString& GetTextString() const SAL_OVERRIDE;
- bool IsInputActive() SAL_OVERRIDE;
+ bool IsInputActive() SAL_OVERRIDE;
virtual EditView* GetEditView() SAL_OVERRIDE;
// for function autopilots
@@ -78,7 +78,7 @@ public:
virtual void TextGrabFocus() SAL_OVERRIDE;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual void SetFormulaMode( bool bSet ) SAL_OVERRIDE;
@@ -87,7 +87,7 @@ public:
virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE;
virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE;
- DECL_LINK( NotifyHdl, void* );
+ DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void );
protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
@@ -187,7 +187,7 @@ protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
- DECL_LINK( ModifyHdl, EENotify* );
+ DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void );
private:
ScInputBarGroup& mrGroupBar;
long mnLines;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 4cd50e15c22b..afc114cd7ee1 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -355,7 +355,7 @@ void AnnotationWindow::InitControls()
nCntrl |= EEControlBits::PASTESPECIAL | EEControlBits::AUTOCORRECT | EEControlBits::USECHARATTRIBS | EEControlBits::NOCOLORS;
mpOutliner->SetControlWord(nCntrl);
- Engine()->SetModifyHdl( Link<>() );
+ Engine()->SetModifyHdl( Link<LinkParamNone*,void>() );
Engine()->EnableUndo( false );
Engine()->ClearModifyFlag();
@@ -475,7 +475,7 @@ void AnnotationWindow::ResizeIfNecessary(long aOldHeight, long aNewHeight)
void AnnotationWindow::SetLanguage(const SvxLanguageItem &aNewItem)
{
- Engine()->SetModifyHdl( Link<>() );
+ Engine()->SetModifyHdl( Link<LinkParamNone*,void>() );
ESelection aOld = getView()->GetSelection();
ESelection aNewSelection( 0, 0, Engine()->GetParagraphCount()-1, EE_TEXTPOS_ALL );
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)
generated by cgit (git 2.34.1) at 2024-08-17 12:32:49 +0000