summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/runtime/stdobj.cxx4
-rw-r--r--basic/source/runtime/stdobj1.cxx6
-rw-r--r--basic/source/sbx/sbxvalue.cxx8
-rw-r--r--basic/source/sbx/sbxvar.cxx4
-rw-r--r--include/basic/sbmeth.hxx2
-rw-r--r--include/basic/sbx.hxx4
-rw-r--r--include/basic/sbxvar.hxx10
8 files changed, 20 insertions, 20 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8c99af43a8c2..db0d7ce3673c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2116,7 +2116,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
// #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( sal_uIntPtr nHintId )
+void SbMethod::Broadcast( sal_uInt32 nHintId )
{
if( pCst && !IsSet( SBX_NO_BROADCAST ) )
{
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 05700d679beb..e19168c501ee 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -825,11 +825,11 @@ void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
sal_uLong t = pHint->GetId();
- sal_uInt16 nCallId = (sal_uInt16) pVar->GetUserData();
+ const sal_uInt16 nCallId = static_cast<sal_uInt16>(pVar->GetUserData());
if( nCallId )
{
if( t == SBX_HINT_INFOWANTED )
- pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
+ pVar->SetInfo( GetInfo( static_cast<short>(pVar->GetUserData()) ) );
else
{
bool bWrite = false;
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 1042265d7f66..e82db36d1be2 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -155,7 +155,7 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ const sal_uInt32 nWhich = pVar->GetUserData();
bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
@@ -280,7 +280,7 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ const sal_uInt32 nWhich = pVar->GetUserData();
bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
@@ -448,7 +448,7 @@ void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ const sal_uInt32 nWhich = pVar->GetUserData();
bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Methods
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 5323d87cd98b..3132b731fa4c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -195,7 +195,7 @@ void SbxValue::Clear()
SAL_INFO("basic.sbx", "Not at Parent-Prop - otherwise CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
bool bParentProp = pThisVar && 5345 ==
- ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
+ static_cast<sal_uInt16>(pThisVar->GetUserData());
if ( !bParentProp )
aData.pObj->ReleaseRef();
}
@@ -220,7 +220,7 @@ void SbxValue::Clear()
// Dummy
-void SbxValue::Broadcast( sal_uIntPtr )
+void SbxValue::Broadcast( sal_uInt32 )
{}
//////////////////////////// Readout data
@@ -541,7 +541,7 @@ bool SbxValue::Put( const SbxValues& rVal )
SAL_INFO("basic.sbx", "Not at Parent-Prop - otherwise CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
bool bParentProp = pThisVar && 5345 ==
- ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
+ static_cast<sal_uInt16>(pThisVar->GetUserData());
if ( !bParentProp )
p->aData.pObj->AddFirstRef();
}
@@ -804,7 +804,7 @@ bool SbxValue::SetType( SbxDataType t )
SAL_WARN("basic.sbx", "Not at Parent-Prop - otherwise CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
sal_uInt16 nSlotId = pThisVar
- ? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
+ ? static_cast<sal_uInt16>(pThisVar->GetUserData())
: 0;
DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == "Parent",
"SID_PARENTOBJECT is not named 'Parent'" );
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index fc0a8bfdcd7b..ff0a0cb3bf6d 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -144,7 +144,7 @@ SbxArray* SbxVariable::GetParameters() const
// Perhaps some day one could cut the parameter 0.
// then the copying will be dropped ...
-void SbxVariable::Broadcast( sal_uIntPtr nHintId )
+void SbxVariable::Broadcast( sal_uInt32 nHintId )
{
if( pCst && !IsSet( SBX_NO_BROADCAST ) )
{
@@ -668,7 +668,7 @@ SbxAlias::~SbxAlias()
}
}
-void SbxAlias::Broadcast( sal_uIntPtr nHt )
+void SbxAlias::Broadcast( sal_uInt32 nHt )
{
if( xAlias.Is() )
{
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 2f0aab790ad2..b8db3e4f2e8e 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -63,7 +63,7 @@ public:
// Interface to execute a method from the applications
ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL );
- virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE;
+ virtual void Broadcast( sal_uInt32 nHintId ) SAL_OVERRIDE;
};
typedef tools::SvRef<SbMethod> SbMethodRef;
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index a4e972317fea..fc9f3661aefd 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -95,7 +95,7 @@ class BASIC_DLLPUBLIC SbxHint : public SfxSimpleHint
{
SbxVariable* pVar;
public:
- SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
+ SbxHint( sal_uInt32 n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
SbxVariable* GetVar() const { return pVar; }
};
@@ -104,7 +104,7 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener
{
SbxVariableRef xAlias;
virtual ~SbxAlias();
- virtual void Broadcast( sal_uIntPtr ) SAL_OVERRIDE;
+ virtual void Broadcast( sal_uInt32 ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
public:
SbxAlias( const SbxAlias& );
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 9a69c8e21bd9..b9895517a583 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -97,7 +97,7 @@ protected:
OUString aPic; // Picture-String
OUString aToolString; // tool string copy
- virtual void Broadcast( sal_uIntPtr ); // Broadcast-Call
+ virtual void Broadcast( sal_uInt32 ); // Broadcast-Call
virtual ~SbxValue();
virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE;
virtual bool StoreData( SvStream& ) const SAL_OVERRIDE;
@@ -285,7 +285,7 @@ class BASIC_DLLPUBLIC SbxVariable : public SbxValue
protected:
SbxInfoRef pInfo; // Probably called information
- sal_uIntPtr nUserData; // User data for Call()
+ sal_uInt32 nUserData; // User data for Call()
SbxObject* pParent; // Currently attached object
virtual ~SbxVariable();
virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE;
@@ -306,8 +306,8 @@ public:
virtual void SetModified( bool ) SAL_OVERRIDE;
- sal_uIntPtr GetUserData() const { return nUserData; }
- void SetUserData( sal_uIntPtr n ) { nUserData = n; }
+ sal_uInt32 GetUserData() const { return nUserData; }
+ void SetUserData( sal_uInt32 n ) { nUserData = n; }
virtual SbxDataType GetType() const SAL_OVERRIDE;
virtual SbxClassType GetClass() const SAL_OVERRIDE;
@@ -322,7 +322,7 @@ public:
// Due to data reduction and better DLL-hierarchy currently via casting
SfxBroadcaster& GetBroadcaster();
bool IsBroadcaster() const { return pCst != NULL; }
- virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE;
+ virtual void Broadcast( sal_uInt32 nHintId ) SAL_OVERRIDE;
inline const SbxObject* GetParent() const { return pParent; }
SbxObject* GetParent() { return pParent;}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 22:50:03 +0000