basctl/source/inc/basidesh.hxx | 8 chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2 chart2/source/controller/dialogs/tp_Scale.hxx | 2 compilerplugins/clang/overrideparam.cxx | 179 ++++++++++++++++++ connectivity/source/drivers/file/fcode.cxx | 6 connectivity/source/inc/file/FNumericFunctions.hxx | 16 - connectivity/source/inc/file/fcode.hxx | 6 cui/source/factory/dlgfact.hxx | 4 cui/source/inc/autocdlg.hxx | 4 cui/source/inc/backgrnd.hxx | 2 cui/source/inc/border.hxx | 2 cui/source/inc/chardlg.hxx | 8 cui/source/inc/hltpbase.hxx | 2 cui/source/inc/numfmt.hxx | 2 cui/source/inc/page.hxx | 2 cui/source/inc/paragrph.hxx | 6 cui/source/inc/tabstpge.hxx | 2 cui/source/options/optgdlg.hxx | 2 cui/source/options/optinet2.hxx | 2 cui/source/options/optmemory.hxx | 2 dbaccess/source/ui/dlg/detailpages.hxx | 2 dbaccess/source/ui/dlg/indexdialog.cxx | 2 dbaccess/source/ui/inc/indexdialog.hxx | 2 dbaccess/source/ui/inc/listviewitems.hxx | 2 editeng/source/misc/SvXMLAutoCorrectExport.hxx | 4 fpicker/source/office/RemoteFilesDialog.hxx | 2 include/avmedia/mediaitem.hxx | 2 include/filter/msfilter/svdfppt.hxx | 2 include/sfx2/dinfdlg.hxx | 4 include/sfx2/mgetempl.hxx | 2 include/sfx2/printopt.hxx | 2 include/sfx2/tabdlg.hxx | 2 include/svtools/headbar.hxx | 2 include/svtools/svlbitm.hxx | 8 include/svtools/treelist.hxx | 2 include/svx/clipfmtitem.hxx | 2 include/svx/fontlb.hxx | 2 include/svx/hdft.hxx | 2 include/svx/srchdlg.hxx | 2 include/svx/svx3ditems.hxx | 12 - include/svx/xflasit.hxx | 2 include/svx/xlnasit.hxx | 2 include/tools/stream.hxx | 16 + include/unotools/options.hxx | 4 include/vcl/abstdlg.hxx | 2 linguistic/source/convdicxml.hxx | 2 lotuswordpro/source/filter/lwptblformula.hxx | 2 reportdesign/inc/RptPage.hxx | 2 reportdesign/source/ui/inc/MarkedSection.hxx | 2 rsc/inc/rscarray.hxx | 2 rsc/inc/rscclass.hxx | 12 - rsc/inc/rscconst.hxx | 2 rsc/inc/rsccont.hxx | 2 rsc/inc/rscflag.hxx | 4 rsc/inc/rscmgr.hxx | 2 rsc/inc/rscrange.hxx | 8 rsc/inc/rscstr.hxx | 2 rsc/source/parser/rscicpx.cxx | 2 sc/inc/attrib.hxx | 2 sc/inc/conditio.hxx | 2 sc/inc/docuno.hxx | 2 sc/qa/extras/scnamedrangesobj.cxx | 2 sc/qa/unit/tiledrendering/tiledrendering.cxx | 6 sc/source/filter/xml/XMLTableMasterPageExport.hxx | 2 sc/source/ui/inc/docsh.hxx | 2 sc/source/ui/inc/tabpages.hxx | 2 sc/source/ui/inc/tabvwsh.hxx | 4 sc/source/ui/inc/tpcalc.hxx | 2 sc/source/ui/inc/tpcompatibility.hxx | 2 sc/source/ui/inc/tpdefaults.hxx | 2 sc/source/ui/inc/tpformula.hxx | 2 sc/source/ui/inc/tphf.hxx | 2 sc/source/ui/inc/tpprint.hxx | 2 sc/source/ui/inc/tpsort.hxx | 4 sc/source/ui/inc/tptable.hxx | 2 sc/source/ui/inc/tpusrlst.hxx | 2 sc/source/ui/inc/tpview.hxx | 4 sc/source/ui/inc/uiitems.hxx | 4 sd/qa/unit/tiledrendering/tiledrendering.cxx | 8 sd/source/filter/ppt/pptin.hxx | 2 sd/source/ui/animations/CustomAnimationList.cxx | 4 sd/source/ui/inc/OutlinerIteratorImpl.hxx | 6 sd/source/ui/inc/SlideSorterViewShell.hxx | 12 - sd/source/ui/inc/ViewShellBase.hxx | 4 sd/source/ui/inc/unomodel.hxx | 2 sd/source/ui/view/FormShellManager.cxx | 2 sd/source/ui/view/viewshel.cxx | 2 sfx2/source/dialog/templdlg.cxx | 2 starmath/inc/document.hxx | 2 starmath/source/cursor.cxx | 2 starmath/source/document.cxx | 6 starmath/source/edit.cxx | 2 starmath/source/mathmlexport.hxx | 2 starmath/source/view.cxx | 4 svtools/source/contnr/fileview.cxx | 2 svtools/source/contnr/treelistbox.cxx | 2 svtools/source/table/tablecontrol_impl.hxx | 2 svtools/source/uno/treecontrolpeer.cxx | 2 svx/inc/sdr/properties/customshapeproperties.hxx | 2 svx/source/form/filtnav.cxx | 4 svx/source/table/cell.cxx | 2 svx/source/table/svdotable.cxx | 2 sw/inc/docsh.hxx | 2 sw/inc/docstyle.hxx | 2 sw/inc/paratr.hxx | 2 sw/inc/swabstdlg.hxx | 2 sw/inc/unotxdoc.hxx | 2 sw/inc/view.hxx | 2 sw/qa/extras/tiledrendering/tiledrendering.cxx | 12 - sw/source/core/inc/DocumentStatisticsManager.hxx | 4 sw/source/core/inc/SwXMLBlockExport.hxx | 2 sw/source/filter/ww8/attributeoutputbase.hxx | 2 sw/source/filter/ww8/docxattributeoutput.hxx | 4 sw/source/filter/ww8/ww8attributeoutput.hxx | 4 sw/source/filter/ww8/ww8par.hxx | 2 sw/source/ui/envelp/envfmt.hxx | 2 sw/source/ui/envelp/envprt.hxx | 2 sw/source/ui/envelp/labfmt.hxx | 2 sw/source/ui/envelp/labprt.hxx | 2 sw/source/ui/envelp/swuilabimp.hxx | 8 sw/source/uibase/inc/envlop.hxx | 2 sw/source/uibase/inc/pgfnote.hxx | 2 sw/source/uibase/inc/pggrid.hxx | 2 sw/source/uibase/inc/swuicnttab.hxx | 6 sw/source/uibase/table/tablepg.hxx | 4 ucb/source/ucp/webdav-neon/DAVSession.hxx | 4 vcl/headless/svpdata.cxx | 2 vcl/inc/brdwin.hxx | 6 vcl/inc/graphite_serverfont.hxx | 2 vcl/inc/headless/svpgdi.hxx | 2 vcl/inc/sallayout.hxx | 8 vcl/inc/unx/genpspgraphics.h | 2 vcl/inc/unx/gtk/gtkdata.hxx | 2 vcl/inc/unx/gtk/gtkinst.hxx | 2 vcl/inc/unx/saldata.hxx | 2 vcl/inc/unx/salgdi.h | 2 xmloff/inc/xmlversion.hxx | 2 xmloff/source/forms/controlpropertymap.hxx | 4 xmloff/source/transform/Oasis2OOo.hxx | 2 139 files changed, 417 insertions(+), 220 deletions(-)
New commits: commit 938821fb08e427864db6a10642f385bde9803f6c Author: Noel Grandin <[email protected]> Date: Fri Jul 22 14:35:27 2016 +0200 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 <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 7db8828..ee3c30f 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 cfd4435b..fa5c927 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 0224bf4..414794d 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 0000000..c04165b --- /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 a536d0c..47e7cac 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 a8ab004..f718851 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 9d8082a..afd62c7 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 7359f06..1196aa3 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 6a7b367..1914f68 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 c6d7f7b..c668a12 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 10e4a33..cb08140 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 0f94ede..9600ca6 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 9ccd268..16e84b1 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 95f5c7c..0fee236 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 abb31ee..b9e88a5 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 a0e7dd8..3e75cbf 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 691533d..5719744 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 89d76b4..6668881 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 90a4eb5..be755b9 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 07031cb..207d9cc 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 5ce4eab..efd3456 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 17707c8..c864a2c 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 41fd441..ee15345 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 5244941..134d0f6 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 5f36818..73df559 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 84ba1e7..8291eb9 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 f18edb6..3235e36 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 cec7c3d..a32a492 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 6003cd2..57a62ff 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 5cb65ac..7840834 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 3d56b66..ab1b914 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 2f62445..b374cdd 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 b5373f7..e3958e7 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 06b3a40e..83cbf2c 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 053bb7f..1c48679 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 1da7095..643c132 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 eed5eb3..9174b97 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 d95d0a9..9268385 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 05729bc..637a7a0 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 5f1c8b7..5a784bc 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 0f308fb..7423cd8 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 1254d9b..8f13120 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 1bae0a8..4475433 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 b703eec..95bfbf9 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 5ea675c..25b28c7 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 44dc4e8..c667d64 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 3e5964a..ad69512 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 352a95b..0ae4902 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 4286224..3076ebf 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 be811a7..c917db5 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 870a0ee..1b78859 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 1ed6b47..275996f 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 129cc23..36aa2cf 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 26fe709..a783ed4 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 cf27386..f70cdf8 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 3bcd663..bbcd8a7 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 280477c..c51f4a6 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 7182b34..a66f6a0 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 a3374e8..176cfe2 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 f214320..1b19b2c 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 69833ea..47d7997 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 d0d3d57..9cce323 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 fb4759f..be83927 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 099cc40..d2a243c 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 7385a71..7cb00e4 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 b44699e..1eecb52 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 6bae511..a5a5598 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 bb35a16..fe5aaa4 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 4c0c1f1..17f055f 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 9b52469..9664b3c 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 1a7e1ac..0f5c7d9 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 2969236..e7b0257 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 16b396a..c3e202f 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 8410250..99d791e 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 c8fc966..21d75fb 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 982646b..a0a4734 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 e415f11..d9c9f33 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 4d89719..a2eaf7d 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 6467cf7..3822664 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 ef69e29..a6a25d2 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 9018219..300da5f 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 18468e8..4df4562 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 8e66752..ec0922b 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 4d92b0d..f47a49a 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 894ff3a..158b177 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 d978012..dd5a0d6 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 32eb612f..7ca5c6a 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 2a3bb53..5fc6443 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 667102d..fcf1c20 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 b1ef0b0..d3a54ff 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 a659638..3bbda76 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 f4400fc..69ae865 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 2a58f57..791efa6 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 82c6e96..eeff4a9 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 9bed36f..edbc446 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 0a1e143..028f9a2 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 cecbe4a..889f188 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 3c6f3ca..4ba1ab1 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 4573984..577996a 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 f48413e..2b9beba 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 a7f1933..90f4990 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 a113dd3..018ee2e 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 50ac3c9..5163856 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 49f2404..bb43d7d 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 3b62b52..3471307 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 ba64db4..e62002b 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 077493f..a374f8d 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 a0b0519..66ce27e 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 c20fe73..6c68549 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); ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
