diff options
27 files changed, 66 insertions, 64 deletions
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx index 54501dc527db..b79d9cd27ebf 100644 --- a/compilerplugins/clang/constparams.cxx +++ b/compilerplugins/clang/constparams.cxx @@ -161,6 +161,8 @@ bool ConstParams::VisitFunctionDecl(const FunctionDecl * functionDecl) || name == "PyUNO_setattr" || name == "PyUNOStruct_setattr" || name == "PyUNOStruct_getattr" + || name == "GoNext" + || name == "GoPrevious" // #ifdef win32 || name == "convert_slashes" // UNO component entry points diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 177bcddc2906..04460b165fb3 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -43,7 +43,7 @@ namespace ooo namespace vba { - inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell ) + inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell const * pShell ) { css::uno::Any aUnoVar; if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) ) @@ -53,7 +53,7 @@ namespace ooo } /// @throws css::uno::Exception - inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) + inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell const * pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) { OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); @@ -62,7 +62,7 @@ namespace ooo } - inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType ) + inline bool isAlienDoc( SfxObjectShell const & rDocShell, const char* pMimeType ) { bool bRes( false ); const SfxMedium *pMedium = rDocShell.GetMedium(); @@ -71,10 +71,10 @@ namespace ooo bRes = pFilt->GetMimeType().equalsAscii( pMimeType ); return bRes; } - inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); } + inline bool isAlienExcelDoc( SfxObjectShell const & rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); } //VBAHELPER_DLLPRIVATE inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-word" ); } // word seems to return an erroneous mime type :-/ "application/msword" not consistent with the excel one - inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/msword" ); } + inline bool isAlienWordDoc( SfxObjectShell const & rDocShell ) { return isAlienDoc( rDocShell, "application/msword" ); } } // openoffice } // org diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index c6f3380cceee..a5bd797a24a1 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -204,7 +204,7 @@ public: static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal ); static bool Str2Double( const OUString& rStr, sal_Int32& rPos, - double& rVal, SwDoc *const pDoc ); + double& rVal, SwDoc const *const pDoc ); SW_DLLPUBLIC static bool IsValidVarName( const OUString& rStr, OUString* pValidName = nullptr ); diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 803dc0729a9b..e8aa8f605245 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -68,7 +68,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos); SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam); SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum); SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo); -SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes); +SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes const & rNodes); SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule); SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat); SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 591b730fde30..0053e1efddf5 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -910,7 +910,7 @@ public: void ChgPageDesc( size_t i, const SwPageDesc& ); void DelPageDesc( const OUString & rName, bool bBroadcast = false); void DelPageDesc( size_t i, bool bBroadcast = false ); - void PreDelPageDesc(SwPageDesc * pDel); + void PreDelPageDesc(SwPageDesc const * pDel); SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr, bool bRegardLanguage = true, bool bBroadcast = false); @@ -1580,7 +1580,7 @@ public: bool IsSquaredPageMode() const; css::uno::Reference< css::script::vba::XVBAEventProcessor > const & GetVbaEventProcessor(); - void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; }; + void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer > const & xCache ) { m_xTemplateToProjectCache = xCache; }; const css::uno::Reference< css::container::XNameContainer >& GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); ::sw::MetaFieldManager & GetMetaFieldManager(); @@ -1646,7 +1646,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet ) mbAllOLENotify = false; } -bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, SetGetExpFields * pSrtLst ); +bool sw_GetPostIts( IDocumentFieldsAccess const * pIDFA, SetGetExpFields * pSrtLst ); #endif //_DOC_HXX diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 766cf14a2144..0830368fc330 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -243,16 +243,16 @@ public: aTableConfig.SetModified();} const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; } - void SetInsertAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aInsertAttr = rAttr; - aRevisionConfig.SetModified();} + void SetInsertAuthorAttr( AuthorCharAttr const &rAttr ) { aRevisionConfig.aInsertAttr = rAttr; + aRevisionConfig.SetModified();} const AuthorCharAttr &GetDeletedAuthorAttr() const { return aRevisionConfig.aDeletedAttr; } - void SetDeletedAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aDeletedAttr = rAttr; - aRevisionConfig.SetModified();} + void SetDeletedAuthorAttr( AuthorCharAttr const &rAttr ) { aRevisionConfig.aDeletedAttr = rAttr; + aRevisionConfig.SetModified();} const AuthorCharAttr &GetFormatAuthorAttr() const { return aRevisionConfig.aFormatAttr; } - void SetFormatAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aFormatAttr = rAttr; - aRevisionConfig.SetModified();} + void SetFormatAuthorAttr( AuthorCharAttr const &rAttr ) { aRevisionConfig.aFormatAttr = rAttr; + aRevisionConfig.SetModified();} sal_uInt16 GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; } void SetMarkAlignMode(sal_uInt16 nMode) { aRevisionConfig.nMarkAlign = nMode; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 66cac16a38e7..51c716d85a5a 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -112,7 +112,7 @@ public: inline sal_uLong GetIndex() const; // Enables assignments without creation of a temporary object. - inline SwNodeIndex& Assign( SwNodes& rNds, sal_uLong ); + inline SwNodeIndex& Assign( SwNodes const & rNds, sal_uLong ); inline SwNodeIndex& Assign( const SwNode& rNd, long nOffset = 0 ); // Gets pointer on NodesArray. @@ -272,7 +272,7 @@ SwNodeIndex& SwNodeIndex::operator=( const SwNode& rNd ) return *this; } -SwNodeIndex& SwNodeIndex::Assign( SwNodes& rNds, sal_uLong nIdx ) +SwNodeIndex& SwNodeIndex::Assign( SwNodes const & rNds, sal_uLong nIdx ) { *this = *rNds[ nIdx ]; return *this; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 401ab4549001..379a88506148 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -139,7 +139,7 @@ public: bool GoEndWord(); bool GoNextWord(); bool GoPrevWord(); - bool SelectWord( SwViewShell* pViewShell, const Point* pPt ); + bool SelectWord( SwViewShell const * pViewShell, const Point* pPt ); // API versions of above functions (will be used with a different // WordType for the break iterator) @@ -150,7 +150,7 @@ public: bool GoEndWordWT( sal_Int16 nWordType ); bool GoNextWordWT( sal_Int16 nWordType ); bool GoPrevWordWT( sal_Int16 nWordType ); - bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt ); + bool SelectWordWT( SwViewShell const * pViewShell, sal_Int16 nWordType, const Point* pPt ); enum SentenceMoveType { @@ -167,7 +167,7 @@ public: virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden, bool bInsertCursor ); - bool UpDown( bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ); + bool UpDown( bool bUp, sal_uInt16 nCnt, Point const * pPt, long nUpDownX ); bool LeftRightMargin( bool bLeftMargin, bool bAPI ); bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI ) const; bool SttEndDoc( bool bSttDoc ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 1bb138a889f5..eb020b478787 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -305,7 +305,7 @@ public: void SetSnap( bool b ) { b ? (m_nCoreOptions |= ViewOptFlags1::Snap ) : ( m_nCoreOptions &= ~ViewOptFlags1::Snap); } - void SetSnapSize( Size &rSz ){ m_aSnapSize = rSz; } + void SetSnapSize( Size const &rSz ){ m_aSnapSize = rSz; } const Size &GetSnapSize() const { return m_aSnapSize; } bool IsGridVisible() const diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index e0d8e7073cb2..716e44289af2 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -56,7 +56,7 @@ public: bool IsVisible() const { return m_bIsVisible; } void SetDragCursor( bool bFlag = true ) { m_bIsDragCursor = bFlag; } - void SetPosAndShow(SfxViewShell* pViewShell); + void SetPosAndShow(SfxViewShell const * pViewShell); }; // From here classes/methods for selections. @@ -137,7 +137,7 @@ public: /// @see SwSelPaintRects::FillStartEnd(), override for text selections. virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const override; - void Show(SfxViewShell* pViewShell); // Update and display all selections. + void Show(SfxViewShell const * pViewShell); // Update and display all selections. void Hide(); // Hide all selections. void Invalidate( const SwRect& rRect ); diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index db6ddc049684..523572b33369 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -342,7 +342,7 @@ SwRect SwAccessibleFrame::GetBounds( const SwAccessibleMap& rAccMap, return aBounds; } -bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const +bool SwAccessibleFrame::IsEditable( SwViewShell const *pVSh ) const { const SwFrame *pFrame = GetFrame(); if( !pFrame ) @@ -359,7 +359,7 @@ bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const return true; } -bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const +bool SwAccessibleFrame::IsOpaque( SwViewShell const *pVSh ) const { SwAccessibleChild aFrame( GetFrame() ); if( !aFrame.GetSwFrame() ) diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx index 1f1edc201b33..8a97124b5413 100644 --- a/sw/source/core/access/accframe.hxx +++ b/sw/source/core/access/accframe.hxx @@ -76,9 +76,9 @@ protected: std::list< sw::access::SwAccessibleChild >& rChildren, bool bInPagePreview ); - bool IsEditable( SwViewShell *pVSh ) const; + bool IsEditable( SwViewShell const *pVSh ) const; - bool IsOpaque( SwViewShell *pVSh ) const; + bool IsOpaque( SwViewShell const *pVSh ) const; public: bool IsShowing( const SwAccessibleMap& rAccMap, diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 1fa0503c6450..cf74ec6d9222 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -232,7 +232,7 @@ private: public: - explicit SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap ) + explicit SwAccessibleShapeMap_Impl( SwAccessibleMap const *pMap ) : maMap() { maInfo.SetSdrView( pMap->GetShell()->GetDrawView() ); diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 2fd656296bf4..d906f97ca7ca 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -206,7 +206,7 @@ SwHash* Find( const OUString& rStr, SwHash* const * ppTable, return nullptr; } -inline LanguageType GetDocAppScriptLang( SwDoc& rDoc ) +inline LanguageType GetDocAppScriptLang( SwDoc const & rDoc ) { return static_cast<const SvxLanguageItem&>(rDoc.GetDefault( GetWhichOfScript( RES_CHRATR_LANGUAGE, @@ -1345,7 +1345,7 @@ bool SwCalc::Str2Double( const OUString& rCommand, sal_Int32& rCommandPos, } bool SwCalc::Str2Double( const OUString& rCommand, sal_Int32& rCommandPos, - double& rVal, SwDoc* const pDoc ) + double& rVal, SwDoc const * const pDoc ) { const SvtSysLocale aSysLocale; std::unique_ptr<const LocaleDataWrapper> pLclD; diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 057ba46d3827..095d9d462ce3 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -94,7 +94,7 @@ namespace io_pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::UI_REPLACE, nullptr); }; - void lcl_RemoveFieldMarks(Fieldmark* const pField, + void lcl_RemoveFieldMarks(Fieldmark const * const pField, SwDoc* const io_pDoc, const sal_Unicode aStartMark, const sal_Unicode aEndMark) diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index b23362d8e598..fc09bb9c312c 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -64,7 +64,7 @@ SwCallLink::SwCallLink( SwCursorShell & rSh ) } } -static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell& rShell) +static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell const & rShell) { if ( !pNode ) return; @@ -219,7 +219,7 @@ SwCallLink::~SwCallLink() } } -long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrame ) +long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode const & rNd, sal_Int32 nCntPos, bool bCalcFrame ) { SwTextFrame* pFrame = static_cast<SwTextFrame*>(rNd.getLayoutFrame(pRoot,nullptr,nullptr,bCalcFrame)); SwTextFrame* pNext; diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx index 017a0d5852cf..0e80d738032b 100644 --- a/sw/source/core/crsr/callnk.hxx +++ b/sw/source/core/crsr/callnk.hxx @@ -39,7 +39,7 @@ public: explicit SwCallLink( SwCursorShell & rSh ); ~SwCallLink(); - static long getLayoutFrame( const SwRootFrame*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrame ); + static long getLayoutFrame( const SwRootFrame*, SwTextNode const & rNd, sal_Int32 nCntPos, bool bCalcFrame ); }; #endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index 508ae5782ac1..cf03566e24bb 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -32,7 +32,7 @@ namespace { struct CursorStateHelper { - explicit CursorStateHelper(SwCursorShell& rShell) + explicit CursorStateHelper(SwCursorShell const & rShell) : m_pCursor(rShell.GetSwCursor()) , m_aSaveState(*m_pCursor) { } diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e8960beab045..6f1029e0564f 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -223,7 +223,7 @@ void SwCursorShell::StartAction() m_nAktContent = m_pCurrentCursor->GetPoint()->nContent.GetIndex(); m_nAktNdTyp = rNd.GetNodeType(); if( rNd.IsTextNode() ) - m_nLeftFramePos = SwCallLink::getLayoutFrame( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true ); + m_nLeftFramePos = SwCallLink::getLayoutFrame( GetLayout(), *rNd.GetTextNode(), m_nAktContent, true ); else m_nLeftFramePos = 0; } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 6bcdcae93bd3..af7b12c4d505 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -616,8 +616,8 @@ void lcl_MakeFieldLst( static SetGetExpFields::const_iterator lcl_FindField(bool & o_rFound, SetGetExpFields const& rSrtLst, - SwRootFrame *const pLayout, SwTextNode *const pTextNode, - SwTextField *const pTextField, SwPosition const& rPos, + SwRootFrame const *const pLayout, SwTextNode *const pTextNode, + SwTextField const *const pTextField, SwPosition const& rPos, sal_Int32 const nContentOffset) { std::unique_ptr<SetGetExpField> pSrch; diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 5f3a74c47e83..ae04aaa030e7 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -102,7 +102,7 @@ struct PercentHdl void NextPos( sal_uLong nPos ) const { ::SetProgressState( bBack ? nActPos - nPos : nPos, pDSh ); } - void NextPos( SwPosition& rPos ) const + void NextPos( SwPosition const & rPos ) const { sal_uLong nPos; if( bNodeIdx ) @@ -214,7 +214,7 @@ bool SwTableCursor::IsSelOvrCheck(SwCursorSelOverFlags eFlags) namespace { - const SwTextAttr* InputFieldAtPos(SwPosition *pPos) + const SwTextAttr* InputFieldAtPos(SwPosition const *pPos) { SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode(); if (!pTextNd) @@ -1148,7 +1148,7 @@ bool SwCursor::GoPrevWord() return GoPrevWordWT( WordType::ANYWORD_IGNOREWHITESPACES ); } -bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt ) +bool SwCursor::SelectWord( SwViewShell const * pViewShell, const Point* pPt ) { return SelectWordWT( pViewShell, WordType::ANYWORD_IGNOREWHITESPACES, pPt ); } @@ -1325,7 +1325,7 @@ bool SwCursor::GoPrevWordWT( sal_Int16 nWordType ) return bRet; } -bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt ) +bool SwCursor::SelectWordWT( SwViewShell const * pViewShell, sal_Int16 nWordType, const Point* pPt ) { SwCursorSaveState aSave( *this ); @@ -1768,7 +1768,7 @@ void SwCursor::DoSetBidiLevelUpDown() } bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt, - Point* pPt, long nUpDownX ) + Point const * pPt, long nUpDownX ) { SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(this); bool bAdjustTableCursor = false; diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 9df69a4ee19a..937047665e4b 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -111,7 +111,7 @@ void SwVisibleCursor::Hide() } } -void SwVisibleCursor::SetPosAndShow(SfxViewShell* pViewShell) +void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell) { SwRect aRect; long nTmpY = m_pCursorShell->m_aCursorHeight.getY(); @@ -609,7 +609,7 @@ void SwShellCursor::FillRects() GetShell()->GetLayout()->CalcFrameRects( *this ); } -void SwShellCursor::Show(SfxViewShell* pViewShell) +void SwShellCursor::Show(SfxViewShell const * pViewShell) { std::vector<OString> aSelectionRectangles; for(SwPaM& rPaM : GetRingContainer()) diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 89628faa0918..1ba139572d2d 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -94,7 +94,7 @@ namespace { const SwContentNode* m_pNewContentNode; const sal_Int32 m_nOffset; - OffsetUpdater(SwContentNode* pNewContentNode, sal_Int32 nOffset) + OffsetUpdater(SwContentNode const * pNewContentNode, sal_Int32 nOffset) : m_pNewContentNode(pNewContentNode), m_nOffset(nOffset) {}; void operator()(SwPosition& rPos, sal_Int32 nContent) const { @@ -107,7 +107,7 @@ namespace const SwContentNode* m_pNewContentNode; const sal_uLong m_nLen; const sal_Int32 m_nCorrLen; - LimitUpdater(SwContentNode* pNewContentNode, sal_uLong nLen, sal_Int32 nCorrLen) + LimitUpdater(SwContentNode const * pNewContentNode, sal_uLong nLen, sal_Int32 nCorrLen) : m_pNewContentNode(pNewContentNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {}; void operator()(SwPosition& rPos, sal_Int32 nContent) const { @@ -174,16 +174,16 @@ namespace private: inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); - inline void RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater); + inline void RestoreBkmks(SwDoc* pDoc, updater_t const & rUpdater); inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); - inline void RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater); + inline void RestoreRedlines(SwDoc* pDoc, updater_t const & rUpdater); inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit); - inline void RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto); + inline void RestoreFlys(SwDoc* pDoc, updater_t const & rUpdater, bool bAuto); inline void SaveUnoCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); - inline void RestoreUnoCursors(updater_t& rUpdater); + inline void RestoreUnoCursors(updater_t const & rUpdater); inline void SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); - inline void RestoreShellCursors(updater_t& rUpdater); - static const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther) + inline void RestoreShellCursors(updater_t const & rUpdater); + static const SwPosition& GetRightMarkPos(::sw::mark::IMark const * pMark, bool bOther) { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); }; static void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos) { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); }; @@ -254,7 +254,7 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCon } } -void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater) +void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t const & rUpdater) { IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); for (const MarkEntry& aEntry : m_aBkmkEntries) @@ -301,7 +301,7 @@ void ContentIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 n } } -void ContentIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater) +void ContentIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t const & rUpdater) { const SwRedlineTable& rRedlTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable(); for (const MarkEntry& aEntry : m_aRedlineEntries) @@ -356,7 +356,7 @@ void ContentIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCont } } -void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto) +void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t const & rUpdater, bool bAuto) { SwFrameFormats* pSpz = pDoc->GetSpzFrameFormats(); for (const MarkEntry& aEntry : m_aFlyEntries) @@ -410,7 +410,7 @@ void ContentIdxStoreImpl::SaveUnoCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 } } -void ContentIdxStoreImpl::RestoreUnoCursors(updater_t& rUpdater) +void ContentIdxStoreImpl::RestoreUnoCursors(updater_t const & rUpdater) { for (const PaMEntry& aEntry : m_aUnoCursorEntries) { @@ -442,7 +442,7 @@ void ContentIdxStoreImpl::SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int } } -void ContentIdxStoreImpl::RestoreShellCursors(updater_t& rUpdater) +void ContentIdxStoreImpl::RestoreShellCursors(updater_t const & rUpdater) { for (const PaMEntry& aEntry : m_aShellCursorEntries) { diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index ed1e411f6cb7..f1850e1ed752 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -776,7 +776,7 @@ const char * dbg_out(const SwUndo & rUndo) return dbg_out(lcl_dbg_out(rUndo)); } -static OUString lcl_dbg_out(SwOutlineNodes & rNodes) +static OUString lcl_dbg_out(SwOutlineNodes const & rNodes) { OUString aStr("[\n"); @@ -791,7 +791,7 @@ static OUString lcl_dbg_out(SwOutlineNodes & rNodes) return aStr; } -const char * dbg_out(SwOutlineNodes & rNodes) +const char * dbg_out( SwOutlineNodes const & rNodes) { return dbg_out(lcl_dbg_out(rNodes)); } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 16b1fa81a57b..c159ed9eacd7 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -536,7 +536,7 @@ sal_uInt16 PostItField_::GetPageNo( } bool sw_GetPostIts( - IDocumentFieldsAccess* pIDFA, + IDocumentFieldsAccess const * pIDFA, SetGetExpFields * pSrtLst ) { bool bHasPostIts = false; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index b3fad40f8c08..6dc6fb18db2d 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -924,7 +924,7 @@ sal_uLong Compare::CompareSequence::CheckDiag( sal_uLong nStt1, sal_uLong nEnd1, namespace { - inline void lcl_ShiftBoundariesOneway( CompareData* const pData, CompareData* const pOtherData) + inline void lcl_ShiftBoundariesOneway( CompareData* const pData, CompareData const * const pOtherData) { sal_uLong i = 0; sal_uLong j = 0; diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index baf6abfabcbd..d4e8b8dc2e60 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -551,7 +551,7 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged ) /// All descriptors whose Follow point to the to-be-deleted have to be adapted. // #i7983# -void SwDoc::PreDelPageDesc(SwPageDesc * pDel) +void SwDoc::PreDelPageDesc(SwPageDesc const * pDel) { if (nullptr == pDel) return; |