summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-04 21:54:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-06 22:08:36 +0000
commitf017740f50cbb9f140d5ebb5e1fadbc50d337d9c (patch)
tree094e076370b09b27679d08709dc82c15aa95c3fe /basic
parent97f2f76452dd116090e513239ca656bd432494d7 (diff)
StaticIsEnabledBroadcasting can only be true
Diffstat (limited to 'basic')
-rw-r--r--basic/inc/basic/sbxcore.hxx2
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/sbx/sbxbase.cxx7
-rw-r--r--basic/source/sbx/sbxvar.cxx4
4 files changed, 3 insertions, 12 deletions
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 3d425353e482..a4abca6d4649 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -134,8 +134,6 @@ public:
static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
static SbxObject* CreateObject( const String& );
- // Sbx solution as replacement for SfxBroadcaster::Enable()
- static sal_Bool StaticIsEnabledBroadcasting( void );
};
#ifndef SBX_BASE_DECL_DEFINED
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 3c2f1f2a2116..ea723adbb1da 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2157,7 +2157,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
// #100883 Own Broadcast for SbMethod
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
// the authorisation
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 718fa0eaafce..1ca523c6ac99 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -246,13 +246,6 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
return pNew;
}
-static sal_Bool bStaticEnableBroadcasting = sal_True;
-
-sal_Bool SbxBase::StaticIsEnabledBroadcasting( void )
-{
- return bStaticEnableBroadcasting;
-}
-
SbxBase* SbxBase::Load( SvStream& rStrm )
{
sal_uInt16 nSbxId, nFlags, nVer;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 012c643e96e9..f70cb39807d8 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -174,7 +174,7 @@ SbxObject* SbxVariable::GetParent()
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
// rights here again
@@ -619,7 +619,7 @@ SbxAlias::~SbxAlias()
void SbxAlias::Broadcast( sal_uIntPtr nHt )
{
- if( xAlias.Is() && StaticIsEnabledBroadcasting() )
+ if( xAlias.Is() )
{
xAlias->SetParameters( GetParameters() );
if( nHt == SBX_HINT_DATAWANTED )