diff options
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.hxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 2 |
4 files changed, 8 insertions, 8 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, |