diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-18 14:34:31 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-19 08:15:49 +0200 |
commit | a6a2b2826dbf248821147212a2ee9ecdcadd301f (patch) | |
tree | 25bd59c84e27aba2e947fd3df22409f10e106568 /sw/source/filter | |
parent | f97bc791b0879af3fd1bc2d1f7753ce5ffa6ac5e (diff) |
loplugin:countusersofdefaultparams in sw
Change-Id: I668bfe93d77b06385544651583bcf71f6b5df2fc
Diffstat (limited to 'sw/source/filter')
27 files changed, 48 insertions, 48 deletions
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, |