summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-01-14 12:47:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-01-17 06:43:10 +0000
commit9e1ebb43abf2882f48d3cae92a3ce33ce2c437de (patch)
treeac922e4806fe5a409c4cbcfba8dd77347adb0656 /framework
parent68a8d0e7507840e2b599e0f075dbd85ea5819ba9 (diff)
XUnoTunnel->dynamic_cast in RootActionTriggerContainer
Change-Id: Ie07b02b2011e4edb23793f6209cc35ccd7607c41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145628 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx6
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx14
2 files changed, 0 insertions, 20 deletions
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 4fd5f24f9fa7..3e109732a7b8 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
inline constexpr OUStringLiteral IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER = u"com.sun.star.comp.ui.RootActionTriggerContainer";
@@ -35,7 +34,6 @@ namespace framework
class RootActionTriggerContainer final : public PropertySetContainer,
public css::lang::XMultiServiceFactory,
public css::lang::XServiceInfo,
- public css::lang::XUnoTunnel,
public css::lang::XTypeProvider,
public css::container::XNamed
{
@@ -76,10 +74,6 @@ class RootActionTriggerContainer final : public PropertySetContainer,
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- // XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
- static const css::uno::Sequence<sal_Int8>& getUnoTunnelId() noexcept;
-
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override;
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 02fa9d2df0d0..1493f08bf429 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -38,13 +38,6 @@ using namespace com::sun::star::beans;
namespace framework
{
-const css::uno::Sequence<sal_Int8>& RootActionTriggerContainer::getUnoTunnelId() noexcept
-{
- static const sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
- static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16);
- return seqID;
-}
-
RootActionTriggerContainer::RootActionTriggerContainer(css::uno::Reference<css::awt::XPopupMenu> xMenu,
const OUString* pMenuIdentifier)
: m_bContainerCreated(false)
@@ -64,7 +57,6 @@ Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
aType ,
static_cast< XMultiServiceFactory* >(this),
static_cast< XServiceInfo* >(this),
- static_cast< XUnoTunnel* >(this),
static_cast< XTypeProvider* >(this),
static_cast< XNamed* >(this));
@@ -201,12 +193,6 @@ Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNam
return { SERVICENAME_ACTIONTRIGGERCONTAINER };
}
-// XUnoTunnel
-sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier )
-{
- return comphelper::getSomethingImpl(aIdentifier, this);
-}
-
// XTypeProvider
Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes()
{