diff options
| -rw-r--r-- | rsc/inc/rscclass.hxx | 3 | ||||
| -rw-r--r-- | rsc/inc/rscmgr.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/res/rscclass.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/res/rscmgr.cxx | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index d6a5b4836499..be4854ae1ba6 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -99,8 +99,7 @@ class RscSysDepend : public RscClass public: RscSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper ); ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra, - bool bFirst = false ); + RscTypCont * pTC, sal_uInt32, bool bExtra ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, bool bExtra ) override; }; diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index 2a99492314e2..cf27386244ec 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -35,7 +35,7 @@ class RscMgr : public RscClass void Create(){ aRefId.Create(); bDflt = true; } void Destroy(){ aRefId.Destroy(); } }; - ERRTYPE IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 ); + ERRTYPE IsToDeep( const RSCINST & rInst ); public: RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl ); diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 41647629008b..7529de44601d 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -768,7 +768,7 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) } ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra, bool bFirst ) + RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra ) { ERRTYPE aError; RSCINST aFileName; @@ -789,7 +789,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem { nId = pTC->PutSysName( rInst.pClass->GetTypId(), aTmpMem.GetUTF8( 0 ), - 0, 0, bFirst ); + 0, 0, false/*bFirst*/ ); } rMem.Put( nId ); aError = aFileName.pClass->WriteRcHeader( aFileName, rMem, pTC, diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 9c907160e9b6..682ea0c6ecef 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -279,13 +279,14 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ) return ERR_OK; } -ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) +ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst ) { RscMgrInst * pClassData; RscId aOldId, aId; ERRTYPE aError; RSCINST aTmpI = rInst; ObjNode * pObjNode; + sal_uInt32 nDeep = 0; pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size()); |