diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-14 12:46:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-17 06:43:02 +0000 |
| commit | 68a8d0e7507840e2b599e0f075dbd85ea5819ba9 (patch) | |
| tree | f85e2ce97298608f80528d7685f7c74d06023815 /forms | |
| parent | be7f3df701e4d94b64af6626d53e03d9336a09cf (diff) | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/binding.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/model.cxx | 12 | ||||
| -rw-r--r-- | forms/source/xforms/model.hxx | 13 |
3 files changed, 1 insertions, 26 deletions
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 |