diff options
96 files changed, 196 insertions, 196 deletions
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index dc78b6c60e29..3293963ed87a 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -129,7 +129,7 @@ public: @param nDepth depth in which to add the child */ void AddChild( SwNumberTreeNode* pChild, - const int nDepth = 0 ); + const int nDepth ); /** Remove a child. diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 2c34d80eb088..74336563dc18 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -138,13 +138,13 @@ public: // This gets the UI Name from the programmatic name static const OUString& GetUIName(const OUString& rName, SwGetPoolIdFromName); static void FillUIName(const OUString& rName, OUString& rFillName, - SwGetPoolIdFromName, bool bDisambiguate = false); + SwGetPoolIdFromName, bool bDisambiguate); // Get the programmatic Name from the UI name static const OUString& GetProgName(const OUString& rName, SwGetPoolIdFromName); static void FillProgName(const OUString& rName, OUString& rFillName, - SwGetPoolIdFromName, bool bDisambiguate = false); + SwGetPoolIdFromName, bool bDisambiguate); // This gets the UI Name from the Pool ID SW_DLLPUBLIC static void FillUIName(sal_uInt16 nId, OUString& rFillName); diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 0d766ce3b175..9506994e9b97 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -122,7 +122,7 @@ class SW_DLLPUBLIC SwNodes void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. void CopyNodes( const SwNodeRange&, const SwNodeIndex&, - bool bNewFrames = true, bool bTableInsDummyNode = false ) const; + bool bNewFrames, bool bTableInsDummyNode = false ) const; void DelDummyNodes( const SwNodeRange& rRg ); SwNodes(SwNodes const&) = delete; @@ -144,9 +144,9 @@ public: { ForEach( 0, BigPtrArray::Count(), fnForEach, pArgs ); } - void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs = nullptr ); + void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs ); void ForEach( const SwNodeIndex& rStart, const SwNodeIndex& rEnd, - FnForEach_SwNodes fnForEach, void* pArgs = nullptr ); + FnForEach_SwNodes fnForEach, void* pArgs ); /// A still empty section. SwNode& GetEndOfPostIts() const { return *m_pEndOfPostIts; } @@ -245,7 +245,7 @@ public: static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl, - sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, + sal_uInt16 nLines, sal_uInt16 nRepeat = 0, SwTextFormatColl* pHeadlineTextColl = nullptr, const SwAttrSet * pAttrSet = nullptr); @@ -255,7 +255,7 @@ public: SwTableLineFormat* pLineFormat, SwTableBoxFormat* pBoxFormat, SwTextFormatColl* pTextColl, - SwUndoTextToTable* pUndo = nullptr ); + SwUndoTextToTable* pUndo ); static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange); @@ -269,7 +269,7 @@ public: /// Create regular text from what was table. bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, - SwUndoTableToText* = nullptr ); + SwUndoTableToText* ); /// Is in untbl.cxx and may called only by Undo-object. SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, const SwTableToTextSaves& rSavedData ); @@ -311,7 +311,7 @@ public: with that before rFrameIdx and pEnd at the back. If no valid node is found, return 0. rFrameIdx points to the node with frames. **/ SwNode* FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, - const SwNode* pEnd = nullptr ) const; + const SwNode* pEnd ) const; SwNode * DocumentSectionStartNode(SwNode * pNode) const; SwNode * DocumentSectionEndNode(SwNode * pNode) const; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 8034c09bb674..6394db3a5290 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -126,8 +126,8 @@ public: void SetGraphic(const Graphic& rGraphic, const OUString& rLink); /// wrappers for non-const calls at GraphicObject - void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = nullptr) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } - void StopGraphicAnimation(OutputDevice* pOut = nullptr, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } + void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData, const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = nullptr) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } + void StopGraphicAnimation(OutputDevice* pOut, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } virtual Size GetTwipSize() const override; void SetTwipSize( const Size& rSz ); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 2abdf1149e40..157038a603af 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -150,7 +150,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable SAL_DLLPRIVATE void CalcHiddenCharFlags() const; - SAL_DLLPRIVATE SwNumRule * GetNumRule_(bool bInParent = true) const; + SAL_DLLPRIVATE SwNumRule * GetNumRule_(bool bInParent) const; SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM, LanguageType nLang, sal_uInt16 nLangWhichId, @@ -688,7 +688,7 @@ public: const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false, const bool bWithFootnote = true ) const; - bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = nullptr, + bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx, sal_Int32 nIdx = 0, sal_Int32 nLen = -1, bool bWithNum = false, bool bWithFootnote = true, bool bReplaceTabsWithSpaces = false ) const; @@ -743,7 +743,7 @@ public: /// change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( utl::TransliterationWrapper& rTrans, sal_Int32 nStart, sal_Int32 nEnd, - SwUndoTransliterate* pUndo = nullptr ); + SwUndoTransliterate* pUndo ); /// count words in given range - returns true if we refreshed out count bool CountWords( SwDocStat& rStat, sal_Int32 nStart, sal_Int32 nEnd ) const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 8a7bee5e8d3b..b662c816eb49 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -257,7 +257,7 @@ public: IDocumentListItems& getIDocumentListItems(); /// Is node in the visible area of the Shell? - bool IsInVisibleArea( SwViewShell const * pSh = nullptr ) const; + bool IsInVisibleArea( SwViewShell const * pSh ) const; /// Is node in an protected area? bool IsInProtectSect() const; /** Is node in something that is protected (range, frame, diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index c9c012ab3104..1bf823ef2193 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -173,7 +173,7 @@ public: const unsigned int _nRestrictToThisLevel = MAXLEVEL, Extremities* pExtremities = nullptr ) const; OUString MakeRefNumString( const SwNodeNum& rNodeNum, - const bool bInclSuperiorNumLabels = false, + const bool bInclSuperiorNumLabels, const sal_uInt8 nRestrictInclToThisLevel = 0 ) const; /** diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 2b23457eb442..39370a67aa06 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -164,7 +164,7 @@ class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM> SwPosition * m_pMark; ///< points at either m_Bound1 or m_Bound2 bool m_bIsInFrontOfLabel; - SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg = nullptr ); + SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg ); SwPaM(SwPaM const& rPaM) = delete; @@ -202,7 +202,7 @@ public: bool Find( const SwFormat& rFormat, SwMoveFn fnMove = fnMoveForward, const SwPaM *pPam =nullptr, bool bInReadOnly = false); - bool Find( const SfxPoolItem& rAttr, bool bValue = true, + bool Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove = fnMoveForward, const SwPaM *pPam =nullptr, bool bInReadOnly = false ); bool Find( const SfxItemSet& rAttr, bool bNoColls, diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 4fea7232048c..bb5db7aa160f 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -96,7 +96,7 @@ public: void SetType(SectionType const eNew) { m_eType = eNew; } bool IsHidden() const { return m_bHidden; } - void SetHidden(bool const bFlag = true) { m_bHidden = bFlag; } + void SetHidden(bool const bFlag) { m_bHidden = bFlag; } bool IsHiddenFlag() const { return m_bHiddenFlag; } SAL_DLLPRIVATE void @@ -108,7 +108,7 @@ public: void SetEditInReadonlyFlag(bool const bFlag) { m_bEditInReadonlyFlag = bFlag; } - void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; } + void SetCondHidden(bool const bFlag) { m_bCondHiddenFlag = bFlag; } bool IsCondHidden() const { return m_bCondHiddenFlag; } const OUString& GetCondition() const { return m_sCondition; } @@ -131,7 +131,7 @@ public: { return (DDE_LINK_SECTION == m_eType) || (FILE_LINK_SECTION == m_eType); } bool IsConnectFlag() const { return m_bConnectFlag; } - void SetConnectFlag(bool const bFlag = true){ m_bConnectFlag = bFlag; } + void SetConnectFlag(bool const bFlag){ m_bConnectFlag = bFlag; } static OUString CollapseWhiteSpaces(const OUString& sName); }; @@ -189,7 +189,7 @@ public: bool IsProtectFlag() const { return m_Data.IsProtectFlag(); } bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); } - void SetCondHidden(bool const bFlag = true); + void SetCondHidden(bool const bFlag); bool IsCondHidden() const { return m_Data.IsCondHidden(); } // Query (also for parents) if this section is to be hidden. bool CalcHiddenFlag() const; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 56880e3de5f2..a18f65be3fb1 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -407,10 +407,10 @@ public: Writer(); virtual ~Writer(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = nullptr ); - sal_uLong Write( SwPaM&, SvStream&, const OUString* = nullptr ); - virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = nullptr, SfxMedium* = nullptr ); - virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = nullptr ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ); + sal_uLong Write( SwPaM&, SvStream&, const OUString* ); + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString*, SfxMedium* = nullptr ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* ); virtual void SetupFilterOptions(SfxMedium& rMedium); @@ -475,8 +475,8 @@ public: virtual bool IsStgWriter() const override; - virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = nullptr, SfxMedium* = nullptr ) override; - virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = nullptr ) override; + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString*, SfxMedium* = nullptr ) override; + virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* ) override; SotStorage& GetStorage() const { return *pStg; } }; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 16ed380f1567..47ffb8dd99d4 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -349,7 +349,7 @@ public: virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(SwWrtShell &rSh, - SwField* pField, bool bNextButton = false) = 0; + SwField* pField, bool bNextButton) = 0; virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0; virtual AbstractSwLabDlg* CreateSwLabDlg(const SfxItemSet& rSet, @@ -360,7 +360,7 @@ public: virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, - const OUString *pCollName = nullptr, + const OUString *pCollName, bool bDraw = false, const OString& sDefPage = OString() ) = 0; @@ -399,14 +399,14 @@ public: virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(vcl::Window* pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage = OString(), + const OString& sPage, SwWrtShell* pActShell = nullptr, bool bNew = false) = 0; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; virtual AbstractFieldInputDlg* CreateFieldInputDlg(vcl::Window *pParent, - SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; + SwWrtShell &rSh, SwField* pField, bool bNextButton) = 0; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) = 0; virtual VclAbstractDialog* CreateTitlePageDlg ( vcl::Window * pParent ) = 0; @@ -430,7 +430,7 @@ public: virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, - SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, + SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal = false) = 0; virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) = 0; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index a7d07829dc62..9d36721642c1 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -106,7 +106,7 @@ public: virtual SwCursor* Create( SwPaM* pRing = nullptr ) const; virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ); + virtual void SaveTableBoxContent( const SwPosition* pPos ); void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const; SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions, @@ -139,7 +139,7 @@ public: bool GoEndWord(); bool GoNextWord(); bool GoPrevWord(); - bool SelectWord( SwViewShell* pViewShell, const Point* pPt = nullptr ); + bool SelectWord( SwViewShell* 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 = nullptr ); + bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt ); enum SentenceMoveType { @@ -168,8 +168,8 @@ 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 LeftRightMargin( bool bLeftMargin, bool bAPI = false ); - bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI = false ) const; + bool LeftRightMargin( bool bLeftMargin, bool bAPI ); + bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI ) const; bool SttEndDoc( bool bSttDoc ); bool GoPrevNextCell( bool bNext, sal_uInt16 nCnt ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 665d7ff86276..840bc56bc301 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -210,7 +210,7 @@ public: // It's not allowed to change the table model after the first call of one of these functions. bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, - SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = nullptr ) + SwTableBox* pMergeBox, SwUndoTableMerge* pUndo ) { #ifdef DBG_UTIL m_bDontChangeModel = true; @@ -218,7 +218,7 @@ public: return m_bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) : OldMerge( pDoc, rBoxes, pMergeBox, pUndo ); } - bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1, + bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bSameHeight = false ) { #ifdef DBG_UTIL @@ -233,13 +233,13 @@ public: void PrepareDeleteCol( long nMin, long nMax ); bool InsertCol( SwDoc*, const SwSelBoxes& rBoxes, - sal_uInt16 nCnt = 1, bool bBehind = true ); + sal_uInt16 nCnt, bool bBehind = true ); bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes, - sal_uInt16 nCnt = 1, bool bBehind = true ); + sal_uInt16 nCnt, bool bBehind = true ); void PrepareDelBoxes( const SwSelBoxes& rBoxes ); bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, SwUndo* pUndo, const bool bDelMakeFrames, const bool bCorrBorder ); - bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); + bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) { FindSuperfluousRows_( rBoxes, nullptr, nullptr ); } @@ -268,9 +268,9 @@ public: bool bCpyName = false ) const; // Copy table in this bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&, - SwUndoTableCpyTable* pUndo = nullptr ); + SwUndoTableCpyTable* pUndo ); bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&, - SwUndoTableCpyTable* pUndo = nullptr ); + SwUndoTableCpyTable* pUndo ); bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&, SwUndoTableCpyTable* pUndo ); // Copy headline of table (with content!) into an other one. @@ -430,9 +430,9 @@ public: sal_uLong GetSttIdx() const; // Search next/previous box with content. - SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =nullptr, + SwTableBox* FindNextBox( const SwTable&, const SwTableBox*, bool bOvrTableLns=true ) const; - SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr ) const; + SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* ) const; // Return name of this box. It is determined dynamically and // is calculated from the position in the lines/boxes/table. OUString GetName() const; @@ -443,7 +443,7 @@ public: // width or height when inserting cols or rows Point GetCoordinates() const; - bool IsInHeadline( const SwTable* pTable = nullptr ) const; + bool IsInHeadline( const SwTable* pTable ) const; // Contains box contents, that can be formatted as a number? bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex, @@ -479,9 +479,9 @@ public: sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindStartOfRowSpan( rTable, nMaxStep ); } - SwTableBox& FindEndOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX ); + SwTableBox& FindEndOfRowSpan( const SwTable&, sal_uInt16 nMaxStep ); const SwTableBox& FindEndOfRowSpan( const SwTable& rTable, - sal_uInt16 nMaxStep = USHRT_MAX ) const + sal_uInt16 nMaxStep ) const { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); } void RegisterToFormat( SwFormat& rFormat ) ; }; diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 788e3a074040..1ac05dc1cd08 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -50,7 +50,7 @@ SW_DLLPUBLIC bool UCB_DeleteFile( const OUString& rURL ); // copy/move the file to a new location bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, - bool bCopyIsMove = false ); + bool bCopyIsMove ); // is the URL on the current system case sensitive? SW_DLLPUBLIC bool UCB_IsCaseSensitiveFileName( const OUString& rURL ); @@ -65,7 +65,7 @@ SW_DLLPUBLIC bool UCB_IsReadOnlyFileName( const OUString& rURL ); // !! objects must be deleted from the caller!! bool UCB_GetFileListOfFolder( const OUString& rURL, std::vector<OUString>& rList, - const OUString* pExtension = nullptr, + const OUString* pExtension, std::vector<DateTime*>* pDateTimeList = nullptr ); // is the URL an existing file? diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index f49fc29babdc..88cede16fa5c 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -104,7 +104,7 @@ bool IsFrameInTableSel( const SwRect& rUnion, const SwFrame* pCell ); // i.e. boxes are added if some overlap at the sides. // Additionally a new box is created and filled with the relevant content. void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, - SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = nullptr ); + SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo ); // Check if selected boxes allow for a valid merge. sal_uInt16 CheckMergeSel( const SwPaM& rPam ); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 14e099fd93de..0913cea9bbbb 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -155,7 +155,7 @@ protected: // MoveTo: moves from the NodesArray into the UndoNodesArray. // MoveFrom: moves from the UndoNodesArray into the NodesArray. static void MoveToUndoNds( SwPaM& rPam, - SwNodeIndex* pNodeIdx = nullptr, + SwNodeIndex* pNodeIdx, sal_uLong* pEndNdIdx = nullptr, sal_Int32 * pEndCntIdx = nullptr ); static void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, SwPosition& rInsPos, diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 8d2bfcc20a78..f20d5945e8e2 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -373,7 +373,7 @@ class SwXTextCellStyle : public cppu::WeakImplHelper * @param pParentName Optional output. Pointer to a OUString where parsed parent name will be returned. * @return Pointer to a SwBoxAutoFormat, nullptr if not found. */ - static SwBoxAutoFormat* GetBoxAutoFormat(SwDocShell* pDocShell, const OUString& sName, OUString* pParentName = nullptr); + static SwBoxAutoFormat* GetBoxAutoFormat(SwDocShell* pDocShell, const OUString& sName, OUString* pParentName); /// returns box format assigned to this style SwBoxAutoFormat* GetBoxFormat(); /// Sets the address of SwBoxAutoFormat this style is bound to. Usable only when style is physical. diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index ff08c5d5767d..fe6c780a42ae 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -260,7 +260,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // methods for searching // set search context - SAL_DLLPRIVATE bool SearchAndWrap(bool bApi = false); + SAL_DLLPRIVATE bool SearchAndWrap(bool bApi); SAL_DLLPRIVATE bool SearchAll(); SAL_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); SAL_DLLPRIVATE void Replace(); @@ -277,7 +277,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell inline long GetYScroll() const; SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; SAL_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, - sal_uInt16 nRangeX = USHRT_MAX, + sal_uInt16 nRangeX, sal_uInt16 nRangeY = USHRT_MAX); SAL_DLLPRIVATE bool GetPageScrollUpOffset(SwTwips& rOff) const; @@ -309,8 +309,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // used for spell checking and text conversion SAL_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone, - bool bEndDone, SwConversionArgs *pConvArgs = nullptr ); - SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = nullptr ); + bool bEndDone, SwConversionArgs *pConvArgs ); + SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs ); SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); SAL_DLLPRIVATE void SpellKontext(bool bOn = true) @@ -326,7 +326,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void SetZoom_( const Size &rEditSz, SvxZoomType eZoomType, - short nFactor = 100, + short nFactor, bool bViewOnly = false); SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); @@ -621,7 +621,7 @@ public: //public fuer D&D int InsertGraphic( const OUString &rPath, const OUString &rFilter, - bool bLink = true, GraphicFilter *pFlt = nullptr, + bool bLink, GraphicFilter *pFlt = nullptr, Graphic* pPreviewGrf = nullptr ); void ExecuteScan( SfxRequest& rReq ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index ae6e43145d5d..e3e2eec30bf0 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -264,7 +264,7 @@ public: { b ? (m_nCoreOptions |= ViewOptFlags1::Postits ) : ( m_nCoreOptions &= ~ViewOptFlags1::Postits); } static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ); - static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = nullptr ); + static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut ); inline bool IsShowHiddenChar(bool bHard = false) const { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::CharHidden) && diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index dcf1237e511a..cd7204dd9fcb 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -155,9 +155,9 @@ public: virtual SwCursor* Create( SwPaM* pRing = nullptr ) const override; virtual short MaxReplaceArived() override; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ) override; + virtual void SaveTableBoxContent( const SwPosition* pPos ) override; - bool UpDown( bool bUp, sal_uInt16 nCnt = 1 ); + bool UpDown( bool bUp, sal_uInt16 nCnt ); // true: Cursor can be set to this position. virtual bool IsAtValidPos( bool bPoint = true ) const override; @@ -195,7 +195,7 @@ public: virtual SwCursor* Create( SwPaM* pRing = nullptr ) const override; virtual short MaxReplaceArived() override; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ) override; + virtual void SaveTableBoxContent( const SwPosition* pPos ) override; // true: Cursor can be set to this position. virtual bool IsAtValidPos( bool bPoint = true ) const override; diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 9d543c61255c..dd7e839622a0 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -83,7 +83,7 @@ public: getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true) override; + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; virtual void InvalidatePosOrSize( const SwRect& rFrame ) override; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 6c6ae83c591f..c41e9ccb0d74 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -315,7 +315,7 @@ public: // thread safe C++ interface // The object is not visible an longer and should be destroyed - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true); + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true); // The child object is not visible an longer and should be destroyed virtual void DisposeChild(const sw::access::SwAccessibleChild& rFrameOrObj, bool bRecursive, bool bCanSkipInvisible); diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index e11f068a0d29..fc507b62041e 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -198,7 +198,7 @@ public: // thread safe C++ interface // The object is not visible an longer and should be destroyed - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true) override; + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index 6df342ab4372..8753b0fc4818 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -57,7 +57,7 @@ public: static sal_uInt8 GetNodeType( const SwFlyFrame *pFlyFrame ); // The object is not visible an longer and should be destroyed - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true) override; + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; virtual bool SetSelectedState( bool bSeleted ) override; }; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0c10f29b80bb..2b4719dda3dc 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -249,7 +249,7 @@ public: const ::accessibility::AccessibleShapeTreeInfo& GetInfo() const { return maInfo; } SwAccessibleObjShape_Impl *Copy( size_t& rSize, - const SwFEShell *pFESh = nullptr, + const SwFEShell *pFESh, SwAccessibleObjShape_Impl **pSelShape = nullptr ) const; #if OSL_DEBUG_LEVEL > 0 diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 6be3005af60d..75ee924e6668 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -98,7 +98,7 @@ public: throw ( css::uno::RuntimeException, std::exception ) override; // The object is not visible an longer and should be destroyed - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true) override; + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 41d1b64b143e..966eb7043aea 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -224,7 +224,7 @@ public: virtual void InvalidatePosOrSize( const SwRect& rOldBox ) override; // The object is not visible an longer and should be destroyed - virtual void Dispose(bool bRecursive = false, bool bCanSkipInvisible = true) override; + virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrameOrObj, bool bRecursive, bool bCanSkipInvisible ) override; diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index c91066340546..432b8ed9074c 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -101,7 +101,7 @@ namespace inline std::unique_ptr<SwPosition> lcl_PositionFromContentNode( SwContentNode * const pContentNode, - const bool bAtEnd=false) + const bool bAtEnd) { std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode)); pResult->nContent.Assign(pContentNode, bAtEnd ? pContentNode->Len() : 0); diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 5274aba8576d..9e6406290bdd 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -339,7 +339,7 @@ protected: delete[] pData; } - int FindLCS( int *pLcs1 = nullptr, int *pLcs2 = nullptr, int nStt1 = 0, + int FindLCS( int *pLcs1, int *pLcs2 = nullptr, int nStt1 = 0, int nEnd1 = 0, int nStt2 = 0, int nEnd2 = 0 ); public: diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx index b2ff39f88e79..97f66fc1be26 100644 --- a/sw/source/core/doc/swstylemanager.hxx +++ b/sw/source/core/doc/swstylemanager.hxx @@ -23,7 +23,7 @@ class IStyleAccess; class SfxItemSet; -IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems = nullptr ); +IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems ); #endif // INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index e1d8c3a59bf7..1b21c1b626a2 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1376,11 +1376,11 @@ struct InsULPara pLeftBox( pLeft ) { bUL_LR = true; bUL = true; } - void SetLeft( SwTableBox* pBox=nullptr ) + void SetLeft( SwTableBox* pBox ) { bUL_LR = false; bUL = true; if( pBox ) pInsBox = pBox; } - void SetRight( SwTableBox* pBox=nullptr ) + void SetRight( SwTableBox* pBox ) { bUL_LR = false; bUL = false; if( pBox ) pInsBox = pBox; } - void SetLower( SwTableLine* pLine=nullptr ) + void SetLower( SwTableLine* pLine ) { bUL_LR = true; bUL = false; if( pLine ) pInsLine = pLine; } }; diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index 24d4f83a9488..6fade41664d8 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -158,7 +158,7 @@ private: SwFlyFrameFormat* InsNoTextNode( const SwPosition&rPos, SwNoTextNode*, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, - SwFrameFormat* = nullptr ); + SwFrameFormat* ); /* Copy a range within the same or to another document. Position may not lie within range! */ bool CopyImpl( SwPaM&, SwPosition&, const bool MakeNewFrames /*= true */, diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 157e8287f5fb..4f0c746b12a3 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -49,7 +49,7 @@ public: css::uno::Reference < css::embed::XStorage > xRoot; SwXMLTextBlocks( const OUString& rFile ); SwXMLTextBlocks( const css::uno::Reference < css::embed::XStorage >&, const OUString& rFile ); - void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false ); + void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText ); virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) override; static OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks(); diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 100ab48abb02..f4fc3b72a314 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -75,7 +75,7 @@ namespace objectpositioning const SwFrame& rPageAlignLayFrame, const SwTwips nProposedRelPosY, const bool bFollowTextFlow, - const bool bCheckBottom = true ) const; + const bool bCheckBottom ) const; SwTwips ImplAdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const; diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 4ef2bd6d7bb7..a5d7d9fffefc 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -82,9 +82,9 @@ public: // layout dependent cursor travelling virtual bool LeftMargin( SwPaM * ) const; virtual bool RightMargin( SwPaM *, bool bAPI = false ) const; - virtual bool UnitUp( SwPaM *, const SwTwips nOffset = 0, + virtual bool UnitUp( SwPaM *, const SwTwips nOffset, bool bSetInReadOnly = false ) const; - virtual bool UnitDown( SwPaM *, const SwTwips nOffset = 0, + virtual bool UnitDown( SwPaM *, const SwTwips nOffset, bool bSetInReadOnly = false ) const; // nMaxHeight is the required height diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 3f2cfc90501a..0ad74c3e6892 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -57,9 +57,9 @@ public: // Functions for moving boxes void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, - sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD=nullptr); + sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD); void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, - sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD=nullptr); + sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD); void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar, bool bMovedBefore, SwUndoSort* pUD=nullptr); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index df85c55ae326..e22ce6ce5bdd 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -191,7 +191,7 @@ class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster @return SwContentFrame* pointer to the found next content frame. It's NULL, if none exists. */ - SwContentFrame* FindNextCnt_( const bool _bInSameFootnote = false ); + SwContentFrame* FindNextCnt_( const bool _bInSameFootnote ); /** method to determine previous content frame in the same environment for a flow frame (content frame, table frame, section frame) @@ -365,10 +365,10 @@ public: SwLayoutFrame *GetNextFootnoteLeaf( MakePageType eMakePage ); SwLayoutFrame *GetNextSctLeaf( MakePageType eMakePage ); SwLayoutFrame *GetNextCellLeaf( MakePageType eMakePage ); - SwLayoutFrame *GetPrevLeaf ( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrame *GetPrevFootnoteLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrame *GetPrevSctLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrame *GetPrevCellLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); + SwLayoutFrame *GetPrevLeaf ( MakePageType eMakeFootnote ); + SwLayoutFrame *GetPrevFootnoteLeaf( MakePageType eMakeFootnote ); + SwLayoutFrame *GetPrevSctLeaf( MakePageType eMakeFootnote ); + SwLayoutFrame *GetPrevCellLeaf( MakePageType eMakeFootnote ); const SwLayoutFrame *GetLeaf ( MakePageType eMakePage, bool bFwd, const SwFrame *pAnch ) const; @@ -388,7 +388,7 @@ public: virtual void PaintBorder( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs & ) const; - void PaintBaBo( const SwRect&, const SwPageFrame *pPage = nullptr, + void PaintBaBo( const SwRect&, const SwPageFrame *pPage, const bool bOnlyTextBackground = false) const; void PaintBackground( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs &, diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx index c4d30f01e375..99713647b5de 100644 --- a/sw/source/core/inc/frminf.hxx +++ b/sw/source/core/inc/frminf.hxx @@ -63,7 +63,7 @@ public: // Is it a comparison? Returns position in frame. sal_Int32 GetBigIndent( sal_Int32& rFndPos, - const SwTextFrame *pNextFrame = nullptr ) const; + const SwTextFrame *pNextFrame ) const; }; #endif diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 09265df6eab5..ee5d048865b7 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -311,7 +311,7 @@ class SwBorderAttrs : public SwCacheObj // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. void GetTopLine_ ( const SwFrame& _rFrame, - const SwFrame* _pPrevFrame = nullptr ); + const SwFrame* _pPrevFrame ); void GetBottomLine_( const SwFrame& _rFrame ); // calculate cached values <m_bJoinedWithPrev> and <m_bJoinedWithNext> diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 5117fe7ffa2a..b001a948c413 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -84,7 +84,7 @@ public: static void ChangeFootnoteRef( const SwContentFrame *pOld, const SwTextFootnote *, SwContentFrame *pNew ); - void RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock = false, + void RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock, const SwTextFootnote *pAttr = nullptr ); // Set DeadLine (in document coordinates) so that the text formatter can diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index f549bc7b1e3c..1afe9ebe1801 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -101,7 +101,7 @@ class SwLayAction const SwRect & ); bool FormatLayout( OutputDevice* pRenderContext, SwLayoutFrame *, bool bAddRect = true ); - bool FormatLayoutTab( SwTabFrame *, bool bAddRect = true ); + bool FormatLayoutTab( SwTabFrame *, bool bAddRect ); bool FormatContent( const SwPageFrame* pPage ); void FormatContent_( const SwContentFrame* pContent, const SwPageFrame* pPage ); diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index 0e2ab5756837..3d9a5bd97084 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -53,7 +53,7 @@ public: virtual bool GetCursorOfst(SwPosition* pPos, Point& aPoint, SwCursorMoveState* = nullptr, bool bTestBackground = false) const override; - void GetGrfArea( SwRect &rRect, SwRect * = nullptr ) const; + void GetGrfArea( SwRect &rRect, SwRect * ) const; bool IsTransparent() const; diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index f4b412ba29e8..6de5252a301e 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -330,7 +330,7 @@ public: void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue, sal_uLong nNodeIdx ); - void Add( SwTextAttr* pTextHt, sal_uLong nNodeIdx, bool bNewAttr = true ); + void Add( SwTextAttr* pTextHt, sal_uLong nNodeIdx, bool bNewAttr ); void Add( SwFormatColl*, sal_uLong nNodeIdx, sal_uInt8 nWhichNd ); void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos ); void Add( SwFrameFormat& rFormat ); @@ -390,7 +390,7 @@ public: sal_Int32 const nStart, sal_Int32 const nEnd, SetAttrMode const nFlags ); - void AddHint( SwTextAttr* pHt, const bool bNew = false ); + void AddHint( SwTextAttr* pHt, const bool bNew ); void RegisterInModify( SwModify* pRegIn, const SwNode& rNd ); void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; } diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index eaea9f9bf95e..dd9e79ea54e6 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -402,7 +402,7 @@ public: const SvxShadowItemSide nShadow, const bool bVertLayout, const bool bSkipLeft, const bool bSkipRight ) const; - void dumpAsXml( xmlTextWriterPtr writer = nullptr ) const; + void dumpAsXml( xmlTextWriterPtr writer ) const; }; inline void SwFont::SetColor( const Color& rColor ) diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 7ca7679e1ccd..cc2f01eb21a5 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -52,7 +52,7 @@ void InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat, SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); -SW_DLLPUBLIC void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo = nullptr, +SW_DLLPUBLIC void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, bool bCalcNewSize = true, const bool bCorrBorder = true, SwShareBoxFormats* pShareFormats = nullptr ); diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 210702d2ace9..5ffcfeb31ee4 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -138,7 +138,7 @@ struct SwTOXSortTabBase sal_uInt16 GetType() const { return nType; } static sal_uInt16 GetOptions() { return nOpt; } - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0) const; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const; virtual sal_uInt16 GetLevel() const = 0; virtual bool operator==( const SwTOXSortTabBase& ); virtual bool operator<( const SwTOXSortTabBase& ); @@ -182,7 +182,7 @@ struct SwTOXIndex : public SwTOXSortTabBase const css::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const override; virtual sal_uInt16 GetLevel() const override; virtual bool operator==( const SwTOXSortTabBase& ) override; virtual bool operator<( const SwTOXSortTabBase& ) override; @@ -220,7 +220,7 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const override; virtual sal_uInt16 GetLevel() const override; private: virtual TextAndReading GetText_Impl() const override; @@ -235,7 +235,7 @@ struct SwTOXPara : public SwTOXSortTabBase void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; } void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; } - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const override; virtual sal_uInt16 GetLevel() const override; virtual OUString GetURL() const override; @@ -269,7 +269,7 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFormatField& m_rField; - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const override; virtual TextAndReading GetText_Impl() const override; public: diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 8ba3bca167bf..bee4c8efb45f 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -96,7 +96,7 @@ class SwTextFrame: public SwContentFrame // Evaluates the Preps in Format() bool CalcPreps(); - void PrepWidows( const sal_uInt16 nNeed, bool bNotify = true ); + void PrepWidows( const sal_uInt16 nNeed, bool bNotify ); void InvalidateRange_( const SwCharRange &, const long = 0); inline void InvalidateRange( const SwCharRange &, const long = 0); @@ -292,9 +292,9 @@ public: virtual bool LeftMargin(SwPaM *) const override; virtual bool RightMargin(SwPaM *, bool bAPI = false) const override; - virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0, + virtual bool UnitUp(SwPaM *, const SwTwips nOffset, bool bSetInReadOnly = false ) const override; - virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, + virtual bool UnitDown(SwPaM *, const SwTwips nOffset, bool bSetInReadOnly = false ) const override; bool UnitUp_(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; @@ -420,7 +420,7 @@ public: void HideAndShowObjects(); /// Footnote - void RemoveFootnote( const sal_Int32 nStart = 0, + void RemoveFootnote( const sal_Int32 nStart, const sal_Int32 nLen = COMPLETE_STRING ); inline SwTwips GetFootnoteFrameHeight() const; SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ); diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index e39e08bd1d4e..1da13549b655 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -68,7 +68,7 @@ public: SwSectionFormat* GetFormat() const; static css::uno::Reference< css::text::XTextSection > - CreateXTextSection(SwSectionFormat *const pFormat = nullptr, + CreateXTextSection(SwSectionFormat *const pFormat, const bool bIndexHeader = false); // MetadatableMixin diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b35c44e73469..21008a95aa79 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1820,7 +1820,7 @@ static void lcl_DrawGraphic( const SvxBrushItem& rBrush, vcl::RenderContext *pOu SwViewShell &rSh, const SwRect &rGrf, const SwRect &rOut, bool bClip, bool bGrfNum, SwPaintProperties& properties, - bool bBackgrdAlreadyDrawn = false ) + bool bBackgrdAlreadyDrawn ) // add parameter <bBackgrdAlreadyDrawn> to indicate // that the background is already drawn. { diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 97b6e92ae13f..f57885c4cca6 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -846,7 +846,7 @@ bool SwTextFrame::CalcPreps() if( bPrepMustFit ) { SwTextLineAccess aAccess( this ); - aAccess.GetPara()->SetPrepMustFit(); + aAccess.GetPara()->SetPrepMustFit(true); } return false; } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index bd6383b9ccf2..f94d73201543 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -274,14 +274,14 @@ public: inline SwPosSize GetTextSize( const OUString &rText ) const; sal_Int32 GetTextBreak( const long nLineWidth, - const sal_Int32 nMaxLen, - const sal_uInt16 nComp, - vcl::TextLayoutCache const* = nullptr) const; + const sal_Int32 nMaxLen, + const sal_uInt16 nComp, + vcl::TextLayoutCache const*) const; sal_Int32 GetTextBreak( const long nLineWidth, - const sal_Int32 nMaxLen, - const sal_uInt16 nComp, - sal_Int32& rExtraCharPos, - vcl::TextLayoutCache const* = nullptr) const; + const sal_Int32 nMaxLen, + const sal_uInt16 nComp, + sal_Int32& rExtraCharPos, + vcl::TextLayoutCache const*) const; sal_uInt16 GetAscent() const; diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index 7bd8e2ce3f0e..42febc600270 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -105,7 +105,7 @@ public: * and change font to merge character border with neighbours. **/ bool SeekAndChgAttrIter( const sal_Int32 nPos, OutputDevice* pOut ); - bool SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFont = false ); + bool SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFont ); // Do we have an attribute change at all? bool HasHints() const { return nullptr != pHints; } diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 89b9dd768849..ddd2d8e0f8df 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -285,16 +285,16 @@ public: inline bool IsPrep() const { return m_bPrep; } inline void SetPrepWidows() { m_bPrepWidows = true; } inline bool IsPrepWidows() const { return m_bPrepWidows; } - inline void SetPrepMustFit( const bool bNew = true ) { m_bPrepMustFit = bNew; } + inline void SetPrepMustFit( const bool bNew ) { m_bPrepMustFit = bNew; } inline bool IsPrepMustFit() const { return m_bPrepMustFit; } inline void SetPrepAdjust() { m_bPrepAdjust = true; } inline bool IsPrepAdjust() const { return m_bPrepAdjust; } - inline void SetFollowField( const bool bNew = true ) { m_bFollowField = bNew; } + inline void SetFollowField( const bool bNew ) { m_bFollowField = bNew; } inline bool IsFollowField() const { return m_bFollowField; } inline void SetFixLineHeight() { m_bFixLineHeight = true; } inline bool IsFixLineHeight() const { return m_bFixLineHeight; } - inline void SetFootnoteNum( const bool bNew = true ) { m_bFootnoteNum = bNew; } + inline void SetFootnoteNum( const bool bNew ) { m_bFootnoteNum = bNew; } inline bool IsFootnoteNum() const { return m_bFootnoteNum; } inline void SetMargin( const bool bNew = true ) { m_bMargin = bNew; } inline bool IsMargin() const { return m_bMargin; } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 2cc921bd0a26..d33846fcdb04 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1540,7 +1540,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, SetOfst_( 0 ); } break; - case PREP_MUST_FIT : pPara->SetPrepMustFit(); + case PREP_MUST_FIT : pPara->SetPrepMustFit(true); SAL_FALLTHROUGH; case PREP_WIDOWS_ORPHANS : pPara->SetPrepAdjust(); break; diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 1f9285110e8a..e5e6f6c8e500 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -496,7 +496,7 @@ SwXTextSection::getPropertySetInfo() throw (uno::RuntimeException, std::exceptio } static void -lcl_UpdateLinkType(SwSection & rSection, bool const bLinkUpdateAlways = true) +lcl_UpdateLinkType(SwSection & rSection, bool const bLinkUpdateAlways) { if (rSection.GetType() == DDE_LINK_SECTION) { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 1a116fc84c44..9927f525ae4d 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1145,7 +1145,7 @@ public: void OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, HTMLOutContext *pContext = nullptr ); void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext = nullptr ); + HTMLOutContext *pContext ); bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } }; @@ -1939,7 +1939,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, } void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext ) + HTMLOutContext *pContext = nullptr ) { rHWrt.m_bTagOn = false; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index a3ccb666c604..398f845bb28b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -473,7 +473,7 @@ class HTMLTable void FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const; // Create a table with the content (lines/boxes) - void MakeTable_( SwTableBox *pUpper=nullptr ); + void MakeTable_( SwTableBox *pUpper ); // Gernerate a new SwTableBox, which contains a SwStartNode SwTableBox *NewTableBox( const SwStartNode *pStNd, diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 0ad3007db686..174195bf7c6f 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -321,7 +321,7 @@ public: void SetRestartListing( bool bSet ) { bRestartListing = bSet; } bool IsRestartListing() const { return bRestartListing; } - void SetAppendMode( SwHTMLAppendMode eMode=AM_NORMAL ) { eAppend = eMode; } + void SetAppendMode( SwHTMLAppendMode eMode ) { eAppend = eMode; } SwHTMLAppendMode GetAppendMode() const { return eAppend; } }; @@ -510,7 +510,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void EndContextAttrs( HTMLAttrContext *pContext ); void SaveAttrTab( HTMLAttrTable& rNewAttrTab ); void SplitAttrTab( const SwPosition& rNewPos ); - void SplitAttrTab( HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true ); + void SplitAttrTab( HTMLAttrTable& rNewAttrTab, bool bMoveEndBack ); void RestoreAttrTab( HTMLAttrTable& rNewAttrTab ); void InsertAttr( const SfxPoolItem& rItem, bool bInsAtStart ); void InsertAttrs( HTMLAttrs& rAttrs ); @@ -607,7 +607,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void NewNumBulList( int nToken ); void EndNumBulList( int nToken=0 ); void NewNumBulListItem( int nToken ); - void EndNumBulListItem( int nToken=0, bool bSetColl=true, + void EndNumBulListItem( int nToken, bool bSetColl=true, bool bLastPara=false ); // Definitions-Listen <DL> mit <DD>, <DT> @@ -721,7 +721,7 @@ private: // eine Bookmark einfuegen void InsertBookmark( const OUString& rName ); - void InsertCommentText( const sal_Char *pTag = nullptr ); + void InsertCommentText( const sal_Char *pTag ); void InsertComment( const OUString& rName, const sal_Char *pTag = nullptr ); // sind im aktuellen Absatz Bookmarks vorhanden? diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 646afc05e13d..ec42ed36668b 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -647,7 +647,7 @@ Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat, const OUString& rGraphicURL, Graphic& rGraphic, const OUString& rAlternateText, const Size& rRealSize, sal_uInt32 nFrameOpts, - const sal_Char *pMarkType = nullptr, + const sal_Char *pMarkType, const ImageMap *pGenImgMap = nullptr ); Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag, diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 61a458708491..90837a3efd5c 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -148,7 +148,7 @@ protected: virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& rEntry); virtual sal_Int32 GetCurrAttrCP() const {return -1;} - virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const; + virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD) const; //Clear the para end position recorded in reader intermittently for the least impact on loading performance virtual void ClearParaEndPosition(){}; @@ -175,12 +175,12 @@ public: void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr ); - virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand = LONG_MAX, bool consumedByField=false); + virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId, bool bTstEnde=true, long nHand = LONG_MAX, bool consumedByField=false); void StealAttr(const SwNodeIndex& rNode); void MarkAllAttrsOld(); void KillUnlockedAttrs(const SwPosition& pPos); - SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = nullptr); + SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos); const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich); void Delete(const SwPaM &rPam); diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 36b88b864819..c6dfe603a070 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -225,7 +225,7 @@ public: /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it /// should be in WW8AttributeOutput only... - virtual void OutputFKP(bool /*bForce*/ = false) {} + virtual void OutputFKP(bool /*bForce*/) {} /// Output style. virtual void ParagraphStyle( sal_uInt16 nStyle ) = 0; @@ -358,7 +358,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = nullptr) = 0; // #i120928 export graphic of bullet + const SvxBrushItem* pBrush) = 0; // #i120928 export graphic of bullet protected: diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 206d55089c66..d12977e3f16e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2605,7 +2605,7 @@ void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle ) } static void impl_borderLine( FSHelperPtr const & pSerializer, sal_Int32 elementToken, const SvxBorderLine* pBorderLine, sal_uInt16 nDist, - bool bWriteShadow = false, const table::BorderLine2* rStyleProps = nullptr ) + bool bWriteShadow, const table::BorderLine2* rStyleProps = nullptr ) { // Compute val attribute value // Can be one of: @@ -2901,7 +2901,7 @@ static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBo } } -static void impl_cellMargins( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd = false, const SvxBoxItem* pDefaultMargins = nullptr) +static void impl_cellMargins( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd, const SvxBoxItem* pDefaultMargins = nullptr) { static const SvxBoxItemLine aBorders[] = { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 5e39c0a41dfe..4a8e4ea6d977 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -364,7 +364,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = nullptr ) override; + const SvxBrushItem* pBrush ) override; void WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode ); void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark ); @@ -408,7 +408,7 @@ private: /// replacement graphics, set the first as 0, and pass the remaining three. /// /// @see WriteOLE2Obj() - void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat = nullptr, SwOLENode* pOLENode = nullptr, const SdrObject* pSdrObj = nullptr); + void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode = nullptr, const SdrObject* pSdrObj = nullptr); void WriteSrcRect( const SdrObject* pSdrObj ); void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat); bool WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize ); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 5ae1b39fa0e0..a8bf2203d354 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -199,7 +199,7 @@ protected: /// Get ready for a new section. virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, - const SwFormatPageDesc* pNewPgDescFormat = nullptr, + const SwFormatPageDesc* pNewPgDescFormat, const SwPageDesc* pNewPgDesc = nullptr ) override; private: diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 303e333b39c8..073885a549e3 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -211,7 +211,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString& rNumberingString, - const SvxBrushItem* pBrush = nullptr) override;//For i120928,to export graphic of bullet + const SvxBrushItem* pBrush) override;//For i120928,to export graphic of bullet void WriteField_Impl(const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode); void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index ecef9ee60217..8c0fdae30657 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -133,7 +133,7 @@ protected: /// Get ready for a new section. virtual void PrepareNewPageDesc(const SfxItemSet* pSet, const SwNode& rNd, - const SwFormatPageDesc* pNewPgDescFormat = nullptr, + const SwFormatPageDesc* pNewPgDescFormat, const SwPageDesc* pNewPgDesc = nullptr) override; /// Return value indicates if an inherited outline numbering is suppressed. diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index df227a8d2f96..410a1c08be39 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -563,7 +563,7 @@ namespace sw @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ - ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM = nullptr); + ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM); /** fix up frame positions, must be called after SetRedlineMode */ void UpdateFramePositions(ww8::Frames & rFrames); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 5e815f038eb3..5959664c3f90 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -144,7 +144,7 @@ class WW8_WrFkp public: WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc); ~WW8_WrFkp(); - bool Append( WW8_FC nEndFc, sal_uInt16 nVarLen = 0, const sal_uInt8* pSprms = nullptr ); + bool Append( WW8_FC nEndFc, sal_uInt16 nVarLen, const sal_uInt8* pSprms = nullptr ); void Combine(); void Write( SvStream& rStrm, SwWW8WrGrf& rGrf ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index c67721700aeb..f14e961ee931 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -202,7 +202,7 @@ public: virtual bool HeaderFooterWritten(); void AppendSection( const SwPageDesc* pPd, - const SwSectionFormat* pSectionFormat = nullptr, + const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo = 0, bool bIsFirstParagraph = false ); void AppendSection( const SwFormatPageDesc& rPd, @@ -249,7 +249,7 @@ public: void AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd, - const SwSectionFormat* pSectionFormat = nullptr, + const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo = 0 ); void AppendSep( WW8_CP nStartCp, const SwFormatPageDesc& rPd, const SwNode& rNd, @@ -806,7 +806,7 @@ protected: virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, - const SwFormatPageDesc* pNewPgDescFormat = nullptr, + const SwFormatPageDesc* pNewPgDescFormat, const SwPageDesc* pNewPgDesc = nullptr ) = 0; /// Return value indicates if an inherited outline numbering is suppressed. @@ -928,7 +928,7 @@ public: bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ); using StgWriter::Write; - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = nullptr ) override; + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ) override; //Seems not an expected to provide method to access the private member SfxMedium* GetMedia() { return mpMedium; } @@ -1066,7 +1066,7 @@ public: // #i76300# virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, - const SwFormatPageDesc* pNewPgDescFormat = nullptr, + const SwFormatPageDesc* pNewPgDescFormat, const SwPageDesc* pNewPgDesc = nullptr ) override; static void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine, diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 3a0a93d436cd..afdc2779ad1d 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1551,7 +1551,7 @@ void WW8AttributeOutput::TextINetFormat( const SwFormatINetFormat& rINet ) // add optional parameter <bIncludeEmptyPicLocation> // It is needed to write an empty picture location for page number field separators static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c, - OUString* pLinkStr = nullptr, + OUString* pLinkStr, bool bIncludeEmptyPicLocation = false ) { ww::bytes aItems; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 8935a0a27342..4ff8bf4d8aa6 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -92,7 +92,7 @@ public: /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it /// should be in WW8AttributeOutput only... - virtual void OutputFKP(bool bForce = false) override; + virtual void OutputFKP(bool bForce) override; /// Output style. virtual void ParagraphStyle( sal_uInt16 nStyle ) override; @@ -196,7 +196,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = nullptr) override; //For i120928,transfer graphic of bullet + const SvxBrushItem* pBrush) override; //For i120928,transfer graphic of bullet protected: /// Output frames - the implementation. diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index b635f429d31c..d1825e9da6d3 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -374,7 +374,7 @@ protected: SwFltStackEntry& rEntry) override; virtual sal_Int32 GetCurrAttrCP() const override; - virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const override; + virtual bool IsParaEndInCPs(sal_Int32 nStart, sal_Int32 nEnd, bool bSdOD) const override; //Clear the para end position recorded in reader intermittently for the least impact on loading performance virtual void ClearParaEndPosition() override; virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) override; @@ -387,7 +387,7 @@ public: void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr); - virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) override; + virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) override; void SetToggleAttr(sal_uInt8 nId, bool bOn) { @@ -733,7 +733,7 @@ public: css::uno::Reference< css::drawing::XShape > *pShape, bool bFloatingCtrl) override; void ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj); bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, - css::uno::Reference< css::drawing::XShape > *pShapeRef=nullptr, + css::uno::Reference< css::drawing::XShape > *pShapeRef, bool bFloatingCtrl=false ); private: sal_uInt32 GenerateObjectID() { return ++mnObjectId; } @@ -1456,7 +1456,7 @@ private: const WW8_BRCVer9& aRightBrc); //returns true is a shadow was set static bool SetFlyBordersShadow(SfxItemSet& rFlySet, const WW8_BRCVer9 *pbrc, - short *SizeArray=nullptr); + short *SizeArray); static void SetPageBorder(SwFrameFormat &rFormat, const wwSection &rSection); static sal_Int32 MatchSdrBoxIntoFlyBoxItem( const Color& rLineColor, @@ -1479,7 +1479,7 @@ private: //Apo == Absolutely Positioned Object, MSWord's old-style frames WW8FlyPara *ConstructApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos); - bool StartApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos, SvxULSpaceItem* pULSpaceItem = nullptr); + bool StartApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos, SvxULSpaceItem* pULSpaceItem); void StopApo(); bool TestSameApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos); ApoTestResults TestApo(int nCellLevel, bool bTableRowEnd, @@ -1530,7 +1530,7 @@ private: void ReadDocVars(); - bool StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem = nullptr); + bool StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem); bool InEqualApo(int nLvl) const; bool InLocalApo() const { return InEqualApo(m_nInTable); } bool InEqualOrHigherApo(int nLvl) const; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 77c9d319e446..6312f985ff33 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -183,7 +183,7 @@ public: WW8TabDesc( SwWW8ImplReader* pIoClass, WW8_CP nStartCp ); bool Ok() const { return bOk; } - void CreateSwTable(SvxULSpaceItem* pULSpaceItem = nullptr); + void CreateSwTable(SvxULSpaceItem* pULSpaceItem); void UseSwTable(); void SetSizePosition(SwFrameFormat* pFrameFormat); void TableCellEnd(); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 5c85b3c973a5..9a707b88e0ed 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1326,7 +1326,7 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP* void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt32 cv, short nIdx, SvxBoxItemLine nOOIndex, sal_uInt16 nWWIndex, - short *pSize=nullptr) + short *pSize) { // LO cannot handle outset/inset (new in WW9 BRC) so fall back same as WW8 if ( nIdx == 0x1A || nIdx == 0x1B ) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 941ce82286ec..3395747643e9 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -932,7 +932,7 @@ private: const WW8Fib* pWwFib; - sal_uInt16 WhereIdx(bool* pbStart=nullptr, long* pPos=nullptr) const; + sal_uInt16 WhereIdx(bool* pbStart, long* pPos=nullptr) const; void AdjustEnds(WW8PLCFxDesc& rDesc); void GetNewSprms(WW8PLCFxDesc& rDesc); static void GetNewNoSprms(WW8PLCFxDesc& rDesc); diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index fc97b2d9efd3..254591ee08e4 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -313,7 +313,7 @@ struct WW8_BRC // BoRder Code (WW8 version) explicit WW8_BRC(const WW8_BRCVer6& brcVer6); // Returns LO border width in twips=1/20pt, taking into account brcType - short DetermineBorderProperties(short *pSpace=nullptr) const; + short DetermineBorderProperties(short *pSpace) const; }; typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 6d2719f7decf..7bae60a0cd3b 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -51,7 +51,7 @@ public: SwXMLWriter( const OUString& rBaseURL ); virtual ~SwXMLWriter(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = nullptr ) override; + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ) override; private: diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index e0729b4ad14d..0469227db681 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -73,7 +73,7 @@ class SwXMLExport : public SvXMLExport SwXMLTableInfo_Impl& rTableInfo, bool bTop=false ); - void ExportFormat( const SwFormat& rFormat, enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); + void ExportFormat( const SwFormat& rFormat, enum ::xmloff::token::XMLTokenEnum eClass ); void ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth ); void ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ); diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 66ab4202b52f..04af9f046954 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -73,7 +73,7 @@ public: const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, ::xmloff::token::XMLTokenEnum ePropToken, - SvXmlExportFlags nFlags = SvXmlExportFlags::NONE ) const; + SvXmlExportFlags nFlags ) const; /** this method is called for every item that has the MID_SW_FLAG_SPECIAL_ITEM_EXPORT flag set */ @@ -82,7 +82,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet *pSet = nullptr ) const; + const SfxItemSet *pSet ) const; /** this method is called for every item that has the MID_SW_FLAG_NO_ITEM_EXPORT flag set */ diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 59814de87cbb..93f3ba98028d 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -176,7 +176,7 @@ public: bool FindAutomaticStyle( sal_uInt16 nFamily, const OUString& rName, - const SfxItemSet **ppItemSet=nullptr, + const SfxItemSet **ppItemSet, OUString *pParent=nullptr ) const; virtual void SetStatistics( diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index b3b9c34196ab..04c1fad8b193 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -75,7 +75,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet *pSet = nullptr ) const override; + const SfxItemSet *pSet ) const override; virtual void handleElementItem( SvXMLExport& rExport, diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 04fd0b945434..980d945ea322 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -147,7 +147,7 @@ public: void InsertColumn( sal_Int32 nWidth, bool bRelWidth, const OUString *pDfltCellStyleName = nullptr ); - sal_Int32 GetColumnWidth( sal_uInt32 nCol, sal_uInt32 nColSpan=1UL ) const; + sal_Int32 GetColumnWidth( sal_uInt32 nCol, sal_uInt32 nColSpan ) const; OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const; inline sal_uInt32 GetColumnCount() const; inline bool HasColumnDefaultCellStyleNames() const; @@ -158,7 +158,7 @@ public: bool IsValid() const { return m_pTableNode != nullptr; } void InsertCell( const OUString& rStyleName, - sal_uInt32 nRowSpan=1U, sal_uInt32 nColSpan=1U, + sal_uInt32 nRowSpan, sal_uInt32 nColSpan=1U, const SwStartNode *pStNd=nullptr, const OUString & i_rXmlId = OUString(), SwXMLTableContext *pTable=nullptr, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 3b365b433989..2fb03ef002b4 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -393,7 +393,7 @@ public: virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) override; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(SwWrtShell &rSh, - SwField* pField, bool bNextButton = false) override; + SwField* pField, bool bNextButton) override; virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) override; virtual AbstractSwLabDlg* CreateSwLabDlg(const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) override; @@ -402,7 +402,7 @@ public: virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, - const OUString *pCollName = nullptr, + const OUString *pCollName, bool bDraw = false, const OString& sDefPage = OString() ) override; @@ -437,14 +437,14 @@ public: vcl::Window *pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage = OString(), + const OString& sPage, SwWrtShell* pActShell = nullptr, bool bNew = false) override; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) override; virtual AbstractFieldInputDlg* CreateFieldInputDlg(vcl::Window *pParent, - SwWrtShell &rSh, SwField* pField, bool bNextButton = false) override; + SwWrtShell &rSh, SwField* pField, bool bNextButton) override; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) override; virtual VclAbstractDialog * CreateTitlePageDlg ( vcl::Window * pParent ) override; @@ -468,7 +468,7 @@ public: virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, - SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, + SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal = false) override; virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) override; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index d97dc32e72bc..92495a45ce9d 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -62,7 +62,7 @@ protected: void Init(); void SavePos( const ListBox* pLst1); void RestorePos( ListBox* pLst1 ); - void EnableInsert(bool bEnable = true); + void EnableInsert(bool bEnable); inline bool IsFieldEdit() const { return m_bFieldEdit; } // insert field diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index bf2c76d792af..7c14810e829d 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -69,7 +69,7 @@ class SwFieldRefPage : public SwFieldPage void SubTypeHdl(); - void UpdateSubType(const OUString& filterString = OUString()); + void UpdateSubType(const OUString& filterString); static bool MatchSubstring( const OUString& list_string, const OUString& substr ); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 1779f09f46c3..f45b04469766 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -84,7 +84,7 @@ public: long SkipToNextToken(); - sal_Int32 FindNextStringPiece( sal_Int32 _nStart = -1 ); + sal_Int32 FindNextStringPiece( sal_Int32 _nStart ); OUString GetResult() const; const OUString& GetFieldName()const { return aFieldName; } diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index b46f4f3a6614..f787ec56cd1e 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -32,7 +32,7 @@ private: private: SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException); - void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly = false ); + void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly ); static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum); static sal_Int32 GetColCount( SwTabCols& rCols ); static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException); diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx index c23e5b4b7e0c..c9b59dcb6fe9 100644 --- a/sw/source/uibase/inc/colmgr.hxx +++ b/sw/source/uibase/inc/colmgr.hxx @@ -40,7 +40,7 @@ public: void SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWidth); inline bool IsAutoWidth() const; - void SetAutoWidth(bool bOn = true, sal_uInt16 lGutterWidth = 0); + void SetAutoWidth(bool bOn, sal_uInt16 lGutterWidth = 0); inline bool HasLine() const; inline void SetNoLine(); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 1b713de27748..f689f1b3c199 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -146,7 +146,7 @@ friend void PageNumNotify( SwViewShell* pVwSh, void RstMBDownFlags(); - void ChangeFly( sal_uInt8 nDir, bool bWeb = false ); + void ChangeFly( sal_uInt8 nDir, bool bWeb ); void ChangeDrawing( sal_uInt8 nDir ); bool EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index e65f163d0957..f8ca5c3d3eb3 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -136,7 +136,7 @@ public: void InsertFieldType(SwFieldType& rType); - bool ChooseMacro(const OUString &rSelMacro = OUString()); + bool ChooseMacro(const OUString &rSelMacro); void SetMacroPath(const OUString& rPath); const OUString& GetMacroPath() const { return sMacroPath; } const OUString& GetMacroName() const { return sMacroName; } @@ -162,7 +162,7 @@ public: // access via TypeId from the dialog // Ids for a range of fields static const SwFieldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId); - static sal_uInt16 GetGroup(sal_uInt16 nTypeId, sal_uInt16 nSubType = 0); + static sal_uInt16 GetGroup(sal_uInt16 nTypeId, sal_uInt16 nSubType); // the current field's TypeId sal_uInt16 GetCurTypeId() const; @@ -188,7 +188,7 @@ public: // of many expression fields (see labels) inline void SetEvalExpFields(bool bEval); - void EvalExpFields(SwWrtShell* pSh = nullptr); + void EvalExpFields(SwWrtShell* pSh); }; inline void SwFieldMgr::SetEvalExpFields(bool bEval) diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx index a6cb37f054d7..12bf41dcb48d 100644 --- a/sw/source/uibase/inc/formatclipboard.hxx +++ b/sw/source/uibase/inc/formatclipboard.hxx @@ -46,7 +46,7 @@ public: * @param bPersistentCopy * input parameter - specify if the Paste function will erase the current object. */ - void Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy=false ); + void Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy ); /** * Paste the stored text and paragraph attributes on the current selection and current paragraph. @@ -58,7 +58,7 @@ public: * Do not paste the paragraph formats. */ void Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPool - , bool bNoCharacterFormats=false, bool bNoParagraphFormats=false ); + , bool bNoCharacterFormats, bool bNoParagraphFormats=false ); /** * Clear the currently stored text and paragraph attributes. diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 6e4a27a00620..117c238583b9 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -93,9 +93,9 @@ public: void SetHeightSizeType(SwFrameSize eType); // space to content - void SetLRSpace( long nLeft = LONG_MAX, + void SetLRSpace( long nLeft, long nRight = LONG_MAX ); - void SetULSpace( long nTop = LONG_MAX, + void SetULSpace( long nTop, long nBottom= LONG_MAX ); void SetCol( const SwFormatCol &rCol); diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx index 333c7886f545..3ad60ed733f7 100644 --- a/sw/source/uibase/inc/gloshdl.hxx +++ b/sw/source/uibase/inc/gloshdl.hxx @@ -45,7 +45,7 @@ public: void GlossaryDlg(); size_t GetGroupCnt() const; - OUString GetGroupName( size_t, OUString* pTitle = nullptr ); + OUString GetGroupName( size_t, OUString* pTitle ); void NewGroup(OUString & rGroupName, const OUString& rTitle); bool DelGroup(const OUString &); void RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 33761318e5b9..300d976cd1fa 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -52,7 +52,7 @@ public: void Clear(); - inline void SetOneArea(bool bOnlyOne = true) { bOneArea = bOnlyOne; } + inline void SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; } void SetFormatType(const short nFormatType); inline short GetFormatType() const { return nCurrFormatType; } diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index b46b880fcc1e..8383578045cc 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -215,7 +215,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell optional input parameter - pointer to the <SfxRequest> instance, if existing. */ SAL_DLLPRIVATE void ExecPgUpAndPgDown( const bool _bPgUp, - SfxRequest* _pReq = nullptr ); + SfxRequest* _pReq ); protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override; diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index 066ea5fd1ec4..73606b538cc9 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -281,7 +281,7 @@ public: // methods for directories - bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = nullptr, const SfxItemSet* pSet = nullptr); + bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase, const SfxItemSet* pSet = nullptr); const SwTOXType* GetTOXType(TOXTypes eTyp) const; const SwTOXBase* GetCurTOX(); |