diff options
| author | Adoche Onaji <dochieonaji@gmail.com> | 2023-02-17 15:12:15 +0100 |
|---|---|---|
| committer | Hossein <hossein@libreoffice.org> | 2023-02-24 12:29:38 +0000 |
| commit | 8429f5ca376196f1f26c6729cd2559a8a246b9da (patch) | |
| tree | 1e76d2178d9cc4ce58eaeec3c1bc135303b4a544 /idl/source/prj | |
| parent | 0629ebb23e8848b7b99913cac9ad07ac9e3fe670 (diff) | |
tdf#114441 Convert sal_uLong to a better type
In slot.cxx, GetAttrCount() return a size_t type and same type can
be assigned directly to nSCount. In hash.hxx, sal_uLong was declared
in SvStringHashEntry, the only default parameter it the class takes
is aName (type OString) while nValue was directly initialized as 0
in the constructor. The interface to change nValue is through a method
setValue of same type.Also In idl/inc/hash.hxx SetValue() and GetValue functionsb are used in idl/source/prj/database.cxx with sal_uInt32 parameter and return type and thus, sal_uInt32 is suitable here.The instances of sal_uLong in source/objects/object.cxx are replaced with sal_uInt32. In object.cxx an iterator was declared using std::find
to find nId in rSuperList (originally declared as std::vector<sal_uLong>),
therefore if nId is sal_uInt32, the parent vector, rSuperList
should be sal_uInt32. This change is now applicable to the void method
InsertSlot's parameter rSuperList in object.hxx and also variables n,
nId, iter, rSuperList in InsertSlot definition block in the file
object.cxx. Variable aSuperList in obect.cxx is also changed to
sal_uInt32 because its an argument for rSuperList parameter.
nC1 and nC2 in idl/source/prj/svidl.cxx are chnaged from sal_uLong to size_t as this is suitable here.
Change-Id: Ie075875229a676ea32dbf9e3049881a479773703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147220
Reviewed-by: Hossein <hossein@libreoffice.org>
Tested-by: Hossein <hossein@libreoffice.org>
Diffstat (limited to 'idl/source/prj')
| -rw-r--r-- | idl/source/prj/svidl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index 2c9fbf63d770..a7593c349377 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -29,8 +29,8 @@ static bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, bool bMoveAlways ) { //printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() ); - sal_uLong nC1 = 0; - sal_uLong nC2 = 1; + size_t nC1 = 0; + size_t nC2 = 1; if( !bMoveAlways ) { SvFileStream aOutStm1( rFile1, StreamMode::STD_READ ); |