diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-12-15 20:46:34 +0100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:51 -0400 |
| commit | cfe9fcbedd38e62d16c0a1bfff90c040efd6c1d1 (patch) | |
| tree | 99269fc518c8bdd0567da080a4b65276d147c21e /basic | |
| parent | 60e0035e6456e14d0c1c39aec89e87b13ac2057e (diff) | |
sal_uLong/sal_uIntPtr/sal_uInt16 to sal_uInt32
also avoid some explicit temporaries and group some checks.
Change-Id: I7795b208dde53fd383b8c75f72dd9f56429aea2b
(cherry picked from commit cb98c423bbdada017a687186a5c06def6cb6f7a2)
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/stdobj.cxx | 2 | ||||
| -rw-r--r-- | basic/source/sbx/sbxcoll.cxx | 2 | ||||
| -rw-r--r-- | basic/source/sbx/sbxobj.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a3a09e654b26..c21b01b740b2 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -2113,7 +2113,7 @@ void BasicCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uIntPtr nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = nId == SBX_HINT_DATAWANTED; bool bWrite = nId == SBX_HINT_DATACHANGED; bool bRequestInfo = nId == SBX_HINT_INFOWANTED; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 20ee4157ae75..504d8e3756f0 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -824,10 +824,10 @@ void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); - sal_uLong t = pHint->GetId(); const sal_uInt16 nCallId = static_cast<sal_uInt16>(pVar->GetUserData()); if( nCallId ) { + const sal_uInt32 t = pHint->GetId(); if( t == SBX_HINT_INFOWANTED ) pVar->SetInfo( GetInfo( static_cast<short>(pVar->GetUserData()) ) ); else diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 9a91d354a436..83df80bd6869 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -117,7 +117,7 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uLong nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = ( nId == SBX_HINT_DATAWANTED ); bool bWrite = ( nId == SBX_HINT_DATACHANGED ); SbxVariable* pVar = p->GetVar(); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index bd603ac48156..d342ef0f3b20 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -136,7 +136,7 @@ void SbxObject::Notify( SfxBroadcaster&, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uLong nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = ( nId == SBX_HINT_DATAWANTED ); bool bWrite = ( nId == SBX_HINT_DATACHANGED ); SbxVariable* pVar = p->GetVar(); |