forms/source/xforms/binding.cxx | 2 -
forms/source/xforms/model.cxx | 12 ----------
forms/source/xforms/model.hxx | 13 -----------
framework/inc/classes/rootactiontriggercontainer.hxx | 6 -----
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 14 ------------
5 files changed, 1 insertion(+), 46 deletions(-)
New commits:
commit 9e1ebb43abf2882f48d3cae92a3ce33ce2c437de
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Jan 14 12:47:39 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 17 06:43:10 2023 +0000
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.gran...@collabora.co.uk>
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()
{
commit 68a8d0e7507840e2b599e0f075dbd85ea5819ba9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Jan 14 12:46:05 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 17 06:43:02 2023 +0000
XUnoTunnel->dynamic_cast in forms::Model
Change-Id: I60525e6c4f2d2400cdc47538e9d704b10b7c87ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145627
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 4341daa7331f..e2e3b903e33f 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -445,7 +445,7 @@ bool Binding::isLive() const
Model* Binding::getModelImpl() const
{
- return comphelper::getFromUnoTunnel<Model>( mxModel );
+ return dynamic_cast<Model*>( mxModel.get() );
}
static void lcl_addListenerToNode( const Reference<XNode>& xNode,
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index d4eeb0e57980..e347c9219ac6 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -129,13 +129,6 @@ EvaluationContext Model::getEvaluationContext()
}
-css::uno::Sequence<sal_Int8> Model::getUnoTunnelId()
-{
- static const comphelper::UnoIdInit aImplementationId;
- return aImplementationId.getSeq();
-}
-
-
void Model::setForeignSchema( const
css::uno::Reference<css::xml::dom::XDocument>& rDocument )
{
mxForeignSchema = rDocument;
@@ -583,11 +576,6 @@ void Model::update()
}
-sal_Int64 Model::getSomething( const css::uno::Sequence<sal_Int8>& xId )
-{
- return comphelper::getSomethingImpl(xId, this);
-}
-
Sequence<sal_Int8> Model::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 9deb8a834ae5..59fa7450fb80 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/xforms/XFormsUIHelper1.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ref.hxx>
#include "mip.hxx"
@@ -70,7 +69,6 @@ typedef cppu::ImplInheritanceHelper<
css::xforms::XModel2,
css::xforms::XFormsUIHelper1,
css::util::XUpdatable,
- css::lang::XUnoTunnel,
css::lang::XServiceInfo
> Model_t;
class Model : public Model_t
@@ -114,10 +112,6 @@ public:
xforms::EvaluationContext getEvaluationContext();
-
- static css::uno::Sequence<sal_Int8> getUnoTunnelId();
-
-
// get/set that part of the schema, that we can't interpret as data types
css::uno::Reference<css::xml::dom::XDocument> getForeignSchema() const {
return mxForeignSchema;}
void setForeignSchema( const
css::uno::Reference<css::xml::dom::XDocument>& );
@@ -347,13 +341,6 @@ public:
virtual void SAL_CALL update() override;
- // XUnoTunnel
-
-
-public:
- virtual sal_Int64 SAL_CALL getSomething( const
css::uno::Sequence<sal_Int8>& ) override;
-
-
// XTypeProvider::getImplementationId
