diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
commit | 69a06ca6bf45c4e2aceb06262bfa1e7be6f565e8 (patch) | |
tree | ad1d1e4c9c72fac1ef620e26b865d4001a538df1 /editeng | |
parent | d30aedb2a381e89a5a3466f06c95ff7636c9306d (diff) |
convert Link<> to typed
Change-Id: I9ce05712af8300c8bcea6ea0f670b57cce1ca43d
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 36 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlin2.cxx | 4 |
4 files changed, 23 insertions, 23 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(); } |