mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StaticIsEnabledBroadcasting can only be true

Browse Source
This commit is contained in:
Caolán McNamara
2011-11-04 21:54:43 +00:00
parent 97f2f76452
commit f017740f50
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/inc/basic/sbxcore.hxx
View File

@@ -134,8 +134,6 @@ public:
static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX ); static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
static SbxObject* CreateObject( const String& ); static SbxObject* CreateObject( const String& );
// Sbx solution as replacement for SfxBroadcaster::Enable()
static sal_Bool StaticIsEnabledBroadcasting( void );
}; };
#ifndef SBX_BASE_DECL_DEFINED #ifndef SBX_BASE_DECL_DEFINED

2
basic/source/classes/sbxmod.cxx
View File

@@ -2157,7 +2157,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
// #100883 Own Broadcast for SbMethod // #100883 Own Broadcast for SbMethod
void SbMethod::Broadcast( sal_uIntPtr nHintId ) void SbMethod::Broadcast( sal_uIntPtr nHintId )
{ {
if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() ) if( pCst && !IsSet( SBX_NO_BROADCAST ) )
{ {
// Because the method could be called from outside, test here once again // Because the method could be called from outside, test here once again
// the authorisation // the authorisation

7
basic/source/sbx/sbxbase.cxx
View File

@@ -246,13 +246,6 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
return pNew; return pNew;
} }
static sal_Bool bStaticEnableBroadcasting = sal_True;
sal_Bool SbxBase::StaticIsEnabledBroadcasting( void )
{
return bStaticEnableBroadcasting;
}
SbxBase* SbxBase::Load( SvStream& rStrm ) SbxBase* SbxBase::Load( SvStream& rStrm )
{ {
sal_uInt16 nSbxId, nFlags, nVer; sal_uInt16 nSbxId, nFlags, nVer;

4
basic/source/sbx/sbxvar.cxx
View File

@@ -174,7 +174,7 @@ SbxObject* SbxVariable::GetParent()
void SbxVariable::Broadcast( sal_uIntPtr nHintId ) void SbxVariable::Broadcast( sal_uIntPtr nHintId )
{ {
if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() ) if( pCst && !IsSet( SBX_NO_BROADCAST ) )
{ {
// Because the method could be called from outside, check the Da die Methode von aussen aufrufbar ist, hier noch einmal // Because the method could be called from outside, check the Da die Methode von aussen aufrufbar ist, hier noch einmal
// rights here again // rights here again
@@ -619,7 +619,7 @@ SbxAlias::~SbxAlias()
void SbxAlias::Broadcast( sal_uIntPtr nHt ) void SbxAlias::Broadcast( sal_uIntPtr nHt )
{ {
if( xAlias.Is() && StaticIsEnabledBroadcasting() ) if( xAlias.Is() )
{ {
xAlias->SetParameters( GetParameters() ); xAlias->SetParameters( GetParameters() );
if( nHt == SBX_HINT_DATAWANTED ) if( nHt == SBX_HINT_DATAWANTED )