diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-28 12:07:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-28 21:32:33 +0200 |
commit | 32894034ea7b283d6c60cb77ef5d8b43a9c15d65 (patch) | |
tree | a210de631bfb7c824c8caaf71cab098358727b81 /editeng/source | |
parent | 977a676a718bfa682352d023420f4026ea9d7025 (diff) |
loplugin:constparams in editeng
Change-Id: Ice32a16d14d0132a19e8209d311bb799fd7ee0c8
Reviewed-on: https://gerrit.libreoffice.org/40526
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source')
24 files changed, 73 insertions, 76 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 71cf7d36f347..63fce03390de 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -953,7 +953,7 @@ void EditEngine::SetInSelectionMode(bool b) pImpEditEngine->bInSelection = b; } -bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, vcl::Window* pFrameWin ) +bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, vcl::Window const * pFrameWin ) { DBG_ASSERT( pEditView, "no View - no cookie !" ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 6ff7bd229ba3..4bcc257fc0e4 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -407,7 +407,7 @@ void EditView::InsertText( const OUString& rStr, bool bSelect ) pEE->FormatAndUpdate( this ); } -bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin ) +bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * pFrameWin ) { return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin ); } @@ -748,7 +748,7 @@ void EditView::TransliterateText( TransliterationFlags nTransliterationMode ) } } -void EditView::CompleteAutoCorrect( vcl::Window* pFrameWin ) +void EditView::CompleteAutoCorrect( vcl::Window const * pFrameWin ) { if ( !pImpEditView->HasSelection() && pImpEditView->pEditEngine->pImpEditEngine->GetStatus().DoAutoCorrect() ) { diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx index d2253d51e1ef..d986fa1f6e4e 100644 --- a/editeng/source/editeng/fieldupdater.cxx +++ b/editeng/source/editeng/fieldupdater.cxx @@ -23,7 +23,7 @@ class FieldUpdaterImpl { EditTextObjectImpl& mrObj; public: - explicit FieldUpdaterImpl(EditTextObject& rObj) : mrObj(*rObj.mpImpl) {} + explicit FieldUpdaterImpl(EditTextObject const & rObj) : mrObj(*rObj.mpImpl) {} FieldUpdaterImpl(const FieldUpdaterImpl& r) : mrObj(r.mrObj) {} void updateTableFields(int nTab) @@ -57,7 +57,7 @@ public: } }; -FieldUpdater::FieldUpdater(EditTextObject& rObj) : mpImpl(new FieldUpdaterImpl(rObj)) {} +FieldUpdater::FieldUpdater(EditTextObject const & rObj) : mpImpl(new FieldUpdaterImpl(rObj)) {} FieldUpdater::FieldUpdater(const FieldUpdater& r) : mpImpl(new FieldUpdaterImpl(*r.mpImpl)) {} FieldUpdater::~FieldUpdater() diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 565e8003d0aa..4f35f97227ce 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1207,7 +1207,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck ) return Pair( nRealDiffX, nRealDiffY ); } -bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin ) +bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * pFrameWin ) { bool bDone = false; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 3c7c02e699ba..ee05c3e176d6 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -295,7 +295,7 @@ public: bool IsVertical() const; bool IsTopToBottom() const; - bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * pFrameWin ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -788,7 +788,7 @@ public: EditPaM DeleteSelected(const EditSelection& rEditSelection); EditPaM InsertTextUserInput( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite ); EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr); - EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = nullptr ); + EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window const * pFrameWin = nullptr ); EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, DeleteMode nDelMode ); EditPaM InsertParaBreak(const EditSelection& rEditSelection); EditPaM InsertLineBreak(const EditSelection& aEditSelection); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 58c736dd4905..855eee4b40ba 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2503,7 +2503,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara ) } EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c, - bool bOverwrite, vcl::Window* pFrameWin ) + bool bOverwrite, vcl::Window const * pFrameWin ) { // i.e. Calc has special needs regarding a leading single quotation mark // when starting cell input. diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 80b45f47ef73..cad0f43c6070 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -896,13 +896,13 @@ void SvxNumRule::UnLinkGraphics() } } -SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) : +SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule) : SfxPoolItem(SID_ATTR_NUMBERING_RULE), pNumRule(new SvxNumRule(rRule)) { } -SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 _nWhich ) : +SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich), pNumRule(new SvxNumRule(rRule)) { diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 1736b80e741c..920c30f7f4fd 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::linguistic2; SfxSpellCheckItem::SfxSpellCheckItem ( - Reference< XSpellChecker1 > &xChecker, + Reference< XSpellChecker1 > const &xChecker, sal_uInt16 _nWhich ) : diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index b69640617565..b2bc8e52d056 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -30,7 +30,7 @@ SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( const css::uno::Reference< css::uno::XComponentContext > & xContext, const SvxAutocorrWordList * pNewAutocorr_List, const OUString &rFileName, - css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler) + css::uno::Reference< css::xml::sax::XDocumentHandler> const &rHandler) : SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ), pAutocorr_List( pNewAutocorr_List ) { @@ -74,7 +74,7 @@ SvXMLExceptionListExport::SvXMLExceptionListExport( const css::uno::Reference< css::uno::XComponentContext > & xContext, const SvStringsISortDtor &rNewList, const OUString &rFileName, - css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler) + css::uno::Reference< css::xml::sax::XDocumentHandler> const &rHandler) : SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ), rList( rNewList ) { diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 6c15f81ee913..b100212da5e6 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -34,7 +34,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, const SvxAutocorrWordList * pNewAutocorr_List, const OUString &rFileName, - css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> const &rHandler); ErrCode exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override; void ExportAutoStyles_() override {} @@ -53,7 +53,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, const SvStringsISortDtor &rNewList, const OUString &rFileName, - css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> const &rHandler); ErrCode exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override; void ExportAutoStyles_() override {} diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index a4db40002037..272a6388947a 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -154,7 +154,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, - Reference< XHyphenator > &xHyphenator, + Reference< XHyphenator > const &xHyphenator, const bool bStart, const bool bOther ) : pWin ( pWn ), xHyph ( xHyphenator ), diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 75528c98f1fa..3f52dec6ff34 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1234,7 +1234,7 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc const & rDoc, sal_Int32 nInsPo void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, sal_Int32 nInsPos, sal_Unicode cChar, - bool bInsert, vcl::Window* pFrameWin ) + bool bInsert, vcl::Window const * pFrameWin ) { bool bIsNextRun = bRunNext; bRunNext = false; // if it was set, then it has to be turned off @@ -1515,7 +1515,7 @@ bool SvxAutoCorrect::AddWrtSttException( const OUString& rNew, return pLists && pLists->AddToWrdSttExceptList(rNew); } -bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, +bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc const & rDoc, const OUString& rTxt, sal_Int32 nPos, OUString& rWord ) const { @@ -2048,7 +2048,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( const SvStringsISortDtor& rLst, const sal_Char* pStrmName, - tools::SvRef<SotStorage> &rStg, + tools::SvRef<SotStorage> const &rStg, bool bConvert ) { if( rStg.is() ) diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 7cf530d78aed..00d06a8c15fb 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -710,7 +710,7 @@ SvxAlternativeSpelling SvxGetAltSpelling( } -SvxDicListChgClamp::SvxDicListChgClamp( uno::Reference< XSearchableDictionaryList > &rxDicList ) : +SvxDicListChgClamp::SvxDicListChgClamp( uno::Reference< XSearchableDictionaryList > const &rxDicList ) : xDicList ( rxDicList ) { if (xDicList.is()) diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 88b853140ec9..c2b1881b8ada 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -228,17 +228,17 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz ) pEditEngine->SetMaxAutoPaperSize( rSz ); } -bool Outliner::IsExpanded( Paragraph* pPara ) const +bool Outliner::IsExpanded( Paragraph const * pPara ) const { return pParaList->HasVisibleChildren( pPara ); } -Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const +Paragraph* Outliner::GetParent( Paragraph const * pParagraph ) const { return pParaList->GetParent( pParagraph ); } -sal_Int32 Outliner::GetChildCount( Paragraph* pParent ) const +sal_Int32 Outliner::GetChildCount( Paragraph const * pParent ) const { return pParaList->GetChildCount( pParent ); } @@ -389,7 +389,7 @@ bool Outliner::SpellNextDocument() } -void Outliner::SetSpeller( Reference< XSpellChecker1 > &xSpeller ) +void Outliner::SetSpeller( Reference< XSpellChecker1 > const &xSpeller ) { pEditEngine->SetSpeller( xSpeller ); } @@ -403,7 +403,7 @@ void Outliner::SetForbiddenCharsTable(const std::shared_ptr<SvxForbiddenCharacte EditEngine::SetForbiddenCharsTable(xForbiddenChars); } -void Outliner::SetHyphenator( Reference< XHyphenator >& xHyph ) +void Outliner::SetHyphenator( Reference< XHyphenator > const & xHyph ) { pEditEngine->SetHyphenator( xHyph ); } @@ -581,17 +581,17 @@ bool Outliner::IsForceAutoColor() const return pEditEngine->IsForceAutoColor(); } -bool Outliner::SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill ) +bool Outliner::SpellSentence(EditView const & rEditView, svx::SpellPortions& rToFill ) { return pEditEngine->SpellSentence(rEditView, rToFill ); } -void Outliner::PutSpellingToSentenceStart( EditView& rEditView ) +void Outliner::PutSpellingToSentenceStart( EditView const & rEditView ) { pEditEngine->PutSpellingToSentenceStart( rEditView ); } -void Outliner::ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ) +void Outliner::ApplyChangedSentence(EditView const & rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ) { pEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck ); } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index f89d5895a89f..1eebaada0f55 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -746,7 +746,7 @@ void Outliner::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) pEditEngine->SetParaAttribs( nPara, rSet ); } -bool Outliner::Expand( Paragraph* pPara ) +bool Outliner::Expand( Paragraph const * pPara ) { if ( pParaList->HasHiddenChildren( pPara ) ) { @@ -770,7 +770,7 @@ bool Outliner::Expand( Paragraph* pPara ) return false; } -bool Outliner::Collapse( Paragraph* pPara ) +bool Outliner::Collapse( Paragraph const * pPara ) { if ( pParaList->HasVisibleChildren( pPara ) ) // expanded { @@ -1298,7 +1298,7 @@ size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex ) return ActualIndex; } -void Outliner::RemoveView( OutlinerView* pView ) +void Outliner::RemoveView( OutlinerView const * pView ) { for ( ViewList::iterator it = aViewList.begin(); it != aViewList.end(); ++it ) @@ -1355,7 +1355,7 @@ void Outliner::DepthChangedHdl(Paragraph* pPara, ParaFlag nPrevFlags) } -sal_Int32 Outliner::GetAbsPos( Paragraph* pPara ) +sal_Int32 Outliner::GetAbsPos( Paragraph const * pPara ) { DBG_ASSERT(pPara,"GetAbsPos:No Para"); return pParaList->GetAbsPos( pPara ); @@ -1371,7 +1371,7 @@ Paragraph* Outliner::GetParagraph( sal_Int32 nAbsPos ) const return pParaList->GetParagraph( nAbsPos ); } -bool Outliner::HasChildren( Paragraph* pParagraph ) const +bool Outliner::HasChildren( Paragraph const * pParagraph ) const { return pParaList->HasChildren( pParagraph ); } @@ -1491,7 +1491,7 @@ void Outliner::ParaAttribsChanged( sal_Int32 nPara ) ImplCalcBulletText(nPara, true, true); } -void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle ) +void Outliner::StyleSheetChanged( SfxStyleSheet const * pStyle ) { // The EditEngine calls StyleSheetChanged also for derived styles. @@ -1647,7 +1647,7 @@ EBulletInfo Outliner::GetBulletInfo( sal_Int32 nPara ) return aInfo; } -OUString Outliner::GetText( Paragraph* pParagraph, sal_Int32 nCount ) const +OUString Outliner::GetText( Paragraph const * pParagraph, sal_Int32 nCount ) const { OUString aText; @@ -1661,7 +1661,7 @@ OUString Outliner::GetText( Paragraph* pParagraph, sal_Int32 nCount ) const return aText; } -void Outliner::Remove( Paragraph* pPara, sal_Int32 nParaCount ) +void Outliner::Remove( Paragraph const * pPara, sal_Int32 nParaCount ) { sal_Int32 nPos = pParaList->GetAbsPos( pPara ); diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 170b786ba4d9..f99af1c63242 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -71,7 +71,7 @@ void OutlinerView::Paint( const tools::Rectangle& rRect, OutputDevice* pTargetDe pEditView->Paint( rRect, pTargetDevice ); } -bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin ) +bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFrameWin ) { // For the first Paint/KeyInput/Drop an empty Outliner is turned into // an Outliner with exactly one paragraph. @@ -366,7 +366,7 @@ void OutlinerView::ReleaseMouse() pEditView->ReleaseMouse(); } -void OutlinerView::ImpToggleExpand( Paragraph* pPara ) +void OutlinerView::ImpToggleExpand( Paragraph const * pPara ) { sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pPara ); pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) ); @@ -374,7 +374,7 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara ) pEditView->ShowCursor(); } -sal_Int32 OutlinerView::Select( Paragraph* pParagraph, bool bSelect ) +sal_Int32 OutlinerView::Select( Paragraph const * pParagraph, bool bSelect ) { sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pParagraph ); sal_Int32 nEnd = 0; @@ -1369,7 +1369,7 @@ bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIf return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong ); } -void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pStartDlg ) +void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void> const * pStartDlg ) { pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg ); } diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index 86a778bc81c4..d5c7c1592b1c 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -34,7 +34,7 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( css::uno::Reference< css::datatransfer::XTransferable > const & xOverflowingContent, Outliner *pOutl, - OutlinerParaObject *pNextPObj) + OutlinerParaObject const *pNextPObj) { if (!pNextPObj) { pOutl->SetToEmptyText(); @@ -69,7 +69,7 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( OutlinerParaObject *TextChainingUtils::DeeplyMergeParaObject( css::uno::Reference< css::datatransfer::XTransferable > const & xOverflowingContent, Outliner *pOutl, - OutlinerParaObject *pNextPObj) + OutlinerParaObject const *pNextPObj) { if (!pNextPObj) { pOutl->SetToEmptyText(); @@ -92,7 +92,7 @@ OutlinerParaObject *TextChainingUtils::DeeplyMergeParaObject( return pOutl->CreateParaObject(); } -css::uno::Reference< css::datatransfer::XTransferable > TextChainingUtils::CreateTransferableFromText(Outliner *pOutl) +css::uno::Reference< css::datatransfer::XTransferable > TextChainingUtils::CreateTransferableFromText(Outliner const *pOutl) { const EditEngine &rEditEngine = pOutl->GetEditEngine(); sal_Int32 nLastPara = pOutl->GetParagraphCount()-1; @@ -144,19 +144,19 @@ ESelection NonOverflowingText::GetOverflowPointSel() const // The equivalent of ToParaObject for OverflowingText. Here we are prepending the overflowing text to the old dest box's text // XXX: In a sense a better name for OverflowingText and NonOverflowingText are respectively DestLinkText and SourceLinkText -OutlinerParaObject *OverflowingText::JuxtaposeParaObject(Outliner *pOutl, OutlinerParaObject *pNextPObj) +OutlinerParaObject *OverflowingText::JuxtaposeParaObject(Outliner *pOutl, OutlinerParaObject const *pNextPObj) { return TextChainingUtils::JuxtaposeParaObject(mxOverflowingContent, pOutl, pNextPObj); } -OutlinerParaObject *OverflowingText::DeeplyMergeParaObject(Outliner *pOutl, OutlinerParaObject *pNextPObj) +OutlinerParaObject *OverflowingText::DeeplyMergeParaObject(Outliner *pOutl, OutlinerParaObject const *pNextPObj) { return TextChainingUtils::DeeplyMergeParaObject(mxOverflowingContent, pOutl, pNextPObj); } // class OFlowChainedText -OFlowChainedText::OFlowChainedText(Outliner *pOutl, bool bIsDeepMerge) +OFlowChainedText::OFlowChainedText(Outliner const *pOutl, bool bIsDeepMerge) { mpOverflowingTxt = pOutl->GetOverflowingText(); mpNonOverflowingTxt = pOutl->GetNonOverflowingText(); @@ -176,7 +176,7 @@ ESelection OFlowChainedText::GetOverflowPointSel() const return mpNonOverflowingTxt->GetOverflowPointSel(); } -OutlinerParaObject *OFlowChainedText::InsertOverflowingText(Outliner *pOutliner, OutlinerParaObject *pTextToBeMerged) +OutlinerParaObject *OFlowChainedText::InsertOverflowingText(Outliner *pOutliner, OutlinerParaObject const *pTextToBeMerged) { // Just return the roughly merged paras for now if (mpOverflowingTxt == nullptr) @@ -208,13 +208,13 @@ bool OFlowChainedText::IsLastParaInterrupted() const // classes UFlowChainedText -UFlowChainedText::UFlowChainedText(Outliner *pOutl, bool bIsDeepMerge) +UFlowChainedText::UFlowChainedText(Outliner const *pOutl, bool bIsDeepMerge) { mxUnderflowingTxt = TextChainingUtils::CreateTransferableFromText(pOutl); mbIsDeepMerge = bIsDeepMerge; } -OutlinerParaObject *UFlowChainedText::CreateMergedUnderflowParaObject(Outliner *pOutl, OutlinerParaObject *pNextLinkWholeText) +OutlinerParaObject *UFlowChainedText::CreateMergedUnderflowParaObject(Outliner *pOutl, OutlinerParaObject const *pNextLinkWholeText) { OutlinerParaObject *pNewText = nullptr; diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index 61251922d3bc..372706990e20 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -170,28 +170,28 @@ void ParagraphList::MoveParagraphs( sal_Int32 nStart, sal_Int32 nDest, sal_Int32 } } -bool ParagraphList::HasChildren( Paragraph* pParagraph ) const +bool ParagraphList::HasChildren( Paragraph const * pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); return pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ); } -bool ParagraphList::HasHiddenChildren( Paragraph* pParagraph ) const +bool ParagraphList::HasHiddenChildren( Paragraph const * pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); return pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible(); } -bool ParagraphList::HasVisibleChildren( Paragraph* pParagraph ) const +bool ParagraphList::HasVisibleChildren( Paragraph const * pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); return pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible(); } -sal_Int32 ParagraphList::GetChildCount( Paragraph* pParent ) const +sal_Int32 ParagraphList::GetChildCount( Paragraph const * pParent ) const { sal_Int32 nChildCount = 0; sal_Int32 n = GetAbsPos( pParent ); @@ -204,22 +204,19 @@ sal_Int32 ParagraphList::GetChildCount( Paragraph* pParent ) const return nChildCount; } -Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const +Paragraph* ParagraphList::GetParent( Paragraph const * pParagraph ) const { - /* rRelPos = 0 */; sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pPrev = GetParagraph( --n ); while ( pPrev && ( pPrev->GetDepth() >= pParagraph->GetDepth() ) ) { -// if ( pPrev->GetDepth() == pParagraph->GetDepth() ) -// rRelPos++; pPrev = GetParagraph( --n ); } return pPrev; } -void ParagraphList::Expand( Paragraph* pParent ) +void ParagraphList::Expand( Paragraph const * pParent ) { sal_Int32 nChildCount = GetChildCount( pParent ); sal_Int32 nPos = GetAbsPos( pParent ); @@ -235,7 +232,7 @@ void ParagraphList::Expand( Paragraph* pParent ) } } -void ParagraphList::Collapse( Paragraph* pParent ) +void ParagraphList::Collapse( Paragraph const * pParent ) { sal_Int32 nChildCount = GetChildCount( pParent ); sal_Int32 nPos = GetAbsPos( pParent ); @@ -251,7 +248,7 @@ void ParagraphList::Collapse( Paragraph* pParent ) } } -sal_Int32 ParagraphList::GetAbsPos( Paragraph* pParent ) const +sal_Int32 ParagraphList::GetAbsPos( Paragraph const * pParent ) const { sal_Int32 pos = 0; std::vector<Paragraph*>::const_iterator iter; diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index abadc15b365e..b557629dee18 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -50,21 +50,21 @@ public: return 0 <= nPos && static_cast<size_t>(nPos) < maEntries.size() ? maEntries[nPos] : nullptr; } - sal_Int32 GetAbsPos( Paragraph* pParent ) const; + sal_Int32 GetAbsPos( Paragraph const * pParent ) const; void Append( Paragraph *pPara); void Insert( Paragraph* pPara, sal_Int32 nAbsPos); void Remove( sal_Int32 nPara ); void MoveParagraphs( sal_Int32 nStart, sal_Int32 nDest, sal_Int32 nCount ); - Paragraph* GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const; - bool HasChildren( Paragraph* pParagraph ) const; - bool HasHiddenChildren( Paragraph* pParagraph ) const; - bool HasVisibleChildren( Paragraph* pParagraph ) const; - sal_Int32 GetChildCount( Paragraph* pParagraph ) const; + Paragraph* GetParent( Paragraph const * pParagraph ) const; + bool HasChildren( Paragraph const * pParagraph ) const; + bool HasHiddenChildren( Paragraph const * pParagraph ) const; + bool HasVisibleChildren( Paragraph const * pParagraph ) const; + sal_Int32 GetChildCount( Paragraph const * pParagraph ) const; - void Expand( Paragraph* pParent ); - void Collapse( Paragraph* pParent ); + void Expand( Paragraph const * pParent ); + void Collapse( Paragraph const * pParent ); void SetVisibleStateChangedHdl( const Link<Paragraph&,void>& rLink ) { aVisibleStateChangedHdl = rLink; } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index f2369ad69580..b6d6da1dfb79 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -209,7 +209,7 @@ static util::DateTime getTime(sal_Int64 const nTime) return aTime; } -inline tools::Time setTime( util::DateTime& rDate ) +inline tools::Time setTime( util::DateTime const & rDate ) { return tools::Time( rDate ); } diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 2d18e32c3a33..652c44847497 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -161,7 +161,7 @@ void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, sal_Int32 rEditEngine.FieldClicked( rField, nPara, nPos ); } -SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ) +SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ) { std::vector<EECharAttrib> aAttribs; diff --git a/editeng/source/uno/unofored_internal.hxx b/editeng/source/uno/unofored_internal.hxx index 4702e7692397..34eb96903dba 100644 --- a/editeng/source/uno/unofored_internal.hxx +++ b/editeng/source/uno/unofored_internal.hxx @@ -21,7 +21,7 @@ #define INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX -SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ); +SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ); #endif // INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index e5f6275c13b3..64336df2d146 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -241,7 +241,7 @@ bool SvxOutlinerForwarder::IsValid() const SfxItemState SvxOutlinerForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const { - return GetSvxEditEngineItemState( const_cast<EditEngine&>(rOutliner.GetEditEngine()), rSel, nWhich ); + return GetSvxEditEngineItemState( rOutliner.GetEditEngine(), rSel, nWhich ); } SfxItemState SvxOutlinerForwarder::GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index dcfdd72eace9..6b209a6f2121 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -132,7 +132,7 @@ const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() // helper for Item/Property conversion -void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw() +void GetSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarder ) throw() { DBG_ASSERT( pForwarder, "I need a valid SvxTextForwarder!" ); if( pForwarder ) @@ -145,7 +145,7 @@ void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw } } -void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw() +void CheckSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarder ) throw() { DBG_ASSERT( pForwarder, "I need a valid SvxTextForwarder!" ); if( pForwarder ) @@ -666,7 +666,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM } } -bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) +bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) { switch( pMap->nWID ) { |