summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-02-15 14:10:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-02-16 00:35:10 +0100
commit7faa218231b7a807412feada3aa1223b43b5626e (patch)
tree08ea7a2e4fc9e88a8158dc0c8392555b94138e27 /basic
parente1082e45361a92a31adedcc3ed0a35c704bca543 (diff)
ofz#6311 still problems with SdrEdgeObj listening to same obj at start as end
Change-Id: Ibd80b484788779b73943b28a5f36e51ebcacec30 Reviewed-on: https://gerrit.libreoffice.org/49821 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sb.cxx6
-rw-r--r--basic/source/classes/sbxmod.cxx6
-rw-r--r--basic/source/sbx/sbxcoll.cxx2
-rw-r--r--basic/source/sbx/sbxobj.cxx8
4 files changed, 11 insertions, 11 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 524b392a6e98..132ea5d49415 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -657,7 +657,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewMethod->pMod = this;
pNewMethod->SetParent( this );
pMethods->PutDirect( pNewMethod, i );
- StartListening( pNewMethod->GetBroadcaster(), true );
+ StartListening(pNewMethod->GetBroadcaster(), DuplicateHandling::Prevent);
}
}
}
@@ -709,7 +709,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewProp->ResetFlag( SbxFlagBits::NoBroadcast ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
pProps->PutDirect( pNewProp, i );
- StartListening( pNewProp->GetBroadcaster(), true );
+ StartListening(pNewProp->GetBroadcaster(), DuplicateHandling::Prevent);
}
else
{
@@ -1068,7 +1068,7 @@ void StarBASIC::Insert( SbxVariable* pVar )
{
pModules.emplace_back(static_cast<SbModule*>(pVar));
pVar->SetParent( this );
- StartListening( pVar->GetBroadcaster(), true );
+ StartListening(pVar->GetBroadcaster(), DuplicateHandling::Prevent);
}
else
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 97fe73dbface..8c2edf1c8912 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -534,7 +534,7 @@ SbMethod* SbModule::GetMethod( const OUString& rName, SbxDataType t )
pMeth->SetParent( this );
pMeth->SetFlags( SbxFlagBits::Read );
pMethods->Put( pMeth, pMethods->Count() );
- StartListening( pMeth->GetBroadcaster(), true );
+ StartListening(pMeth->GetBroadcaster(), DuplicateHandling::Prevent);
}
// The method is per default valid, because it could be
// created from the compiler (code generator) as well.
@@ -572,7 +572,7 @@ SbProperty* SbModule::GetProperty( const OUString& rName, SbxDataType t )
pProp->SetFlag( SbxFlagBits::ReadWrite );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), true );
+ StartListening(pProp->GetBroadcaster(), DuplicateHandling::Prevent);
}
return pProp;
}
@@ -591,7 +591,7 @@ void SbModule::GetProcedureProperty( const OUString& rName, SbxDataType t )
pProp->SetFlag( SbxFlagBits::ReadWrite );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), true );
+ StartListening(pProp->GetBroadcaster(), DuplicateHandling::Prevent);
}
}
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index c6a3d956a914..a4175c310318 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -47,7 +47,7 @@ SbxCollection::SbxCollection()
}
Initialize();
// For Access on itself
- StartListening( GetBroadcaster(), true );
+ StartListening(GetBroadcaster(), DuplicateHandling::Prevent);
}
SbxCollection::SbxCollection( const SbxCollection& rColl )
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index e241b53c0387..54eedd360bda 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -413,7 +413,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp
pArray->Put( pVar, pArray->Count() );
SetModified( true );
// The object listen always
- StartListening( pVar->GetBroadcaster(), true );
+ StartListening(pVar->GetBroadcaster(), DuplicateHandling::Prevent);
return pVar;
}
@@ -450,7 +450,7 @@ void SbxObject::Insert( SbxVariable* pVar )
}
}
}
- StartListening( pVar->GetBroadcaster(), true );
+ StartListening(pVar->GetBroadcaster(), DuplicateHandling::Prevent);
pArray->Put( pVar, nIdx );
if( pVar->GetParent() != this )
{
@@ -494,7 +494,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
}
if( pArray )
{
- StartListening( pVar->GetBroadcaster(), true );
+ StartListening(pVar->GetBroadcaster(), DuplicateHandling::Prevent);
pArray->Put( pVar, pArray->Count() );
if( pVar->GetParent() != this )
{
@@ -573,7 +573,7 @@ static bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
if( pVar )
{
pVar->SetParent( pThis );
- pThis->StartListening( pVar->GetBroadcaster(), true );
+ pThis->StartListening(pVar->GetBroadcaster(), DuplicateHandling::Prevent);
}
}
pArray->Merge( p.get() );