diff options
Diffstat (limited to 'idl/source')
-rw-r--r-- | idl/source/objects/object.cxx | 10 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 2 | ||||
-rw-r--r-- | idl/source/prj/svidl.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 510d3a8a791d..8c3cfb7b28ba 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -165,7 +165,7 @@ sal_uInt16 SvMetaClass::WriteSlots( std::string_view rShellName, return nSCount; } -void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList, +void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uInt32>& rSuperList, SvMetaClassList &rClassList, const OString& rPrefix, SvIdlDataBase& rBase) { @@ -177,14 +177,14 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rClassList.push_back( this ); // write all direct attributes - sal_uLong n; + size_t n; for( n = 0; n < aAttrList.size(); n++ ) { SvMetaAttribute * pAttr = aAttrList[n]; - sal_uLong nId = pAttr->GetSlotId().GetValue(); + sal_uInt32 nId = pAttr->GetSlotId().GetValue(); - std::vector<sal_uLong>::iterator iter = std::find(rSuperList.begin(), + std::vector<sal_uInt32>::iterator iter = std::find(rSuperList.begin(), rSuperList.end(),nId); if( iter == rSuperList.end() ) @@ -282,7 +282,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) rOutStm.WriteCharPtr("static SfxFormalArgument a").WriteOString(GetName()).WriteCharPtr("Args_Impl[] =") << endl; rOutStm.WriteChar('{') << endl; - std::vector<sal_uLong> aSuperList; + std::vector<sal_uInt32> aSuperList; SvMetaClassList classList; SvSlotElementList aSlotList; InsertSlots(aSlotList, aSuperList, classList, OString(), rBase); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 17b8970edc8a..7ff190141d6d 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -541,7 +541,7 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, if( IsMethod() ) { SvMetaType * pType = GetType(); - sal_uLong nSCount = pType->GetAttrCount(); + size_t nSCount = pType->GetAttrCount(); rOutStm .WriteOString( OString::number(nSCount) ) .WriteCharPtr( "/*Count*/," ); 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 ); |