summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-22 14:35:27 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-25 06:09:17 +0000
commit938821fb08e427864db6a10642f385bde9803f6c (patch)
tree759da9d0d0905a90f6dac2f0bf750721c17421c4 /rsc
parent4d4d77a1aad1bcae18bad35dad5308d33d6b2e51 (diff)
new loplugin overrideparam
verify that parameters on override methods have the same set of default values for their params as their parent/super-methods do. Change-Id: Ibdbc1c6e417fbaa680ea025a6bbf5ba9c2e5bcd2 Reviewed-on: https://gerrit.libreoffice.org/27437 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscarray.hxx2
-rw-r--r--rsc/inc/rscclass.hxx12
-rw-r--r--rsc/inc/rscconst.hxx2
-rw-r--r--rsc/inc/rsccont.hxx2
-rw-r--r--rsc/inc/rscflag.hxx4
-rw-r--r--rsc/inc/rscmgr.hxx2
-rw-r--r--rsc/inc/rscrange.hxx8
-rw-r--r--rsc/inc/rscstr.hxx2
-rw-r--r--rsc/source/parser/rscicpx.cxx2
9 files changed, 18 insertions, 18 deletions
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index be811a758300..c917db5d86d6 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -65,7 +65,7 @@ public:
virtual RSCCLASS_TYPE GetClassType() const override;
virtual RscTop * GetTypeClass() const override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
void Destroy( const RSCINST & rInst ) override;
virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
RscTop * pCreateClass,
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 870a0ee6efdf..1b78859010c6 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -65,15 +65,15 @@ public:
ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt,
RSCVAR nVarType, SfxStyleItem nMask,
- Atom nDataBaseName ) override;
+ Atom nDataBaseName = InvalidAtom ) override;
ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt,
RSCVAR nVarType, SfxSlotInfo nMask,
- Atom nDataBaseName ) override;
+ Atom nDataBaseName = InvalidAtom ) override;
ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
- RSCINST * pDflt,
- RSCVAR nVarType, sal_uInt32 nMask,
- Atom nDataBaseName ) override;
+ RSCINST * pDflt = nullptr,
+ RSCVAR nVarType = 0, sal_uInt32 nMask = 0,
+ Atom nDataBaseName = InvalidAtom ) override;
virtual void EnumVariables( void * pData, VarEnumCallbackProc ) override;
RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
@@ -92,7 +92,7 @@ public:
using RscTop::GetDefault;
RSCINST GetDefault( Atom nVarId ) override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
void Destroy( const RSCINST & rInst ) override;
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 1ed6b47e3075..275996feb8f0 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -55,7 +55,7 @@ class RscEnum : public RscConst
sal_uInt32 nSize;
public:
RscEnum( Atom nId, sal_uInt32 nTypId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
sal_uInt32 Size() override { return nSize; }
virtual void SetToDefault( const RSCINST & rInst ) override
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 129cc2319b82..36aa2cfaba55 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -64,7 +64,7 @@ public:
pTypeClass = pClass;
pTypeClass1 = pClass1;
}
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
void Destroy( const RSCINST & rInst ) override;
ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName,
RscTop * pCreateClass, const RSCINST & rCreateInst,
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index 26fe709f8925..a783ed418bf7 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -35,7 +35,7 @@ class RscFlag : public RscConst
RSCINST CreateBasic( RSCINST * pInst );
public:
RscFlag( Atom nId, sal_uInt32 nTypId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
RSCINST CreateClient( RSCINST * pInst, const RSCINST & rDflt,
bool bOwnClass, Atom nConsId );
sal_uInt32 Size() override;
@@ -70,7 +70,7 @@ public:
RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass,
Atom nConstantId );
virtual RSCCLASS_TYPE GetClassType() const override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
sal_uInt32 Size() override { return pRefClass->Size(); }
// an assignment to a variable
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index cf27386244ec..f70cdf88f51b 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -43,7 +43,7 @@ public:
bool IsDefault( const RSCINST & rInst ) override;
bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
void Destroy( const RSCINST & rInst ) override;
sal_uInt32 Size() override;
void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput,
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 3bcd663df88c..bbcd8a736649 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -38,7 +38,7 @@ protected:
public:
RscRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
// sets the allowed range
void SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
// returns the class size in bytes
@@ -76,7 +76,7 @@ protected:
public:
RscLongRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const override;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
// sets the allowed range
void SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
// returns the class size in bytes
@@ -125,7 +125,7 @@ public:
nMin = nMinimum;
nMax = nMaximum;
}
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
void Destroy( const RSCINST & rInst ) override;
sal_uInt32 Size() override { return nSize; }
virtual void SetToDefault( const RSCINST & rInst ) override
@@ -176,7 +176,7 @@ class RscBreakRange : public RscRange
public:
RscBreakRange( Atom nId, sal_uInt32 nTypId );
void SetOutRange( sal_Int32 nNumber ) { nOutRange = nNumber; }
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) override;
};
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 280477cee5f9..c51f4a6c9345 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -39,7 +39,7 @@ public:
virtual RSCCLASS_TYPE GetClassType() const override;
void SetRefClass( RscTop * pClass ) { pRefClass = pClass; }
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
// sets the allowed range
void Destroy( const RSCINST & rInst ) override;
sal_uInt32 Size() override { return nSize; }
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 7182b34e71b8..a66f6a0f4541 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -448,7 +448,7 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
INS_WINBIT(pClassListBox,DDExtraWidth)
{
- RSCINST aDflt = aUShort.Create( nullptr, RSCINST(), false );
+ RSCINST aDflt = aUShort.Create( nullptr, RSCINST() );
aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF );
nId = aNmTb.Put( "CurPos", VARNAME );
pClassListBox->SetVariable( nId, &aUShort, &aDflt );