summaryrefslogtreecommitdiff
path: root/svx/source
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 09:17:22 +0100
commit5a8ea2218a352561a3f494af545d9b978766a513 (patch)
tree39d49e96342fd94374050cfa56e17e0ec623cae5 /svx/source
parent56b96f3cc1f03313afade4f642861efb76d0bb54 (diff)
ofz#6311 still problems with SdrEdgeObj listening to same obj at start as end
Change-Id: Ibd80b484788779b73943b28a5f36e51ebcacec30 Reviewed-on: https://gerrit.libreoffice.org/49824 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 'svx/source')
-rw-r--r--svx/source/gallery2/gallery1.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdotxat.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c3d32d6f1971..d89d896946af 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -763,7 +763,7 @@ GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rL
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName );
if( pThemeEntry && ( ( pTheme = ImplGetCachedTheme( pThemeEntry ) ) != nullptr ) )
- rListener.StartListening( *pTheme, true );
+ rListener.StartListening(*pTheme, DuplicateHandling::Prevent);
return pTheme;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4744dd2c1d9b..5c97d855633c 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -589,7 +589,7 @@ void SdrObject::AddListener(SfxListener& rListener)
// SdrEdgeObj may be connected to same SdrObject on both ends so allow it
// to listen twice
SdrEdgeObj const*const pEdge(dynamic_cast<SdrEdgeObj const*>(&rListener));
- rListener.StartListening(*pPlusData->pBroadcast, pEdge != nullptr);
+ rListener.StartListening(*pPlusData->pBroadcast, pEdge ? DuplicateHandling::Allow : DuplicateHandling::Unexpected);
}
void SdrObject::RemoveListener(SfxListener& rListener)
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index f6aa20a83961..70cda2234529 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -383,7 +383,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
for(std::set<SfxStyleSheet*>::const_iterator it = aStyleSheets.begin(); it != aStyleSheets.end(); ++it) {
SfxStyleSheet* pStyle=*it;
// let StartListening see for itself if there's already a listener registered
- StartListening(*pStyle,true);
+ StartListening(*pStyle, DuplicateHandling::Prevent);
}
}
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 6571d3086eb3..3a22aa10863f 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -230,7 +230,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
SetSize();
aColorSet->Show();
if (_pBindings != nullptr)
- StartListening( *_pBindings, true );
+ StartListening(*_pBindings, DuplicateHandling::Prevent);
}
SvxColorDockingWindow::~SvxColorDockingWindow()