From adc295a1b2e1f2ed43e7eb587fc89d7229e0f122 Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Sat, 15 Jun 2019 21:46:13 +0300 Subject: Add comphelper::getUnoTunnelImplementation template Use it instead of classname::getImplementation from UNO3_GETIMPLEMENTATION_* Change-Id: Ifcc8cfcd6369c576250008c76ce31ba79ea3a596 Reviewed-on: https://gerrit.libreoffice.org/74107 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- svtools/source/hatchwindow/hatchwindow.cxx | 2 +- svtools/source/uno/unoiface.cxx | 2 +- svtools/source/uno/unoimap.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools') diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index 90cbb959be88..7d572e50eacb 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -48,7 +48,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer > SolarMutexGuard aGuard; VclPtr pParent; - VCLXWindow* pParentComponent = VCLXWindow::getImplementation( xParent ); + VCLXWindow* pParentComponent = comphelper::getUnoTunnelImplementation( xParent ); if ( pParentComponent ) pParent = pParentComponent->GetWindow(); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 0f27d4c65a05..dcaa46182e90 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1312,7 +1312,7 @@ void SVTXFormattedField::setFormatsSupplier(const css::uno::Reference< css::util } else { - pNew = SvNumberFormatsSupplierObj::getImplementation(xSupplier); + pNew = comphelper::getUnoTunnelImplementation(xSupplier); bIsStandardSupplier = false; } diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 5e86ecf5c7df..cc0c223c3f9d 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -561,7 +561,7 @@ SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) Reference< XInterface > xObject; aElement >>= xObject; - SvUnoImageMapObject* pObject = SvUnoImageMapObject::getImplementation( xObject ); + SvUnoImageMapObject* pObject = comphelper::getUnoTunnelImplementation( xObject ); if( nullptr == pObject ) throw IllegalArgumentException(); @@ -708,7 +708,7 @@ Reference< XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, cons bool SvUnoImageMap_fillImageMap( const Reference< XInterface >& xImageMap, ImageMap& rMap ) { - SvUnoImageMap* pUnoImageMap = SvUnoImageMap::getImplementation( xImageMap ); + SvUnoImageMap* pUnoImageMap = comphelper::getUnoTunnelImplementation( xImageMap ); if( nullptr == pUnoImageMap ) return false; -- cgit