diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-15 14:10:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-16 00:35:10 +0100 |
| commit | 7faa218231b7a807412feada3aa1223b43b5626e (patch) | |
| tree | 08ea7a2e4fc9e88a8158dc0c8392555b94138e27 /svx | |
| parent | e1082e45361a92a31adedcc3ed0a35c704bca543 (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 'svx')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 3d3107296a9b..2245a7f6ed7e 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -756,7 +756,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 2512c4571d0f..bcbd47923633 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -590,7 +590,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 7d92683764d0..f8c4f2105276 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 d77fa2c729c9..46e82045ace1 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() |