diff options
author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-06-15 21:46:13 +0300 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-06-17 08:56:36 +0200 |
commit | adc295a1b2e1f2ed43e7eb587fc89d7229e0f122 (patch) | |
tree | d045a927d1f88d2574bdef441bc1cbc0b81fd16b /filter | |
parent | d39846bfd16ad9873795149c370a95f42363bfd9 (diff) |
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 <sbergman@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 8 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 365a620f5a4c..ff9ef46333c1 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -877,7 +877,7 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage ) mpSolverContainer.reset( new EscherSolverContainer ); } else - pSvxDrawPage = SvxDrawPage::getImplementation(mXDrawPage); + pSvxDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>(mXDrawPage); return pSvxDrawPage != nullptr; } @@ -988,7 +988,7 @@ sal_uInt32 EscherEx::AddDummyShape() const SdrObject* EscherEx::GetSdrObject( const Reference< XShape >& rShape ) { const SdrObject* pRet = nullptr; - const SvxShape* pSvxShape = SvxShape::getImplementation( rShape ); + const SvxShape* pSvxShape = comphelper::getUnoTunnelImplementation<SvxShape>( rShape ); DBG_ASSERT( pSvxShape, "EscherEx::GetSdrObject: no SvxShape" ); if( pSvxShape ) { diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 92c344485e94..9b17fb382a05 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -582,7 +582,7 @@ bool SVGFilter::implExportImpressOrDraw( const Reference< XOutputStream >& rxOSt if( mxDefaultPage.is() ) { - SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( mxDefaultPage ); + SvxDrawPage* pSvxDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( mxDefaultPage ); if( pSvxDrawPage ) { @@ -700,7 +700,7 @@ bool SVGFilter::implExportWriterTextGraphic( const Reference< view::XSelectionSu Size aSize( OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapMode(MapUnit::Map100thMM)) ); assert(mSelectedPages.size() == 1); - SvxDrawPage* pSvxDrawPage(SvxDrawPage::getImplementation(mSelectedPages[0])); + SvxDrawPage* pSvxDrawPage(comphelper::getUnoTunnelImplementation<SvxDrawPage>(mSelectedPages[0])); if(pSvxDrawPage == nullptr || pSvxDrawPage->GetSdrPage() == nullptr) return false; @@ -1053,7 +1053,7 @@ void SVGFilter::implGenerateMetaData() // NOTE: at present pSdrModel->GetPageNumType() returns always css::style::NumberingType::ARABIC // so the following code fragment is pretty useless sal_Int32 nPageNumberingType = css::style::NumberingType::ARABIC; - SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( mSelectedPages[0] ); + SvxDrawPage* pSvxDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( mSelectedPages[0] ); if( pSvxDrawPage ) { SdrPage* pSdrPage = pSvxDrawPage->GetSdrPage(); @@ -1518,7 +1518,7 @@ void SVGFilter::implGetPagePropSet( const Reference< css::drawing::XDrawPage > & if( mVisiblePagePropSet.bIsPageNumberFieldVisible ) { - SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( rxPage ); + SvxDrawPage* pSvxDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( rxPage ); if( pSvxDrawPage ) { SdrPage* pSdrPage = pSvxDrawPage->GetSdrPage(); diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 482c3ba7eb2f..9bb57068dfea 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -213,7 +213,7 @@ bool SVGFilter::filterImpressOrDraw( const Sequence< PropertyValue >& rDescripto } // get that DrawPage's UNO API implementation - SvxDrawPage* pSvxDrawPage(SvxDrawPage::getImplementation(xDrawPage)); + SvxDrawPage* pSvxDrawPage(comphelper::getUnoTunnelImplementation<SvxDrawPage>(xDrawPage)); if(nullptr == pSvxDrawPage || nullptr == pSvxDrawPage->GetSdrPage()) { |