commit 0726ecd9e2f2d94e9f49eb40d2b4952475e02764
author Ahmet Hakan Çelik <ahmethcelik@gmail.com> Mon Mar 08 11:13:46 2021 +0300
committer Michael Stahl <michael.stahl@allotropia.de> Tue Mar 16 11:45:04 2021 +0100
tree 5ead597cfb57cdb071c72d3b71779b35377233fe
parent d2392723e1db63e31aa31fb4531a368b349fcd88

tdf#114441: Convert use of sal_uLong to better integer types

Change-Id: I173d57105429e2bdf2288678fa7911b8541a402b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112154
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

basctl/source/dlged/dlged.cxx

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index d74d375..9ddb6ad 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -278,8 +278,8 @@

    pHScroll->SetRange( Range( 0, aPgSize.Width()  ));
    pVScroll->SetRange( Range( 0, aPgSize.Height() ));
    pHScroll->SetVisibleSize( static_cast<sal_uLong>(aOutSize.Width()) );
    pVScroll->SetVisibleSize( static_cast<sal_uLong>(aOutSize.Height()) );
    pHScroll->SetVisibleSize( aOutSize.Width() );
    pVScroll->SetVisibleSize( aOutSize.Height() );

    pHScroll->SetLineSize( aOutSize.Width() / 10 );
    pVScroll->SetLineSize( aOutSize.Height() / 10 );

idl/inc/types.hxx

diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 97c353b..298e863 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -44,7 +44,7 @@

    virtual bool        Test( SvTokenStream & rInStm );
    virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
    sal_uLong           MakeSfx( OStringBuffer& rAtrrArray ) const;
    size_t           MakeSfx( OStringBuffer& rAtrrArray ) const;
    virtual void        Insert( SvSlotElementList& );
};

@@ -70,7 +70,7 @@

    SvRefMemberList<SvMetaAttribute *>&
                        GetAttrList() { return aAttrList; }
    sal_uLong           GetAttrCount() const { return aAttrList.size(); }
    size_t           GetAttrCount() const { return aAttrList.size(); }

    void                SetType( MetaTypeType nT );
    MetaTypeType        GetMetaTypeType() const { return nType; }
@@ -81,7 +81,7 @@

    virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;

    sal_uLong           MakeSfx( OStringBuffer& rAtrrArray );
    size_t           MakeSfx( OStringBuffer& rAtrrArray );
    virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
    bool                ReadMethodArgs( SvIdlDataBase & rBase,
                                        SvTokenStream & rInStm );

idl/source/objects/types.cxx

diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9cb1684..a0238d9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -96,7 +96,7 @@
    return bOk;
}

sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) const
size_t SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) const
{
    SvMetaType * pType = GetType();
    DBG_ASSERT( pType, "no type for attribute" );
@@ -199,15 +199,15 @@
    }
}

sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
size_t SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
{
    sal_uLong nC = 0;
    size_t nC = 0;

    if( GetBaseType()->GetMetaTypeType() == MetaTypeType::Struct )
    {
        sal_uLong nAttrCount = GetAttrCount();
        size_t nAttrCount = GetAttrCount();
        // write the single attributes
        for( sal_uLong n = 0; n < nAttrCount; n++ )
        for( size_t n = 0; n < nAttrCount; n++ )
        {
            nC += aAttrList[n]->MakeSfx( rAttrArray );
            if( n +1 < nAttrCount )
@@ -224,7 +224,7 @@
    OString aVarName = " a" + rItemName + "_Impl";

    OStringBuffer aAttrArray(1024);
    sal_uLong   nAttrCount = MakeSfx( aAttrArray );
    size_t   nAttrCount = MakeSfx( aAttrArray );
    OString aAttrCount( OString::number(nAttrCount));
    OString aTypeName = "SfxType" + aAttrCount;