diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-22 14:35:27 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-25 06:09:17 +0000 |
commit | 938821fb08e427864db6a10642f385bde9803f6c (patch) | |
tree | 759da9d0d0905a90f6dac2f0bf750721c17421c4 /sw | |
parent | 4d4d77a1aad1bcae18bad35dad5308d33d6b2e51 (diff) |
new loplugin overrideparam
verify that parameters on override methods have the same set of default
values for their params as their parent/super-methods do.
Change-Id: Ibdbc1c6e417fbaa680ea025a6bbf5ba9c2e5bcd2
Reviewed-on: https://gerrit.libreoffice.org/27437
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docstyle.hxx | 2 | ||||
-rw-r--r-- | sw/inc/paratr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotxdoc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/view.hxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/inc/DocumentStatisticsManager.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/inc/SwXMLBlockExport.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/attributeoutputbase.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8attributeoutput.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/envfmt.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/envprt.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/labfmt.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/labprt.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/swuilabimp.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/envlop.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/pgfnote.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/pggrid.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/swuicnttab.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/table/tablepg.hxx | 4 |
23 files changed, 37 insertions, 37 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 50ac3c954cd2..51638568e64a 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -111,7 +111,7 @@ class SW_DLLPUBLIC SwDocShell /// Make DocInfo known to the Doc. SAL_DLLPRIVATE virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(const SfxItemSet &) override; /// OLE-stuff - SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) override; + SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16 = ASPECT_CONTENT) override; /// Methods for StyleSheets diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 49f240442841..bb43d7d1748d 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -204,7 +204,7 @@ public: SwDocStyleSheetPool( SwDoc&, bool bOrganizer = false ); virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily, - sal_uInt16 nMask) override; + sal_uInt16 nMask = SFXSTYLEBIT_ALL) override; virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ) override; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 3b62b520f23c..347130772796 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -166,7 +166,7 @@ public: OUString &rText, const IntlWrapper* pIntl = nullptr ) const override; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index ba64db4ec5e3..e62002b6314b 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -109,7 +109,7 @@ public: //from class SalFrame virtual void SetWindowState( const OString & rStr ) = 0; virtual OString GetWindowState() const = 0; - virtual void EndDialog(long ) override = 0; + virtual void EndDialog(long nResult) override = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 077493f2be74..a374f8df9987 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -419,7 +419,7 @@ public: /// @see vcl::ITiledRenderable::postKeyEvent(). virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override; /// @see vcl::ITiledRenderable::postMouseEvent(). - virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons = MOUSE_LEFT, int nModifier = 0) override; + virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier) override; /// @see vcl::ITiledRenderable::setTextSelection(). virtual void setTextSelection(int nType, int nX, int nY) override; /// @see vcl::ITiledRenderable::getTextSelection(). diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index a0b051973679..66ce27e9d499 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -391,7 +391,7 @@ public: OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); - virtual bool HasSelection( bool bText ) const override; + virtual bool HasSelection( bool bText = true ) const override; virtual OUString GetSelectionText( bool bCompleteWords = false ) override; virtual bool PrepareClose( bool bUI = true ) override; virtual void MarginChanged() override; diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index c20fe735ebac..6c6854976e50 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -221,8 +221,8 @@ void SwTiledRenderingTest::testPostMouseEvent() Point aStart = pShellCursor->GetSttPos(); aStart.setX(aStart.getX() - 1000); - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aStart.getX(), aStart.getY(), 1); - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aStart.getX(), aStart.getY(), 1); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0); // The new cursor position must be before the first word. CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), pShellCursor->GetPoint()->nContent.GetIndex()); comphelper::LibreOfficeKit::setActive(false); @@ -737,8 +737,8 @@ void SwTiledRenderingTest::testViewCursorVisibility() SdrPage* pPage = pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0); SdrObject* pObject = pPage->GetObj(0); Point aCenter = pObject->GetSnapRect().Center(); - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aCenter.getX(), aCenter.getY(), 1); - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aCenter.getX(), aCenter.getY(), 1); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aCenter.getX(), aCenter.getY(), 1, MOUSE_LEFT, 0); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aCenter.getX(), aCenter.getY(), 1, MOUSE_LEFT, 0); Scheduler::ProcessEventsToIdle(); // Make sure the "view/text" cursor of the first view gets a notification. CPPUNIT_ASSERT(!aView1.m_bViewCursorVisible); @@ -767,8 +767,8 @@ void SwTiledRenderingTest::testViewCursorCleanup() SdrObject* pObject = pPage->GetObj(0); Point aCenter = pObject->GetSnapRect().Center(); aView1.m_bGraphicViewSelection = false; - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aCenter.getX(), aCenter.getY(), 1); - pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aCenter.getX(), aCenter.getY(), 1); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aCenter.getX(), aCenter.getY(), 1, MOUSE_LEFT, 0); + pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aCenter.getX(), aCenter.getY(), 1, MOUSE_LEFT, 0); Scheduler::ProcessEventsToIdle(); // Make sure there is a graphic view selection on the first view. CPPUNIT_ASSERT(aView1.m_bGraphicViewSelection); diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 489adbd34251..e79d24bb937a 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -38,9 +38,9 @@ public: void DocInfoChgd(bool isEnableSetModified) override; const SwDocStat &GetDocStat() const override; void SetDocStatModified(bool bSet); - const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) override; + const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool bFields) override; void SetDocStat(const SwDocStat& rStat) override; - void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) override; + void UpdateDocStat(bool bCompleteAsync, bool bFields) override; virtual ~DocumentStatisticsManager(); private: diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index cbafb3024c82..7c9b7a4f4787 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -37,7 +37,7 @@ public: css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport() {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) override; + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; void ExportAutoStyles_() override {} void ExportMasterStyles_ () override {} void ExportContent_() override {} diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 046ca8d81118..36b88b864819 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -190,7 +190,7 @@ public: virtual void WritePostitFieldReference() {}; /// Output text (inside a run). - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) = 0; + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) = 0; /// Output text (without markup). virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) = 0; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 392f3316738e..5e39c0a41dfe 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -217,7 +217,7 @@ public: void EndRedline( const SwRedlineData * pRedlineData ); virtual void SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame ) override; - virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode = false ) override; + virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode ) override; virtual bool IsFlyProcessingPostponed() override; virtual void ResetFlyProcessingFlag() override; @@ -241,7 +241,7 @@ public: virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override; virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override; + virtual void TableRowEnd( sal_uInt32 nDepth ) override; /// Start of the styles table. virtual void StartStyles() override; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 9404b6ff1183..8935a0a27342 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -65,7 +65,7 @@ public: virtual void EndRunProperties( const SwRedlineData* pRedlineData ) override; /// Output text. - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) override; + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) override; /// Output text (without markup). virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override; @@ -111,7 +111,7 @@ public: virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override; virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override; + virtual void TableRowEnd( sal_uInt32 nDepth ) override; /// Start of the styles table. virtual void StartStyles() override; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 2c31960d8c43..b635f429d31c 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -770,7 +770,7 @@ public: void DisableFallbackStream(); void EnableFallbackStream(); protected: - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj = nullptr ) override; }; class wwSection diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index ef2226613fca..e03c3d536c6f 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -65,7 +65,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 6f76a48b8d20..bda4f88a0c34 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -64,7 +64,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 1e3a63f5df0b..c48d0921adfd 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -105,7 +105,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index fa4454bc7c1a..9706cd34d57f 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -59,7 +59,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index d0ee7f443719..548411c5827c 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -67,7 +67,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -119,7 +119,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; @@ -158,7 +158,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; @@ -195,7 +195,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 6c9be69b14d2..de03b654d16d 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -109,7 +109,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 1b8bc1183e9d..762da876b393 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -69,7 +69,7 @@ private: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index df3fda8f8087..871598f434ac 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -95,7 +95,7 @@ public: virtual void Reset(const SfxItemSet *rSet) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; #endif diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 38ffb0302e7b..31d3718e7ad5 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -228,7 +228,7 @@ public: virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -443,7 +443,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -491,7 +491,7 @@ public: virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 3fddccba05f8..8a20880661b4 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -88,7 +88,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; // TabPage Format/Table/Columns @@ -139,7 +139,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; |