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 | |
| 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>
139 files changed, 417 insertions, 220 deletions
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 7db88289ed64..ee3c30f77ec9 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -112,7 +112,7 @@ private: virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; virtual void OuterResizePixel( const Point &rPos, const Size &rSize ) override; sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin); - virtual bool PrepareClose( bool bUI ) override; + virtual bool PrepareClose( bool bUI = true ) override; void SetCurWindow (BaseWindow* pNewWin, bool bUpdateTabBar = false, bool bRememberAsCurrent = true); void ManageToolbars(); @@ -169,10 +169,10 @@ public: virtual css::uno::Reference< css::view::XRenderable > GetRenderable() override; // virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 ); - virtual SfxPrinter* GetPrinter( bool bCreate ) override; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; - virtual OUString GetSelectionText( bool bCompleteWords ) override; - virtual bool HasSelection( bool bText ) const override; + virtual OUString GetSelectionText( bool bCompleteWords = false ) override; + virtual bool HasSelection( bool bText = true ) const override; void GetState( SfxItemSet& ); void ExecuteGlobal( SfxRequest& rReq ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index cfd4435bb933..fa5c9271d8af 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 0224bf4c9003..414794d929b6 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); diff --git a/compilerplugins/clang/overrideparam.cxx b/compilerplugins/clang/overrideparam.cxx new file mode 100644 index 000000000000..c04165bbd8c2 --- /dev/null +++ b/compilerplugins/clang/overrideparam.cxx @@ -0,0 +1,179 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <string> +#include <set> + +#include "plugin.hxx" +#include "compat.hxx" +#include "check.hxx" + +/* + Find overriden methods that : + (a) declare default params in different palces to their super-method(s) + + Still TODO + (b) Find places where the values of the default parameters are different + (c) Find places where the names of the parameters differ +*/ + +namespace { + +class OverrideParam: + public RecursiveASTVisitor<OverrideParam>, public loplugin::Plugin +{ +public: + explicit OverrideParam(InstantiationData const & data): Plugin(data) {} + + virtual void run() override; + + bool VisitCXXMethodDecl(const CXXMethodDecl *); + +private: + bool hasSameDefaultParams(const ParmVarDecl * parmVarDecl, const ParmVarDecl * superParmVarDecl); +}; + +void OverrideParam::run() +{ + /* + StringRef fn( compiler.getSourceManager().getFileEntryForID( + compiler.getSourceManager().getMainFileID())->getName() ); + if (fn == SRCDIR "/include/svx/checklbx.hxx") + return; +*/ + TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); +} + +bool OverrideParam::VisitCXXMethodDecl(const CXXMethodDecl * methodDecl) { + if (ignoreLocation(methodDecl)) { + return true; + } + if (methodDecl->isThisDeclarationADefinition() || methodDecl->size_overridden_methods() == 0) { + return true; + } + loplugin::DeclCheck dc(methodDecl); + // there is an InsertEntry override here which causes trouble if I modify it + if (dc.Function("InsertEntry").Class("SvxCheckListBox").GlobalNamespace()) { + return true; + } + // This class is overriding ShowCursor(bool) AND declaring a ShowCursor() method. + // Adding a default param causes 'ambiguous override'. + if (dc.Function("ShowCursor").Class("ScTabViewShell").GlobalNamespace()) { + return true; + } + + for(auto superMethodIt = methodDecl->begin_overridden_methods(); + superMethodIt != methodDecl->end_overridden_methods(); ++superMethodIt) + { + const CXXMethodDecl * superMethodDecl = *superMethodIt; + if (ignoreLocation(superMethodDecl)) { + continue; + } + int i = 0; + for (const ParmVarDecl *superParmVarDecl : compat::parameters(*superMethodDecl)) { + const ParmVarDecl *parmVarDecl = methodDecl->getParamDecl(i); + if (parmVarDecl->hasDefaultArg() && !superParmVarDecl->hasDefaultArg()) { + report( + DiagnosticsEngine::Warning, + "overridden method declaration has default arg, but super-method does not", + parmVarDecl->getSourceRange().getBegin()) + << parmVarDecl->getSourceRange(); + report( + DiagnosticsEngine::Note, + "original param here", + superParmVarDecl->getSourceRange().getBegin()) + << superParmVarDecl->getSourceRange(); + } + else if (!parmVarDecl->hasDefaultArg() && superParmVarDecl->hasDefaultArg()) { + report( + DiagnosticsEngine::Warning, + "overridden method declaration has no default arg, but super-method does", + parmVarDecl->getSourceRange().getBegin()) + << parmVarDecl->getSourceRange(); + report( + DiagnosticsEngine::Note, + "original param here", + superParmVarDecl->getSourceRange().getBegin()) + << superParmVarDecl->getSourceRange(); + } + else if (parmVarDecl->hasDefaultArg() && superParmVarDecl->hasDefaultArg() + && !hasSameDefaultParams(parmVarDecl, superParmVarDecl)) { + /* do nothing for now, will enable this in a later commit + report( + DiagnosticsEngine::Warning, + "overridden method declaration has different default param to super-method", + parmVarDecl->getSourceRange().getBegin()) + << parmVarDecl->getSourceRange(); + report( + DiagnosticsEngine::Note, + "original param here", + superParmVarDecl->getSourceRange().getBegin()) + << superParmVarDecl->getSourceRange(); + */ + } + /* do nothing for now, will enable this in a later commit + if (methodDecl->isThisDeclarationADefinition() && parmVarDecl->getName().empty()) { + // ignore this - means the param is unused + } + else if (superParmVarDecl->getName().empty()) { + // ignore, nothing reasonable I can do + } + else if (superParmVarDecl->getName() != parmVarDecl->getName()) { + report( + DiagnosticsEngine::Warning, + "overridden method declaration uses different name for parameter", + parmVarDecl->getSourceRange().getBegin()) + << parmVarDecl->getSourceRange(); + report( + DiagnosticsEngine::Note, + "original param here", + superParmVarDecl->getSourceRange().getBegin()) + << superParmVarDecl->getSourceRange(); + }*/ + ++i; + } + } + return true; +} + +bool OverrideParam::hasSameDefaultParams(const ParmVarDecl * parmVarDecl, const ParmVarDecl * superParmVarDecl) +{ + // don't know what this means, but it prevents a clang crash + if (parmVarDecl->hasUninstantiatedDefaultArg() || superParmVarDecl->hasUninstantiatedDefaultArg()) { + return false; + } + const Expr* defaultArgExpr = parmVarDecl->getDefaultArg(); + const Expr* superDefaultArgExpr = superParmVarDecl->getDefaultArg(); + + if (defaultArgExpr->isNullPointerConstant(compiler.getASTContext(), Expr::NPC_NeverValueDependent) + && superDefaultArgExpr->isNullPointerConstant(compiler.getASTContext(), Expr::NPC_NeverValueDependent)) + { + return true; + } + APSInt x1, x2; + if (defaultArgExpr->EvaluateAsInt(x1, compiler.getASTContext()) + && superDefaultArgExpr->EvaluateAsInt(x2, compiler.getASTContext())) + { + return x1 == x2; + } + // catch params with defaults like "= OUString()" + if (isa<MaterializeTemporaryExpr>(defaultArgExpr) + && isa<MaterializeTemporaryExpr>(superDefaultArgExpr)) + { + return true; + } + return false; +} + + +loplugin::Plugin::Registration< OverrideParam > X("overrideparam"); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index a536d0c5b452..47e7cac831d7 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -178,7 +178,7 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack) OOperand* pOperand = rCodeStack.top(); rCodeStack.pop(); - rCodeStack.push(new OOperandResultBOOL(operate(pOperand))); + rCodeStack.push(new OOperandResultBOOL(operate(pOperand, nullptr))); if( typeid(OOperandResult) == typeid(*pOperand)) delete pOperand; @@ -201,7 +201,7 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack) OOperand* pOperand = rCodeStack.top(); rCodeStack.pop(); - rCodeStack.push(new OOperandResultBOOL(operate(pOperand))); + rCodeStack.push(new OOperandResultBOOL(operate(pOperand, nullptr))); if( typeid(OOperandResult) == typeid(*pOperand)) delete pOperand; } @@ -215,7 +215,7 @@ bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const { - return !OOp_ISNULL::operate(pOperand); + return !OOp_ISNULL::operate(pOperand, nullptr); } diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index a8ab004cd06e..f71885170979 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.hxx @@ -250,7 +250,7 @@ namespace connectivity class OOp_Cos : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** SIN(X) @@ -263,7 +263,7 @@ namespace connectivity class OOp_Sin : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** TAN(X) Returns the tangent of X, where X is given in radians: @@ -274,7 +274,7 @@ namespace connectivity class OOp_Tan : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** ACOS(X) @@ -290,7 +290,7 @@ namespace connectivity class OOp_ACos : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** ASIN(X) @@ -304,7 +304,7 @@ namespace connectivity class OOp_ASin : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** ATAN(X) @@ -318,7 +318,7 @@ namespace connectivity class OOp_ATan : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** ATAN2(Y,X) @@ -345,7 +345,7 @@ namespace connectivity class OOp_Degrees : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; /** RADIANS(X) @@ -358,7 +358,7 @@ namespace connectivity class OOp_Radians : public OUnaryOperator { protected: - virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const override; + virtual ORowSetValue operate(const ORowSetValue& lhs) const override; }; } } diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 9d8082a188bb..afd62c78b3d1 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -200,7 +200,7 @@ namespace connectivity protected: virtual void Exec(OCodeStack&) override; - virtual bool operate(const OOperand*, const OOperand* = nullptr) const override; + virtual bool operate(const OOperand*, const OOperand*) const override; }; class OOp_AND : public OBoolOperator @@ -223,13 +223,13 @@ namespace connectivity public: public: virtual void Exec(OCodeStack&) override; - virtual bool operate(const OOperand*, const OOperand* = nullptr) const override; + virtual bool operate(const OOperand*, const OOperand*) const override; }; class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL { public: - virtual bool operate(const OOperand*, const OOperand* = nullptr) const override; + virtual bool operate(const OOperand*, const OOperand*) const override; }; class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 7359f06cca45..1196aa3556dc 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -134,7 +134,7 @@ public: class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog { DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog) - virtual void EndDialog(long nResult = 0) override; + virtual void EndDialog(long nResult) override; virtual void EnableRubySupport( bool _bVal ) override; virtual void SetByCharacter( bool _bByCharacter ) override ; virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) override; @@ -484,7 +484,7 @@ public: virtual VclAbstractDialog* CreateEditObjectDialog( const OUString& rCommmand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override; virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) override; - virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=nullptr ) override; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML = false, sfx2::SvBaseLink* p=nullptr ) override; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) override; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 6a7b367b28b1..1914f68c253d 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -283,7 +283,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); @@ -343,7 +343,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetLanguage(LanguageType eSet); }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index c6d7f7b54fff..c668a12e9e4b 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -64,7 +64,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 10e4a335c7c5..cb0814096ed1 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -60,7 +60,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; void SetTableMode(); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 0f94ede6a940..9600ca627442 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -144,7 +144,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: virtual ~SvxCharNamePage(); @@ -233,7 +233,7 @@ public: virtual void dispose() override; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -313,7 +313,7 @@ public: using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -361,7 +361,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 9ccd26809688..16e84b118594 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -127,7 +127,7 @@ public: virtual void Reset( const SfxItemSet& ) override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& rItemSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; bool IsMarkWndVisible () { return static_cast<vcl::Window*>(mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 95f5c7cbe494..0fee236e258a 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -76,7 +76,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; void SetInfoItem( const SvxNumberInfoItem& rItem ); void SetNumberFormatList( const SvxNumberInfoItem& rItem ) diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index abb31ee03f34..b9e88a517146 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -187,7 +187,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index a0e7dd812b90..3e75cbfafb36 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -95,7 +95,7 @@ private: DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: @@ -162,7 +162,7 @@ class SvxParaAlignTabPage : public SfxTabPage SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: virtual ~SvxParaAlignTabPage(); @@ -214,7 +214,7 @@ public: void DisablePageBreak(); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 691533d46891..5719744fc993 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -61,7 +61,7 @@ public: void DisableControls( const TabulatorDisableFlags nFlag ); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 89d76b497f6b..66688811af5a 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -61,7 +61,7 @@ private: DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void ); DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 90a4eb58b56c..be755b99c597 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -150,7 +150,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 07031cb51914..207d9cc0d22f 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -52,7 +52,7 @@ private: inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 5ce4eabf3e51..efd3456efc7c 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -175,7 +175,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void callModifiedHdl(void* pControl) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 17707c8fd3f6..c864a2c105c0 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -145,7 +145,7 @@ namespace dbaui void DbaIndexList::SelectNoHandlerCall( SvTreeListEntry* _pEntry ) { disableSelectHandler(); - Select(_pEntry, true); + Select(_pEntry ); enableSelectHandler(); } diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 41fd44166cf7..ee1534573e9f 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -54,7 +54,7 @@ namespace dbaui void SetEndEditHdl(const Link<SvTreeListEntry*,bool>& _rHdl) { m_aEndEditHdl = _rHdl; } - virtual bool Select(SvTreeListEntry* pEntry, bool bSelect) override; + virtual bool Select(SvTreeListEntry* pEntry, bool bSelect = true) override; void enableSelectHandler(); void disableSelectHandler(); diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 5244941adadf..134d0f641d28 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -43,7 +43,7 @@ namespace dbaui virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; - virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) override; + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData = nullptr) override; bool isEmphasized() const { return m_bEmphasized; } void emphasize(bool _bEmphasize) { m_bEmphasized = _bEmphasize; } diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 5f36818b5ddd..73df5592a5b3 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -37,7 +37,7 @@ public: css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLAutoCorrectExport() {} - 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 {} @@ -57,7 +57,7 @@ public: css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLExceptionListExport() {} - 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/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 84ba1e76e065..8291eb9ce193 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -108,7 +108,7 @@ public: virtual void onAsyncOperationFinished() override; virtual void UpdateControls( const OUString& rURL ) override; - virtual void EnableAutocompletion( bool ) override; + virtual void EnableAutocompletion( bool = true) override; virtual sal_Int32 getTargetColorDepth() override; virtual sal_Int32 getAvailableWidth() override; diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index f18edb6062c6..3235e36fa53a 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -76,7 +76,7 @@ public: SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl ) const override; + const IntlWrapper *pIntl = nullptr ) 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; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index cec7c3db40f3..a32a492da887 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -471,7 +471,7 @@ public: PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const; - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = nullptr ) override; virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) override; void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 6003cd2ad8a7..57a62ff90920 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -511,7 +511,7 @@ protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); @@ -630,7 +630,7 @@ private: protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 5cb65acbc380..78408344b20a 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -93,7 +93,7 @@ protected: using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) override; using TabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage(SfxItemSet * = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *) override; public: SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 3d56b668aded..ab1b91428e7a 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -86,7 +86,7 @@ private: protected: using TabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 2f624453b87a..b374cddb2fb0 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -52,7 +52,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem public: SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=nullptr); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; }; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index b5373f71a300..e3958e768066 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -336,7 +336,7 @@ public: /** Creates and returns the accessible object of the header bar. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& ); - virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override; + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ) override; }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 06b3a40e33c7..83cbf2c2d68c 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -113,7 +113,7 @@ public: virtual sal_uInt16 GetType() const override; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) override; + SvViewDataItem* pViewData = nullptr) override; const OUString& GetText() const { @@ -140,7 +140,7 @@ public: SvLBoxBmp(); virtual ~SvLBoxBmp(); virtual sal_uInt16 GetType() const override; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override; + virtual void InitViewData( SvTreeListBox* ,SvTreeListEntry*, SvViewDataItem* = nullptr ) override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; virtual SvLBoxItem* Create() const override; @@ -167,7 +167,7 @@ public: virtual ~SvLBoxButton(); virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) override; + SvViewDataItem* pViewData = nullptr) override; virtual sal_uInt16 GetType() const override; bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); @@ -252,7 +252,7 @@ public: virtual sal_uInt16 GetType() const override; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) override; + SvViewDataItem* pViewData = nullptr) override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 053bb7fac385..1c486797591c 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -316,7 +316,7 @@ public: { return pModel->GetChildSelectionCount(this,pParent); } // Does not call the Select Handler - virtual void SelectAll( bool bSelect, bool ) + virtual void SelectAll( bool bSelect, bool /*bPaint*/ = true ) { pModel->SelectAll(this, bSelect); } bool IsEntryVisible( SvTreeListEntry* pEntry ) const diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 1da709582415..643c13217b8c 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -39,7 +39,7 @@ public: SvxClipboardFormatItem( const SvxClipboardFormatItem& ); virtual ~SvxClipboardFormatItem(); - 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 AddClipbrdFormat( SotClipboardFormatId nId ); diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index eed5eb3f5ca0..9174b97ad193 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -45,7 +45,7 @@ public: /** Creates a new empty list box item. */ virtual SvLBoxItem* Create() const override; - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override; + void InitViewData( SvTreeListBox*, SvTreeListEntry*, SvViewDataItem* = nullptr ) override; /** Paints this entry to the specified position, using the own font settings. */ virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index d95d0a99c3d8..92683859b543 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -65,7 +65,7 @@ protected: static const sal_uInt16 pRanges[]; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 05729bcb3000..637a7a0553be 100755 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -141,7 +141,7 @@ public: void SetSrchFlag( bool bSuccess ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } virtual css::uno::Reference< css::awt::XWindowPeer > - GetComponentInterface( bool bCreate ) override; + GetComponentInterface( bool bCreate = true ) override; void SetSaveToModule(bool b); diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 5f1c8b7ada69..5a784bcb5023 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -65,7 +65,7 @@ public: Svx3DReducedLineGeometryItem(bool bVal = false); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { @@ -286,7 +286,7 @@ public: Svx3DSmoothNormalsItem(bool bVal = true); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack @@ -295,7 +295,7 @@ public: Svx3DSmoothLidsItem(bool bVal = false); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode @@ -304,7 +304,7 @@ public: Svx3DCharacterModeItem(bool bVal = false); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront @@ -313,7 +313,7 @@ public: Svx3DCloseFrontItem(bool bVal = true); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack @@ -322,7 +322,7 @@ public: Svx3DCloseBackItem(bool bVal = true); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; - SfxPoolItem * Clone(SfxItemPool *) const override; + SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; #endif // INCLUDED_SVX_SVX3DITEMS_HXX diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 0f308fb3d635..7423cd8b1efd 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -32,7 +32,7 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr); XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; }; diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 1254d9b91686..8f131202d146 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -33,7 +33,7 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr); XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; }; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 1bae0a89458c..447543367f96 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -669,7 +669,21 @@ public: SvScriptStream(const OUString& rUrl); virtual ~SvScriptStream(); - virtual bool ReadLine(OString &rStr, sal_Int32) override; + /** Read a line of bytes. + + @param nMaxBytesToRead + Maximum of bytes to read, if line is longer it will be + truncated. + + @note NOTE that the default is one character less than STRING_MAXLEN to + prevent problems after conversion to String that may be lurking + in various places doing something like + @code + for (sal_uInt16 i=0; i < aString.Len(); ++i) + @endcode + causing endless loops ... + */ + virtual bool ReadLine(OString& rStr, sal_Int32 nMaxBytesToRead = 0xFFFE ) override; virtual bool good() const override; }; diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx index b703eec536c6..95bfbf950f06 100644 --- a/include/unotools/options.hxx +++ b/include/unotools/options.hxx @@ -43,7 +43,7 @@ namespace utl { public: virtual ~ConfigurationListener(); - virtual void ConfigurationChanged( ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) = 0; + virtual void ConfigurationChanged( ConfigurationBroadcaster* p, sal_uInt32 nHint ) = 0; }; typedef ::std::vector< ConfigurationListener* > IMPL_ConfigurationListenerList; @@ -85,7 +85,7 @@ private: void operator =(Options &) = delete; protected: - virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) override; + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint ) override; }; } } diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 5ea675cd199c..25b28c7d5510 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -47,7 +47,7 @@ public: class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog { public: - virtual void EndDialog(long nResult =0) = 0; + virtual void EndDialog(long nResult) = 0; }; class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 44dc4e8f021a..c667d644e7a8 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -60,7 +60,7 @@ public: void ExportAutoStyles_() override {} void ExportMasterStyles_() override {} void ExportContent_() override; - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override; + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; bool Export(); }; diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index 3e5964aa058a..ad695124170e 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -196,7 +196,7 @@ class LwpFormulaInfo : public LwpCellList public: LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm); OUString Convert(LwpTableLayout* pCellsMap); - void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) override; + void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr) override; protected: void Read() override; bool ReadCellID(); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 352a95ba0a92..0ae4902119ea 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -60,7 +60,7 @@ public: virtual SdrPage* Clone() const override; virtual SdrPage* Clone( SdrModel* pNewModel ) const override; - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) override; + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; /** returns the index inside the object list which belongs to the report component. diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index 42862241fa01..3076ebf7cbd8 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -36,7 +36,7 @@ namespace rptui public: /** returns the section which is currently marked. */ - virtual OSectionWindow* getMarkedSection(NearSectionAccess nsa) const =0; + virtual OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const =0; /** mark the section on the given position . * diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index be811a758300..c917db5d86d6 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -65,7 +65,7 @@ public: virtual RSCCLASS_TYPE GetClassType() const override; virtual RscTop * GetTypeClass() const override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; void Destroy( const RSCINST & rInst ) override; virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, RscTop * pCreateClass, diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 870a0ee6efdf..1b78859010c6 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -65,15 +65,15 @@ public: ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, SfxStyleItem nMask, - Atom nDataBaseName ) override; + Atom nDataBaseName = InvalidAtom ) override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, - Atom nDataBaseName ) override; + Atom nDataBaseName = InvalidAtom ) override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt, - RSCVAR nVarType, sal_uInt32 nMask, - Atom nDataBaseName ) override; + RSCINST * pDflt = nullptr, + RSCVAR nVarType = 0, sal_uInt32 nMask = 0, + Atom nDataBaseName = InvalidAtom ) override; virtual void EnumVariables( void * pData, VarEnumCallbackProc ) override; RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, @@ -92,7 +92,7 @@ public: using RscTop::GetDefault; RSCINST GetDefault( Atom nVarId ) override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; void Destroy( const RSCINST & rInst ) override; void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index 1ed6b47e3075..275996feb8f0 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -55,7 +55,7 @@ class RscEnum : public RscConst sal_uInt32 nSize; public: RscEnum( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; sal_uInt32 Size() override { return nSize; } virtual void SetToDefault( const RSCINST & rInst ) override diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx index 129cc2319b82..36aa2cfaba55 100644 --- a/rsc/inc/rsccont.hxx +++ b/rsc/inc/rsccont.hxx @@ -64,7 +64,7 @@ public: pTypeClass = pClass; pTypeClass1 = pClass1; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; void Destroy( const RSCINST & rInst ) override; ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop * pCreateClass, const RSCINST & rCreateInst, diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx index 26fe709f8925..a783ed418bf7 100644 --- a/rsc/inc/rscflag.hxx +++ b/rsc/inc/rscflag.hxx @@ -35,7 +35,7 @@ class RscFlag : public RscConst RSCINST CreateBasic( RSCINST * pInst ); public: RscFlag( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; RSCINST CreateClient( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass, Atom nConsId ); sal_uInt32 Size() override; @@ -70,7 +70,7 @@ public: RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass, Atom nConstantId ); virtual RSCCLASS_TYPE GetClassType() const override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; sal_uInt32 Size() override { return pRefClass->Size(); } // an assignment to a variable diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index cf27386244ec..f70cdf88f51b 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -43,7 +43,7 @@ public: bool IsDefault( const RSCINST & rInst ) override; bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; void Destroy( const RSCINST & rInst ) override; sal_uInt32 Size() override; void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput, diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index 3bcd663df88c..bbcd8a736649 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -38,7 +38,7 @@ protected: public: RscRange( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; // sets the allowed range void SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // returns the class size in bytes @@ -76,7 +76,7 @@ protected: public: RscLongRange( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; // sets the allowed range void SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // returns the class size in bytes @@ -125,7 +125,7 @@ public: nMin = nMinimum; nMax = nMaximum; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; void Destroy( const RSCINST & rInst ) override; sal_uInt32 Size() override { return nSize; } virtual void SetToDefault( const RSCINST & rInst ) override @@ -176,7 +176,7 @@ class RscBreakRange : public RscRange public: RscBreakRange( Atom nId, sal_uInt32 nTypId ); void SetOutRange( sal_Int32 nNumber ) { nOutRange = nNumber; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) override; }; diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx index 280477cee5f9..c51f4a6c9345 100644 --- a/rsc/inc/rscstr.hxx +++ b/rsc/inc/rscstr.hxx @@ -39,7 +39,7 @@ public: virtual RSCCLASS_TYPE GetClassType() const override; void SetRefClass( RscTop * pClass ) { pRefClass = pClass; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; // sets the allowed range void Destroy( const RSCINST & rInst ) override; sal_uInt32 Size() override { return nSize; } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 7182b34e71b8..a66f6a0f4541 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -448,7 +448,7 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) INS_WINBIT(pClassListBox,DDExtraWidth) { - RSCINST aDflt = aUShort.Create( nullptr, RSCINST(), false ); + RSCINST aDflt = aUShort.Create( nullptr, RSCINST() ); aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF ); nId = aNmTb.Put( "CurPos", VARNAME ); pClassListBox->SetVariable( nId, &aUShort, &aDflt ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index a3374e8c4ec2..176cfe2632e4 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -86,7 +86,7 @@ public: ScMergeFlagAttr(ScMF nFlags); virtual ~ScMergeFlagAttr(); - SfxPoolItem * Clone(SfxItemPool * pPool) const override; + SfxPoolItem * Clone(SfxItemPool * pPool = nullptr) const override; ScMF GetValue() const { return (ScMF) SfxInt16Item::GetValue(); } diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index f214320fe603..1b19b2c349ba 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -341,7 +341,7 @@ public: const OUString& GetStyle() const { return aStyleName; } void UpdateStyleName(const OUString& rNew) { aStyleName=rNew; } - virtual ScFormatEntry* Clone(ScDocument* pDoc) const override; + virtual ScFormatEntry* Clone(ScDocument* pDoc = nullptr) const override; protected: virtual void DataChanged( const ScRange* pModified ) const override; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 69833ea93d23..47d7997caef3 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -385,7 +385,7 @@ public: 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; diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index d0d3d57273c2..9cce3235bf29 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -27,7 +27,7 @@ public: virtual void setUp() override; virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) override; + virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet = 0) override; ScNamedRangesObj(); diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index fb4759fe8d99..be83927b9b5b 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -262,9 +262,9 @@ void ScTiledRenderingTest::testSortAscendingDescending() ScDocument* pDoc = pModelObj->GetDocument(); // select the values in the first column - pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, 551, 129, 1); - pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEMOVE, 820, 1336, 1); - pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 820, 1359, 1); + pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, 551, 129, 1, MOUSE_LEFT, 0); + pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEMOVE, 820, 1336, 1, MOUSE_LEFT, 0); + pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 820, 1359, 1, MOUSE_LEFT, 0); // sort ascending uno::Sequence<beans::PropertyValue> aArgs; diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 099cc40079df..d2a243cc8109 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -40,7 +40,7 @@ class XMLTableMasterPageExport : public XMLTextMasterPageExport protected: virtual void exportHeaderFooterContent( const css::uno::Reference< css::text::XText >& rText, - bool bAutoStyles, bool bProgress ) override; + bool bAutoStyles, bool bProgress = true ) override; virtual void exportMasterPageContent( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 7385a71406c8..7cb00e48d655 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -201,7 +201,7 @@ public: virtual void PrepareReload() override; virtual void LoadStyles( SfxObjectShell &rSource ) override; - virtual bool DoSaveCompleted( SfxMedium * pNewStor, bool bRegisterRecent ) override; // SfxObjectShell + virtual bool DoSaveCompleted( SfxMedium * pNewStor=nullptr, bool bRegisterRecent=true ) override; // SfxObjectShell virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) override; virtual void Draw( OutputDevice *, const JobSetup & rSetup, diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index b44699e1be4d..1eecb5225e7f 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -40,7 +40,7 @@ public: protected: using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: ScTabPageProtection( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 6bae511512ef..a5a55981cc6f 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -198,8 +198,8 @@ protected: virtual void QueryObjAreaPixel( Rectangle& rRect ) const override; - virtual OUString GetSelectionText( bool bWholeWord ) override; - virtual bool HasSelection( bool bText ) const override; + virtual OUString GetSelectionText( bool bWholeWord = false ) override; + virtual bool HasSelection( bool bText = true ) const override; virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) override; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index bb35a16c07da..fe5aaa4b57b7 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: ScTpCalcOptions( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 4c0c1f14aca0..17f055f3f7f3 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -24,7 +24,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override; virtual void Reset(const SfxItemSet* rCoreAttrs) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet ) override; virtual ~ScTpCompatOptions(); virtual void dispose() override; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 9b5246953b05..9664b3cf0632 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -24,7 +24,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset(const SfxItemSet* rCoreSet) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; private: explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 1a7e1ac42d92..0f5c7d90af48 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -39,7 +39,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; - virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet ) override; private: explicit ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 29692363059d..e7b02579c0ca 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -44,7 +44,7 @@ protected: virtual void ActivatePage() override; virtual void DeactivatePage() override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: VclPtr<PushButton> m_pBtnEdit; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 16b396a1bd30..c3e202f41f18 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet( SfxItemSet* rCoreSet ) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8410250871ee..99d791eacbaa 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -64,7 +64,7 @@ protected: virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: OUString aStrUndefined; @@ -120,7 +120,7 @@ protected: virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index c8fc966d8e19..21d75fb55a9a 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -36,7 +36,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; virtual void DataChanged ( const DataChangedEvent& rDCEvt ) override; virtual ~ScTablePage(); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 982646b0b09f..a0a473415950 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -39,7 +39,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; virtual void Reset ( const SfxItemSet* rCoreAttrs ) override; using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: ScTpUserLists( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index e415f110570c..d9c9f3317fa1 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -78,7 +78,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; }; @@ -123,7 +123,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 4d8971960ab2..a2eaf7d9387d 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -141,7 +141,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSortParam& GetSortData () const { return theSortData; } @@ -191,7 +191,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 6467cf7d933f..3822664c40e9 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -333,8 +333,12 @@ void SdTiledRenderingTest::testPostMouseEvent() vcl::Cursor* pCursor = rEditView.GetCursor(); Point aPosition = pCursor->GetPos(); aPosition.setX(aPosition.getX() - 1000); - pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), 1); - pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), 1); + pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, + convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), + 1, MOUSE_LEFT, 0); + pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, + convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), + 1, MOUSE_LEFT, 0); CPPUNIT_ASSERT(pView->GetTextEditObject()); // The new cursor position must be before the first word. CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), rEditView.GetSelection().nStartPos); diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index ef69e29c9308..a6a25d26b592 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -64,7 +64,7 @@ class ImplSdPPTImport : public SdrPowerPointImport void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ); - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = nullptr ) override; virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPageCapsule pPage, SfxStyleSheet*, SfxStyleSheet** ) const override; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 90182198ba3d..300da5f96d59 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -204,7 +204,7 @@ public: CustomAnimationListEntryItem(const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent); virtual ~CustomAnimationListEntryItem(); - void InitViewData(SvTreeListBox*,SvTreeListEntry*,SvViewDataItem*) override; + void InitViewData(SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* = nullptr) override; SvLBoxItem* Create() const override; void Clone(SvLBoxItem* pSource) override; @@ -376,7 +376,7 @@ class CustomAnimationTriggerEntryItem : public SvLBoxString public: explicit CustomAnimationTriggerEntryItem( const OUString& aDescription ); virtual ~CustomAnimationTriggerEntryItem(); - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override; + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* = nullptr ) override; SvLBoxItem* Create() const override; void Clone( SvLBoxItem* pSource ) override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 18468e8d46ce..4df456224a92 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -144,7 +144,7 @@ public: virtual void GotoNextText() override; virtual const IteratorPosition& GetPosition() override; - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override; virtual bool operator== (const IteratorImplBase& rIterator) const override; private: @@ -191,7 +191,7 @@ public: virtual ~ViewIteratorImpl(); virtual void GotoNextText() override; - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override; virtual void Reverse() override; protected: @@ -234,7 +234,7 @@ public: virtual ~DocumentIteratorImpl(); virtual void GotoNextText() override; - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override; private: /// Number of pages in the view that is specified by <member>maPosition</member>. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 8e667521c7bf..ec0922bae1a6 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -138,15 +138,15 @@ public: virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ) override; + ::sd::Window* pTargetWindow, + sal_uInt16 nPage, + sal_uInt16 nLayer ) override; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override; + ::sd::Window* pTargetWindow, + sal_uInt16 nPage, + sal_uInt16 nLayer) override; typedef ::std::vector<SdPage*> PageSelection; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 4d92b0d671fe..f47a49a0a049 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -114,8 +114,8 @@ public: void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ - virtual OUString GetSelectionText(bool) override; - virtual bool HasSelection(bool) const override; + virtual OUString GetSelectionText(bool = false) override; + virtual bool HasSelection(bool = true ) const override; SvBorder GetBorder (bool bOuterResize); virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize) override; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 894ff3ad873b..158b177c21a0 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -250,7 +250,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/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index d978012620e1..dd5a0d69caa7 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) override; + virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView = nullptr) override; virtual void ReleaseShell (SfxShell* pShell) override; private: diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 32eb612f3aef..7ca5c6a451fc 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -105,7 +105,7 @@ public: virtual SfxShell* CreateShell ( ::sd::ShellId nId, vcl::Window* pParentWindow, - ::sd::FrameView* pFrameView) override; + ::sd::FrameView* pFrameView = nullptr) override; virtual void ReleaseShell (SfxShell* pShell) override; private: ::sd::ViewShell& mrViewShell; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 2a3bb535189c..5fc64430d176 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -95,7 +95,7 @@ public: virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) override; + SvViewDataItem* pViewData = nullptr) override; }; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 667102d5be44..fcf1c200f7af 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -200,7 +200,7 @@ public: void GetState(SfxItemSet &); virtual void SetVisArea (const Rectangle & rVisArea) override; - virtual void SetModified(bool bModified) override; + virtual void SetModified(bool bModified = true) override; /** Get a cursor for modifying this document * @remarks Don't store this reference, a new cursor may be made... diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index b1ef0b0e9495..d3a54ff8fe90 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -1422,7 +1422,7 @@ void SmCursor::EndEdit(){ if ( mbIsEnabledSetModifiedSmDocShell ) mpDocShell->EnableSetModified( mbIsEnabledSetModifiedSmDocShell ); //I think this notifies people around us that we've modified this document... - mpDocShell->SetModified(true); + mpDocShell->SetModified(); //I think SmDocShell uses this value when it sends an update graphics event //Anyway comments elsewhere suggests it need to be updated... mpDocShell->mnModifyCount++; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index a6596380b1bc..3bbda764b41c 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -176,7 +176,7 @@ void SmDocShell::SetText(const OUString& rBuffer) if ( bIsEnabled ) EnableSetModified( bIsEnabled ); - SetModified(true); + SetModified(); // launch accessible event if necessary SmGraphicAccessible *pAcc = pViewSh ? pViewSh->GetGraphicWindow().GetAccessible_Impl() : nullptr; @@ -199,7 +199,7 @@ void SmDocShell::SetFormat(SmFormat& rFormat) { maFormat = rFormat; SetFormulaArranged( false ); - SetModified( true ); + SetModified(); mnModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState @@ -614,7 +614,7 @@ void SmDocShell::OnDocumentPrinterChanged( Printer *pPrt ) Size aOldSize = GetVisArea().GetSize(); Repaint(); if( aOldSize != GetVisArea().GetSize() && !maText.isEmpty() ) - SetModified( true ); + SetModified(); mpTmpPrinter = nullptr; } diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index f4400fcb69c2..69ae86594e43 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -963,7 +963,7 @@ void SmEditWindow::UpdateStatus( bool bSetDocModified ) if (pMod && pMod->GetConfig()->IsAutoRedraw()) Flush(); if ( bSetDocModified ) - GetDoc()->SetModified(true); + GetDoc()->SetModified(); } void SmEditWindow::Cut() diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 2a58f570f5d9..791efa6deaaa 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -106,7 +106,7 @@ public: void ExportAutoStyles_() override {} void ExportMasterStyles_() override {} void ExportContent_() override; - sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override; + sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override; virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 82c6e96955e5..eeff4a987a40 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1361,7 +1361,7 @@ void SmViewShell::Insert( SfxMedium& rMedium ) } pDoc->Parse(); - pDoc->SetModified(true); + pDoc->SetModified(); SfxBindings &rBnd = GetViewFrame()->GetBindings(); rBnd.Invalidate(SID_GAPHIC_SM); @@ -1396,7 +1396,7 @@ void SmViewShell::InsertFrom(SfxMedium &rMedium) SAL_WARN( "starmath", "EditWindow missing" ); pDoc->Parse(); - pDoc->SetModified(true); + pDoc->SetModified(); SfxBindings& rBnd = GetViewFrame()->GetBindings(); rBnd.Invalidate(SID_GAPHIC_SM); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 9bed36ffc720..edbc446b4e41 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -183,7 +183,7 @@ private: protected: virtual bool DoubleClickHdl() override; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const override; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override; public: ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, FileViewFlags nFlags ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 0a1e14392937..028f9a23d50f 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1786,7 +1786,7 @@ void SvTreeListBox::SetEntryText(SvTreeListEntry* pEntry, const OUString& rStr) SvLBoxString* pItem = static_cast<SvLBoxString*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); DBG_ASSERT(pItem,"SetText:Item not found"); pItem->SetText(rStr); - pItem->InitViewData( this, pEntry, nullptr ); + pItem->InitViewData( this, pEntry ); GetModel()->InvalidateEntry( pEntry ); } diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index cecbe4a0d947..889f188721df 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -466,7 +466,7 @@ namespace svt { namespace table virtual void BeginDrag() override; virtual void CreateAnchor() override; virtual void DestroyAnchor() override; - virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor) override; + virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor = false) override; virtual bool IsSelectionAtPoint( const Point& rPoint ) override; virtual void DeselectAtPoint( const Point& rPoint ) override; virtual void DeselectAll() override; diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 3c6f3ca77a26..4ba1ab1c047f 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -108,7 +108,7 @@ class UnoTreeListItem : public SvLBoxString public: UnoTreeListItem(); virtual ~UnoTreeListItem(); - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override; + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem * = nullptr ) override; void SetImage( const Image& rImage ); const OUString& GetGraphicURL() const { return maGraphicURL;} void SetGraphicURL( const OUString& rGraphicURL ); diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 457398408cb4..577996a7d70d 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -43,7 +43,7 @@ namespace sdr virtual void ItemSetChanged(const SfxItemSet& rSet) override; // react on Item change - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index f48413ed54bd..2b9bebaecbdd 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -985,7 +985,7 @@ public: virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; - virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) override; + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; }; const int nxDBmp = 12; @@ -1046,7 +1046,7 @@ public: virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; - virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) override; + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; }; const int nxD = 4; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index a7f1933c2237..90f499065962 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -168,7 +168,7 @@ namespace sdr void ItemSetChanged(const SfxItemSet& rSet) override; - void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) override; + void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index a113dd33e757..018ee2ed641a 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -100,7 +100,7 @@ public: // Clone() operator, normally just calls the local copy constructor BaseProperties& Clone(SdrObject& rObj) const override; - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; }; TableProperties::TableProperties(SdrObject& rObj) 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; }; diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 9f32abfcf11e..5434bdcb66a7 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -154,13 +154,13 @@ public: virtual void COPY( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite = false ) + bool inOverwrite ) throw( std::exception ) = 0; virtual void MOVE( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite = false ) + bool inOverwrite ) throw( std::exception ) = 0; virtual void DESTROY( const OUString & inPath, diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index f1f9851f7987..e51b6d175aa4 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -15,7 +15,7 @@ class SvpSalData : public SalGenericData public: explicit SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) {} virtual void ErrorTrapPush() override {} - virtual bool ErrorTrapPop( bool ) override { return false; } + virtual bool ErrorTrapPop( bool /*bIgnoreError*/ = true ) override { return false; } }; // plugin factory function diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 2557025568c0..09d0796ae95f 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -268,7 +268,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; class ImplSmallBorderWindowView : public ImplBorderWindowView @@ -290,7 +290,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; class ImplStdBorderWindowView : public ImplBorderWindowView @@ -313,7 +313,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; #endif // INCLUDED_VCL_INC_BRDWIN_HXX diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index 137cb14ba5e7..25a5bf657fc4 100644 --- a/vcl/inc/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -76,7 +76,7 @@ public: { return maImpl.FillDXArray(dxa); } - virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra, int factor) const override + virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra=0, int factor=1) const override { return maImpl.GetTextBreak(max_width, extra, factor); } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 76e446064b18..e0d2a9de1631 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -137,7 +137,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 6e0cc307876c..b348ace8fb21 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -234,12 +234,12 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout { public: virtual void DrawText( SalGraphics& ) const override; - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; + virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const override; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const override; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, - int&, DeviceCoordinate* pGlyphAdvAry, int* pCharPosAry, - const PhysicalFontFace** pFallbackFonts ) const override; + int&, DeviceCoordinate* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr, + const PhysicalFontFace** pFallbackFonts = nullptr ) const override; virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const override; // used only by OutputDevice::ImplLayout, TODO: make friend @@ -336,7 +336,7 @@ public: // used by upper layers virtual DeviceCoordinate GetTextWidth() const override; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override; - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; + virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const override; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const override; // used by display layers diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index f38dc0e5b9f7..ecafc8eac3fd 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -93,7 +93,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 037d213c5716..4e29401b366c 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -119,7 +119,7 @@ public: inline GdkDisplay *GetGdkDisplay(); virtual void ErrorTrapPush() override; - virtual bool ErrorTrapPop( bool bIgnoreError ) override; + virtual bool ErrorTrapPop( bool bIgnoreError = true ) override; inline GtkSalDisplay *GetGtkDisplay() const; bool BlockIdleTimeout() const { return blockIdleTimeout; } diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 01e8ca643f10..38640847ca61 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -217,7 +217,7 @@ public: virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*, long &nDX, long &nDY, DeviceFormat eFormat, - const SystemGraphicsData* ) override; + const SystemGraphicsData* = nullptr ) override; virtual SalBitmap* CreateSalBitmap() override; virtual SalYieldResult DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override; diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index e1294ad23566..72e82df89f71 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -76,7 +76,7 @@ public: // X errors virtual void ErrorTrapPush() override; - virtual bool ErrorTrapPop( bool bIgnoreError ) override; + virtual bool ErrorTrapPop( bool bIgnoreError = true ) override; void XError( Display *pDisp, XErrorEvent *pEvent ); bool HasXErrorOccurred() const { return m_aXErrorHandlerStack.back().m_bWas; } diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index a9c91ed0e114..1c48f0514ec2 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -117,7 +117,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index a6bcd9ab8a46..c31e39337c01 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -44,7 +44,7 @@ public: css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); virtual ~XMLVersionListExport() {} - 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/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx index c1dc58183da0..e3c7a871a4e9 100644 --- a/xmloff/source/forms/controlpropertymap.hxx +++ b/xmloff/source/forms/controlpropertymap.hxx @@ -42,8 +42,8 @@ namespace xmloff const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter, const SvXMLNamespaceMap& _rNamespaceMap, - const ::std::vector< XMLPropertyState >* _pProperties, - sal_uInt32 _nIdx + const ::std::vector< XMLPropertyState >* _pProperties = nullptr, + sal_uInt32 _nIdx = 0 ) const override; }; diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index 9ad05296e5ad..829175e029cb 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -55,7 +55,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; virtual OUString GetEventName( const OUString& rName, - bool bForm ) override; + bool bForm = false ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_OASIS2OOO_HXX |