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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/core/api/Section.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 4d9f078827f7..6c0892ceecc3 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -97,7 +97,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/types.hxx> #include <dbaccess/dbaundomanager.hxx> #include <editeng/paperinf.hxx> @@ -1938,7 +1937,7 @@ sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int { sal_Int64 nRet = 0; if (comphelper::isUnoTunnelId<OReportDefinition>(rId) ) - nRet = reinterpret_cast<sal_Int64>(this); + nRet = comphelper::getSomething_cast(this); else { uno::Reference< lang::XUnoTunnel> xUnoTunnel(m_pImpl->m_xNumberFormatsSupplier,uno::UNO_QUERY); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index b3255bc290e0..bed193b3242f 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -20,7 +20,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <com/sun/star/report/XReportComponent.hpp> #include <com/sun/star/report/ForceNewPage.hpp> #include <com/sun/star/lang/NoSupportException.hpp> @@ -567,7 +566,7 @@ sal_Bool SAL_CALL OSection::hasForms() sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) { if (comphelper::isUnoTunnelId<OSection>(rId) ) - return reinterpret_cast<sal_Int64>(this); + return comphelper::getSomething_cast(this); return (m_xDrawPage_Tunnel.is()) ? m_xDrawPage_Tunnel->getSomething(rId) : 0; } |