include/toolkit/controls/unocontrolmodel.hxx | 10 ++--------
toolkit/source/controls/unocontrolmodel.cxx | 13 -------------
2 files changed, 2 insertions(+), 21 deletions(-)
New commits:
commit 678747f95083be6f3e4d184e6258e49086952f45
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jan 12 15:59:22 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jan 14 06:36:58 2023 +0000
XUnoTunnel->dynamic_cast in UnoControlModel
Change-Id: I0d8a65aa16583fcb6c8201589b2d356da0be5cac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145482
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/toolkit/controls/unocontrolmodel.hxx
b/include/toolkit/controls/unocontrolmodel.hxx
index fb22dc3e4383..fb32aa5b0860 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <cppuhelper/weakagg.hxx>
@@ -33,7 +32,7 @@
#include <toolkit/helper/listenermultiplexer.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase6.hxx>
#include <comphelper/uno3.hxx>
#include <rtl/ref.hxx>
@@ -47,12 +46,11 @@ typedef std::map<sal_uInt16, css::uno::Any>
ImplPropertyTable;
-typedef ::cppu::WeakAggImplHelper7 < css::awt::XControlModel
+typedef ::cppu::WeakAggImplHelper6 < css::awt::XControlModel
, css::beans::XPropertyState
, css::io::XPersistObject
, css::lang::XComponent
, css::lang::XServiceInfo
- , css::lang::XUnoTunnel
, css::util::XCloneable
> UnoControlModel_Base;
@@ -130,10 +128,6 @@ public:
// css::uno::XAggregation
css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType )
override;
- // css::lang::XUnoTunnel
- static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() noexcept;
- sal_Int64 SAL_CALL
getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
-
// css::util::XCloneable
css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
override;
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index 983ea89459ee..3147164332bd 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -420,19 +420,6 @@ css::uno::Any UnoControlModel::queryAggregation( const
css::uno::Type & rType )
return aRet;
}
-// css::lang::XUnoTunnel
-
-const css::uno::Sequence< sal_Int8 >& UnoControlModel::getUnoTunnelId()
noexcept
-{
- static const comphelper::UnoIdInit theUnoControlModelUnoTunnelId;
- return theUnoControlModelUnoTunnelId.getSeq();
-}
-
-sal_Int64 UnoControlModel::getSomething( const css::uno::Sequence< sal_Int8 >&
rIdentifier )
-{
- return comphelper::getSomethingImpl(rIdentifier, this);
-}
-
// XInterface
IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base )
