summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/impedit.hxx36
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/outliner/outlin2.cxx4
-rw-r--r--forms/source/richtext/richtextengine.cxx5
-rw-r--r--forms/source/richtext/richtextengine.hxx2
-rw-r--r--include/editeng/editeng.hxx4
-rw-r--r--include/editeng/outliner.hxx4
-rw-r--r--include/svx/svdedxv.hxx4
-rw-r--r--sc/source/ui/inc/viewdata.hxx3
-rw-r--r--sc/source/ui/view/gridwin.cxx8
-rw-r--r--sc/source/ui/view/viewdata.cxx12
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/source/core/drawdoc4.cxx8
-rw-r--r--sd/source/ui/func/fuinsfil.cxx4
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/outlview.cxx15
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/source/edit.cxx15
-rw-r--r--svx/source/svdraw/svdedxv.cxx5
21 files changed, 63 insertions, 84 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 2449258d24f8..1efd13b63ec5 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1508,12 +1508,12 @@ Link<> EditEngine::GetNotifyHdl() const
return pImpEditEngine->GetNotifyHdl();
}
-void EditEngine::SetStatusEventHdl( const Link<>& rLink )
+void EditEngine::SetStatusEventHdl( const Link<EditStatus&, void>& rLink )
{
pImpEditEngine->SetStatusEventHdl( rLink );
}
-Link<> EditEngine::GetStatusEventHdl() const
+Link<EditStatus&, void> EditEngine::GetStatusEventHdl() const
{
return pImpEditEngine->GetStatusEventHdl();
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 91d5b499c7c3..04adb48ddb01 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -479,7 +479,7 @@ private:
// If it is detected at one point that the StatusHdl has to be called, but
// this should not happen immediately (critical section):
Timer aStatusTimer;
- Link<> aStatusHdlLink;
+ Link<EditStatus&, void> aStatusHdlLink;
Link<> aNotifyHdl;
Link<> aImportHdl;
Link<> aBeginMovingParagraphsHdl;
@@ -835,8 +835,8 @@ public:
EditPaM InsertParagraph( sal_Int32 nPara );
EditSelection* SelectParagraph( sal_Int32 nPara );
- void SetStatusEventHdl( const Link<>& rLink ) { aStatusHdlLink = rLink; }
- Link<> GetStatusEventHdl() const { return aStatusHdlLink; }
+ void SetStatusEventHdl( const Link<EditStatus&, void>& rLink ) { aStatusHdlLink = rLink; }
+ Link<EditStatus&, void> GetStatusEventHdl() const { return aStatusHdlLink; }
void SetNotifyHdl( const Link<>& rLink ) { aNotifyHdl = rLink; }
Link<> GetNotifyHdl() const { return aNotifyHdl; }
@@ -848,11 +848,11 @@ public:
bool IsVisualCursorTravelingEnabled();
bool DoVisualCursorTraveling( const ContentNode* pNode );
- EditSelection ConvertSelection( sal_Int32 nStartPara, sal_Int32 nStartPos, sal_Int32 nEndPara, sal_Int32 nEndPos );
- inline EPaM CreateEPaM( const EditPaM& rPaM );
- inline EditPaM CreateEditPaM( const EPaM& rEPaM );
- inline ESelection CreateESel( const EditSelection& rSel );
- inline EditSelection CreateSel( const ESelection& rSel );
+ EditSelection ConvertSelection( sal_Int32 nStartPara, sal_Int32 nStartPos, sal_Int32 nEndPara, sal_Int32 nEndPos );
+ inline EPaM CreateEPaM( const EditPaM& rPaM );
+ inline EditPaM CreateEditPaM( const EPaM& rEPaM );
+ inline ESelection CreateESel( const EditSelection& rSel );
+ inline EditSelection CreateSel( const ESelection& rSel );
void SetStyleSheetPool( SfxStyleSheetPool* pSPool );
@@ -861,7 +861,7 @@ public:
void SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle );
void SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle );
const SfxStyleSheet* GetStyleSheet( sal_Int32 nPara ) const;
- SfxStyleSheet* GetStyleSheet( sal_Int32 nPara );
+ SfxStyleSheet* GetStyleSheet( sal_Int32 nPara );
void UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle );
void RemoveStyleFromParagraphs( SfxStyleSheet* pStyle );
@@ -910,7 +910,7 @@ public:
void DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, bool bSpellAtCursorPos = false, bool bInteruptable = true );
EESpellState Spell( EditView* pEditView, bool bMultipleDoc );
EESpellState HasSpellErrors();
- void ClearSpellErrors();
+ void ClearSpellErrors();
EESpellState StartThesaurus( EditView* pEditView );
css::uno::Reference< css::linguistic2::XSpellAlternatives >
ImpSpell( EditView* pEditView );
@@ -926,11 +926,11 @@ public:
const vcl::Font *pFont, sal_uInt16 nFontWhichId );
// returns true if input sequence checking should be applied
- bool IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const;
+ bool IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const;
//find the next error within the given selection - forward only!
css::uno::Reference< css::linguistic2::XSpellAlternatives >
- ImpFindNextError(EditSelection& rSelection);
+ ImpFindNextError(EditSelection& rSelection);
//spell and return a sentence
bool SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking );
//put spelling back to start of current sentence - needed after switch of grammar support
@@ -950,13 +950,13 @@ public:
svx::SpellPortions& rToFill,
bool bIsField );
- bool Search( const SvxSearchItem& rSearchItem, EditView* pView );
- bool ImpSearch( const SvxSearchItem& rSearchItem, const EditSelection& rSearchSelection, const EditPaM& rStartPos, EditSelection& rFoundSel );
- sal_Int32 StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem );
- bool HasText( const SvxSearchItem& rSearchItem );
+ bool Search( const SvxSearchItem& rSearchItem, EditView* pView );
+ bool ImpSearch( const SvxSearchItem& rSearchItem, const EditSelection& rSearchSelection, const EditPaM& rStartPos, EditSelection& rFoundSel );
+ sal_Int32 StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem );
+ bool HasText( const SvxSearchItem& rSearchItem );
- void SetEditTextObjectPool( SfxItemPool* pP ) { pTextObjectPool = pP; }
- SfxItemPool* GetEditTextObjectPool() const { return pTextObjectPool; }
+ void SetEditTextObjectPool( SfxItemPool* pP ) { pTextObjectPool = pP; }
+ SfxItemPool* GetEditTextObjectPool() const { return pTextObjectPool; }
const SvxNumberFormat * GetNumberFormat( const ContentNode* pNode ) const;
sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index e5f10c0d9a9b..1b2c779a5221 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4024,7 +4024,7 @@ void ImpEditEngine::CallStatusHdl()
// since other Flags might be set in the handler...
EditStatus aTmpStatus( aStatus );
aStatus.Clear();
- aStatusHdlLink.Call( &aTmpStatus );
+ aStatusHdlLink.Call( aTmpStatus );
aStatusTimer.Stop(); // If called by hand ...
}
}
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 3c79be03dbc3..e4e55ac968b0 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -129,12 +129,12 @@ void Outliner::SetNotifyHdl( const Link<>& rLink )
}
-void Outliner::SetStatusEventHdl( const Link<>& rLink )
+void Outliner::SetStatusEventHdl( const Link<EditStatus&, void>& rLink )
{
pEditEngine->SetStatusEventHdl( rLink );
}
-Link<> Outliner::GetStatusEventHdl() const
+Link<EditStatus&, void> Outliner::GetStatusEventHdl() const
{
return pEditEngine->GetStatusEventHdl();
}
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 3d4ebcdd4d9a..b04e121abaeb 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -131,14 +131,13 @@ namespace frm
}
- IMPL_LINK( RichTextEngine, EditEngineStatusChanged, EditStatus*, _pStatus )
+ IMPL_LINK_TYPED( RichTextEngine, EditEngineStatusChanged, EditStatus&, _rStatus, void )
{
for ( ::std::vector< IEngineStatusListener* >::const_iterator aLoop = m_aStatusListeners.begin();
aLoop != m_aStatusListeners.end();
++aLoop
)
- (*aLoop)->EditEngineStatusChanged( *_pStatus );
- return 0L;
+ (*aLoop)->EditEngineStatusChanged( _rStatus );
}
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index 3c32ece9c9c5..98ddf5e3d242 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -67,7 +67,7 @@ namespace frm
RichTextEngine& operator=( const RichTextEngine& ) SAL_DELETED_FUNCTION;
private:
- DECL_LINK( EditEngineStatusChanged, EditStatus* );
+ DECL_LINK_TYPED( EditEngineStatusChanged, EditStatus&, void );
};
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 11e81cd235d0..8f2bc4a411de 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -366,8 +366,8 @@ public:
sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
sal_uLong Write( SvStream& rOutput, EETextFormat );
- void SetStatusEventHdl( const Link<>& rLink );
- Link<> GetStatusEventHdl() const;
+ void SetStatusEventHdl( const Link<EditStatus&, void>& rLink );
+ Link<EditStatus&, void> GetStatusEventHdl() const;
void SetNotifyHdl( const Link<>& rLink );
Link<> GetNotifyHdl() const;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 900df4b7e92b..8c60669628f8 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -780,8 +780,8 @@ public:
void SetNotifyHdl( const Link<>& rLink );
- void SetStatusEventHdl( const Link<>& rLink );
- Link<> GetStatusEventHdl() const;
+ void SetStatusEventHdl( const Link<EditStatus&, void>& rLink );
+ Link<EditStatus&, void> GetStatusEventHdl() const;
void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index a34b9a8e7551..5dc3514ad659 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -115,8 +115,8 @@ protected:
void ImpMakeTextCursorAreaVisible();
// handler for AutoGrowing text with active Outliner
- DECL_LINK(ImpOutlinerStatusEventHdl,EditStatus*);
- DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void);
+ DECL_LINK_TYPED(ImpOutlinerStatusEventHdl, EditStatus&, void);
+ DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void);
// link for EndTextEditHdl
DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void);
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 46af42032740..39fb5b2e151d 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -211,8 +211,7 @@ private:
bool bPagebreak:1; // Page break preview mode
bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click
- DECL_DLLPRIVATE_STATIC_LINK (ScViewData, EmptyEditHdl, void*);
- DECL_DLLPRIVATE_LINK (EditEngineHdl, EditStatus*);
+ DECL_DLLPRIVATE_LINK_TYPED( EditEngineHdl, EditStatus&, void );
SAL_DLLPRIVATE void CalcPPT();
SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1dbe3062e3d2..006c00c2a385 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5591,16 +5591,14 @@ struct SpellCheckStatus
SpellCheckStatus() : mbModified(false) {};
- DECL_LINK (EventHdl, EditStatus*);
+ DECL_LINK_TYPED( EventHdl, EditStatus&, void );
};
-IMPL_LINK(SpellCheckStatus, EventHdl, EditStatus*, pStatus)
+IMPL_LINK_TYPED(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void)
{
- EditStatusFlags nStatus = pStatus->GetStatusWord();
+ EditStatusFlags nStatus = rStatus.GetStatusWord();
if (nStatus & EditStatusFlags::WRONGWORDCHANGED)
mbModified = true;
-
- return 0;
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 1e64916a71c2..a789d7c69ce9 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1100,14 +1100,9 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
// needed, wenn position changed
}
-IMPL_STATIC_LINK_NOARG(ScViewData, EmptyEditHdl)
+IMPL_LINK_TYPED( ScViewData, EditEngineHdl, EditStatus&, rStatus, void )
{
- return 0;
-}
-
-IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus )
-{
- EditStatusFlags nStatus = pStatus->GetStatusWord();
+ EditStatusFlags nStatus = rStatus.GetStatusWord();
if (nStatus & (EditStatusFlags::HSCROLL | EditStatusFlags::TEXTHEIGHTCHANGED | EditStatusFlags::TEXTWIDTHCHANGED | EditStatusFlags::CURSOROUT))
{
EditGrowY();
@@ -1120,7 +1115,6 @@ IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus )
pEditView[eWhich]->ShowCursor(false);
}
}
- return 0;
}
void ScViewData::EditGrowX()
@@ -1401,7 +1395,7 @@ void ScViewData::ResetEditView()
}
if (pEngine)
- pEngine->SetStatusEventHdl( LINK( this, ScViewData, EmptyEditHdl ) );
+ pEngine->SetStatusEventHdl( Link<EditStatus&,void>() );
}
void ScViewData::KillEditView()
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index df9597191b83..a3b4690190a3 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -191,7 +191,7 @@ private:
DECL_DLLPRIVATE_LINK_TYPED(WorkStartupHdl, Timer *, void);
DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellingHdl, Idle *, void);
- DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus*);
+ DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellEventHdl, EditStatus&, void);
std::vector< OUString > maAnnotationAuthors;
std::vector<com::sun::star::uno::Reference<
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 2f38ed533e14..3121a1aa3e2f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -882,7 +882,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
mbHasOnlineSpellErrors = false;
::sd::Outliner* pOutl = GetInternalOutliner();
pOutl->SetUpdateMode(true);
- Link<> aEvtHdl = pOutl->GetStatusEventHdl();
+ Link<EditStatus&,void> aEvtHdl = pOutl->GetStatusEventHdl();
pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl));
sal_uInt16 nOldOutlMode = pOutl->GetMode();
@@ -955,12 +955,10 @@ void SdDrawDocument::RemoveObject(SdrObject* pObj, SdPage* /*pPage*/)
}
// Callback for ExecuteSpellPopup()
-IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat)
+IMPL_LINK_TYPED(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void)
{
- EditStatusFlags nStat = pEditStat->GetStatusWord();
+ EditStatusFlags nStat = rEditStat.GetStatusWord();
mbHasOnlineSpellErrors = bool(nStat & EditStatusFlags::WRONGWORDCHANGED);
-
- return 0;
}
// Callback for ExecuteSpellPopup()
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 9359bf493ed8..991d4f88b871 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -705,8 +705,8 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
Link<::Outliner*,void> aOldEndMovingHdl = pOutliner->GetEndMovingHdl();
pOutliner->SetEndMovingHdl( Link<::Outliner*,void>());
- Link<> aOldStatusEventHdl = pOutliner->GetStatusEventHdl();
- pOutliner->SetStatusEventHdl(Link<>());
+ Link<EditStatus&,void> aOldStatusEventHdl = pOutliner->GetStatusEventHdl();
+ pOutliner->SetStatusEventHdl(Link<EditStatus&,void>());
pOutliner->Clear();
pOlView->FillOutliner();
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 0daad3da8f18..03d58c596cb9 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -98,7 +98,7 @@ public:
DECL_LINK_TYPED( ParagraphInsertedHdl, Outliner *, void );
DECL_LINK_TYPED( ParagraphRemovingHdl, Outliner *, void );
DECL_LINK_TYPED( DepthChangedHdl, Outliner *, void );
- DECL_LINK( StatusEventHdl, void * );
+ DECL_LINK_TYPED( StatusEventHdl, EditStatus&, void );
DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void );
DECL_LINK_TYPED( EndMovingHdl, Outliner *, void );
DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f0b35ed7f0cf..c1964def738c 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -306,7 +306,7 @@ void Outliner::EndSpelling()
bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell));
if (bViewIsDrawViewShell)
{
- SetStatusEventHdl(Link<>());
+ SetStatusEventHdl(Link<EditStatus&,void>());
mpView = pViewShell->GetView();
mpView->UnmarkAllObj (mpView->GetSdrPageView());
mpView->SdrEndTextEdit();
@@ -741,7 +741,7 @@ void Outliner::DetectChange()
|| aPosition.mePageKind != pDrawViewShell->GetPageKind()))
{
// Either the edit mode or the page kind has changed.
- SetStatusEventHdl(Link<>());
+ SetStatusEventHdl(Link<EditStatus&,void>());
SdrPageView* pPageView = mpView->GetSdrPageView();
if (pPageView != NULL)
@@ -1193,7 +1193,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
// Restore old edit mode.
pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, false);
- SetStatusEventHdl(Link<>());
+ SetStatusEventHdl(Link<EditStatus&,void>());
OUString sViewURL;
switch (ePageKind)
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 17fe87548108..1ad94d2b1132 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -774,14 +774,14 @@ IMPL_LINK_TYPED( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void )
/**
* Handler for StatusEvents
*/
-IMPL_LINK_NOARG(OutlineView, StatusEventHdl)
+IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void)
{
::sd::Window* pWin = mrOutlineViewShell.GetActiveWindow();
OutlinerView* pOutlinerView = GetViewByWindow(pWin);
- Rectangle aVis = pOutlinerView->GetVisArea();
- Rectangle aText = Rectangle(Point(0,0),
- Size(mnPaperWidth,
- mrOutliner.GetTextHeight()));
+ Rectangle aVis = pOutlinerView->GetVisArea();
+ Rectangle aText = Rectangle(Point(0,0),
+ Size(mnPaperWidth,
+ mrOutliner.GetTextHeight()));
Rectangle aWin(Point(0,0), pWin->GetOutputSizePixel());
aWin = pWin->PixelToLogic(aWin);
@@ -794,8 +794,6 @@ IMPL_LINK_NOARG(OutlineView, StatusEventHdl)
Point(aVis.TopLeft()));
mrOutlineViewShell.UpdateScrollBars();
}
-
- return 0;
}
IMPL_LINK_NOARG(OutlineView, BeginDropHdl)
@@ -1363,13 +1361,12 @@ void OutlineView::SetLinks()
*/
void OutlineView::ResetLinks() const
{
- Link<> aEmptyLink;
mrOutliner.SetParaInsertedHdl(Link<::Outliner*,void>());
mrOutliner.SetParaRemovingHdl(Link<::Outliner*,void>());
mrOutliner.SetDepthChangedHdl(Link<::Outliner*,void>());
mrOutliner.SetBeginMovingHdl(Link<::Outliner*,void>());
mrOutliner.SetEndMovingHdl(Link<::Outliner*,void>());
- mrOutliner.SetStatusEventHdl(aEmptyLink);
+ mrOutliner.SetStatusEventHdl(Link<EditStatus&,void>());
mrOutliner.SetRemovingPagesHdl(Link<OutlinerView*,bool>());
mrOutliner.SetIndentingPagesHdl(Link<OutlinerView*,bool>());
mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b277bcdd3ba0..a672ad6d74e6 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -72,7 +72,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
- DECL_LINK(EditStatusHdl ,EditStatus *);
+ DECL_LINK_TYPED(EditStatusHdl, EditStatus&, void);
DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
void CreateEditView();
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 4996e44579b3..d7d7d0e2e805 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -141,7 +141,7 @@ void SmEditWindow::dispose()
EditEngine *pEditEngine = pEditView->GetEditEngine();
if (pEditEngine)
{
- pEditEngine->SetStatusEventHdl( Link<>() );
+ pEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() );
pEditEngine->RemoveView( pEditView.get() );
}
pEditView.reset();
@@ -570,15 +570,10 @@ void SmEditWindow::CreateEditView()
}
-IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, /*pStat*/ )
+IMPL_LINK_NOARG_TYPED( SmEditWindow, EditStatusHdl, EditStatus&, void )
{
- if (!pEditView)
- return 1;
- else
- {
+ if (pEditView)
Resize();
- return 0;
- }
}
IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
@@ -718,7 +713,7 @@ void SmEditWindow::LoseFocus()
{
EditEngine *pEditEngine = GetEditEngine();
if (pEditEngine)
- pEditEngine->SetStatusEventHdl( Link<>() );
+ pEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() );
Window::LoseFocus();
@@ -1099,7 +1094,7 @@ void SmEditWindow::DeleteEditView( SmViewShell & /*rView*/ )
std::unique_ptr<EditEngine> xEditEngine(pEditView->GetEditEngine());
if (xEditEngine)
{
- xEditEngine->SetStatusEventHdl( Link<>() );
+ xEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() );
xEditEngine->RemoveView( pEditView.get() );
}
pEditView.reset();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ececaa6cace3..29b1b9b40c05 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -476,17 +476,16 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
return pOutlView;
}
-IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat)
+IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerStatusEventHdl, EditStatus&, rEditStat, void)
{
if(pTextEditOutliner )
{
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
if( pTextObj )
{
- pTextObj->onEditOutlinerStatusEvent( pEditStat );
+ pTextObj->onEditOutlinerStatusEvent( &rEditStat );
}
}
- return 0;
}
IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void)
generated by cgit (git 2.34.1) at 2025-02-10 02:05:26 +0000