diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-14 08:19:47 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-15 06:07:36 +0200 |
commit | 05bc93db2de56000f65764d7e394d03747cac23d (patch) | |
tree | 975de9ae83572aac8a5c3ea8db281e1017ee5be0 /sd/source/ui/unoidl/unolayer.cxx | |
parent | 8cbb414ed737f9ffc76e1258e6671769bf63fc6c (diff) |
Use <comphelper/servicehelper.hxx> implementing XUnoTunnel part 1
The header got some changes:
1. Move UnoTunnelIdInit and isUnoTunnelId into 'comphelper' namespace
2. Rename UnoTunnelIdInit to UnoIdInit, as a precondition to replace
of uses of OImplementationId with it, including in XTypeProvider
3. Introduce convenience functions 'getSomething_cast' to cast between
sal_Int64 and object pointers uniformly.
4. Rename getUnoTunnelImplementation to getFromUnoTunnel, both to make
it a bit shorter, and to reflect its function better. Templatize it
to take also css::uno::Any for convenience.
5. Introduce getSomethingImpl, inspired by sw::UnoTunnelImpl; allow it
handle cases both with and without fallback to parent.
6. Adjust UNO3_GETIMPLEMENTATION_* macros
TODO (in separate commits):
- Drop sw::UnoTunnelImpl and sw::UnoTunnelGetImplementation
- Replace all uses of OImplementationId in core with UnoIdInit
- Deprecate OImplementationId in <cppuhelper/typeprovider.hxx>
- Change implementations of getSomething to use getSomethingImpl
- Revise uses of getSomething to use getFromUnoTunnel
Change-Id: If4a3cb024130f1f552f988f0479589da1cd066e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122022
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd/source/ui/unoidl/unolayer.cxx')
-rw-r--r-- | sd/source/ui/unoidl/unolayer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index eb84735296da..3ffc7249d9a6 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -458,7 +458,7 @@ void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& x if( mpModel == nullptr ) throw lang::DisposedException(); - SdLayer* pSdLayer = comphelper::getUnoTunnelImplementation<SdLayer>(xLayer); + SdLayer* pSdLayer = comphelper::getFromUnoTunnel<SdLayer>(xLayer); if(pSdLayer && GetView()) { @@ -478,7 +478,7 @@ void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing: if( mpModel == nullptr ) throw lang::DisposedException(); - SdLayer* pSdLayer = comphelper::getUnoTunnelImplementation<SdLayer>(xLayer); + SdLayer* pSdLayer = comphelper::getFromUnoTunnel<SdLayer>(xLayer); SdrLayer* pSdrLayer = pSdLayer?pSdLayer->GetSdrLayer():nullptr; if(pSdrLayer==nullptr) return; @@ -664,7 +664,7 @@ bool compare_layers (const uno::WeakReference<uno::XInterface>& xRef, void const uno::Reference<uno::XInterface> xLayer (xRef); if (xLayer.is()) { - SdLayer* pSdLayer = comphelper::getUnoTunnelImplementation<SdLayer> (xRef); + SdLayer* pSdLayer = comphelper::getFromUnoTunnel<SdLayer> (xRef); if (pSdLayer != nullptr) { SdrLayer* pSdrLayer = pSdLayer->GetSdrLayer (); |