sfx2/inc/unoctitm.hxx | 4 ++--
sfx2/source/control/unoctitm.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 962c9cb5cf9127ccad2c9d947ea03d40e4e556ce
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Dec 1 21:33:06 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 4 12:05:13 2021 +0100
use OMultiTypeInterfaceContainerHelperVar3 in SfxStatusDispatcher
Change-Id: I79beb9ab22184176c67555d8742c01c11c9e6f8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126339
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index a88a64c261ef..6eb9e7147945 100644
--- a/sfx2/inc/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -21,7 +21,7 @@
#include <memory>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/multiinterfacecontainer2.hxx>
+#include <comphelper/multiinterfacecontainer3.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weakref.hxx>
@@ -39,7 +39,7 @@ class SfxBindings;
class SfxDispatcher;
class SfxSlot;
-typedef comphelper::OMultiTypeInterfaceContainerHelperVar2<OUString>
+typedef
comphelper::OMultiTypeInterfaceContainerHelperVar3<css::frame::XStatusListener,
OUString>
SfxStatusDispatcher_Impl_ListenerContainer;
class SfxStatusDispatcher : public
cppu::WeakImplHelper<css::frame::XNotifyingDispatch>
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b01500814bc9..cecfb4c639e1 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -794,15 +794,15 @@ void SfxDispatchController_Impl::addStatusListener(const
css::uno::Reference< cs
void SfxDispatchController_Impl::sendStatusChanged(const OUString& rURL, const
css::frame::FeatureStateEvent& rEvent)
{
- ::comphelper::OInterfaceContainerHelper2* pContnr =
pDispatch->GetListeners().getContainer(rURL);
+ ::comphelper::OInterfaceContainerHelper3<css::frame::XStatusListener>*
pContnr = pDispatch->GetListeners().getContainer(rURL);
if (!pContnr)
return;
- ::comphelper::OInterfaceIteratorHelper2 aIt(*pContnr);
+ ::comphelper::OInterfaceIteratorHelper3 aIt(*pContnr);
while (aIt.hasMoreElements())
{
try
{
-
static_cast<css::frame::XStatusListener*>(aIt.next())->statusChanged(rEvent);
+ aIt.next()->statusChanged(rEvent);
}
catch (const css::uno::RuntimeException&)
{
