diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-13 11:29:37 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-15 06:08:14 +0200 |
| commit | 3f65724ec5fc92d5a0078a99932358ef7091435c (patch) | |
| tree | 94dd9bf1d0ecd42dbf7f94db45bc7e1bf29b83ce /pyuno | |
| parent | 6444b026b4039458d01ada5fee58eae98166585b (diff) | |
Use <comphelper/servicehelper.hxx> implementing XUnoTunnel part 4
- Change implementations of getSomething to use getSomethingImpl
Or where that's impossible, use getSomething_cast to unify this and
reduce number of places where we reinterpret_cast.
All static methods getting tunnel ids were renamed to getUnoTunnelId,
to comply with the convention used in <comphelper/servicehelper.hxx>.
TODO (in separate commits):
- Revise uses of getSomething to use getFromUnoTunnel
Change-Id: Ifde9e214b52e5df678de71fcc32d2199c82e85cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122100
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno_adapter.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index 3bca5c232a11..daef59488cc2 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -29,7 +29,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/typeprovider.hxx> using com::sun::star::beans::XIntrospectionAccess; @@ -75,9 +74,7 @@ Sequence<sal_Int8> Adapter::getUnoTunnelId() sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) { - if (comphelper::isUnoTunnelId<Adapter>(id)) - return reinterpret_cast<sal_Int64>(this); - return 0; + return comphelper::getSomethingImpl(id, this); } void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime ) |