summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx6
-rw-r--r--svx/source/fmcomp/gridcell.cxx8
-rw-r--r--svx/source/mnuctrls/smarttagmenu.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx6
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshap3.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx6
-rw-r--r--svx/source/unogallery/unogaltheme.cxx4
14 files changed, 26 insertions, 26 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 6f280f3d7304..a4f3fc922fa0 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -252,7 +252,7 @@ void SetTemporary( uno::Reference< drawing::XShape > const & xShape )
{
if ( xShape.is() )
{
- SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>( xShape );
if ( pShape )
pShape->TakeSdrObjectOwnership();
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 52b05f086986..3134c0ce67a9 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -471,7 +471,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
vcl::Window* pParentWin = nullptr;
if (rParentPeer.is())
{
- VCLXWindow* pParent = comphelper::getUnoTunnelImplementation<VCLXWindow>(rParentPeer);
+ VCLXWindow* pParent = comphelper::getFromUnoTunnel<VCLXWindow>(rParentPeer);
if (pParent)
pParentWin = pParent->GetWindow();
}
@@ -494,7 +494,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
// if (--m_nPeerCreationLevel == 0)
{
DBG_ASSERT(getPeer().is(), "FmXGridControl::createPeer : something went wrong ... no top level peer !");
- pPeer = comphelper::getUnoTunnelImplementation<FmXGridPeer>(getPeer());
+ pPeer = comphelper::getFromUnoTunnel<FmXGridPeer>(getPeer());
setPosSize( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight, css::awt::PosSize::POSSIZE );
@@ -966,7 +966,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode)
void SAL_CALL FmXGridControl::setFocus()
{
- FmXGridPeer* pPeer = comphelper::getUnoTunnelImplementation<FmXGridPeer>(getPeer());
+ FmXGridPeer* pPeer = comphelper::getFromUnoTunnel<FmXGridPeer>(getPeer());
if (pPeer)
{
VclPtr<FmGridControl> xGrid = pPeer->GetAs<FmGridControl>();
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index c0cb0d1e376c..fb932ef7809f 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1310,7 +1310,7 @@ void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet >
SvNumberFormatter* pFormatterUsed = nullptr;
if (m_xSupplier.is())
{
- SvNumberFormatsSupplierObj* pImplementation = comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>(m_xSupplier);
+ SvNumberFormatsSupplierObj* pImplementation = comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>(m_xSupplier);
if (pImplementation)
pFormatterUsed = pImplementation->GetNumberFormatter();
else
@@ -1898,7 +1898,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
SvNumberFormatter* pFormatterUsed = nullptr;
if ( xSupplier.is() )
{
- SvNumberFormatsSupplierObj* pImplementation = comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( xSupplier );
+ SvNumberFormatsSupplierObj* pImplementation = comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier );
pFormatterUsed = pImplementation ? pImplementation->GetNumberFormatter() : nullptr;
}
if ( nullptr == pFormatterUsed )
@@ -4407,7 +4407,7 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId
{
sal_Int64 nReturn(0);
- if ( isUnoTunnelId<FmXFilterCell>(_rIdentifier) )
+ if ( comphelper::isUnoTunnelId<FmXFilterCell>(_rIdentifier) )
{
nReturn = reinterpret_cast<sal_Int64>(this);
}
@@ -4417,7 +4417,7 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId
const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId()
{
- static const UnoTunnelIdInit theFmXFilterCellUnoTunnelId;
+ static const comphelper::UnoIdInit theFmXFilterCellUnoTunnelId;
return theFmXFilterCellUnoTunnelId.getSeq();
}
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index fda61882a42b..a918418cda78 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -111,7 +111,7 @@ void SmartTagMenuController::FillMenu()
sal_uInt16 nMenuId = 1;
sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
- VCLXMenu* pAwtMenu = comphelper::getUnoTunnelImplementation<VCLXMenu>( m_xPopupMenu );
+ VCLXMenu* pAwtMenu = comphelper::getFromUnoTunnel<VCLXMenu>( m_xPopupMenu );
PopupMenu* pVCLMenu = static_cast< PopupMenu* >( pAwtMenu->GetMenu() );
const css::uno::Sequence< css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence = m_pSmartTagItem->GetActionComponentsSequence();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2d0b338b1cd8..273719218663 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2466,7 +2466,7 @@ void SdrObjEditView::getTextSelection(css::uno::Any& rSelection)
css::uno::Reference<css::text::XText> xText(pObj->getUnoShape(), css::uno::UNO_QUERY);
if (xText.is())
{
- SvxUnoTextBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextBase>(xText);
+ SvxUnoTextBase* pRange = comphelper::getFromUnoTunnel<SvxUnoTextBase>(xText);
if (pRange)
{
rSelection <<= pRange->createTextCursorBySelection(pOutlinerView->GetSelection());
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 5cd3e37dec4c..0212b99c7232 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1880,7 +1880,7 @@ void SdrModel::dumpAsXml(xmlTextWriterPtr pWriter) const
const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelId()
{
- static const UnoTunnelIdInit theSdrModelUnoTunnelImplementationId;
+ static const comphelper::UnoIdInit theSdrModelUnoTunnelImplementationId;
return theSdrModelUnoTunnelImplementationId.getSeq();
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 17a2e0411cd3..27c2fb50b6c2 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2823,7 +2823,7 @@ void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUn
}
maWeakUnoShape = _rxUnoShape;
- mpSvxShape = comphelper::getUnoTunnelImplementation<SvxShape>( _rxUnoShape );
+ mpSvxShape = comphelper::getFromUnoTunnel<SvxShape>( _rxUnoShape );
// I think this may never happen... But I am not sure enough .-)
if ( bTransferOwnership )
@@ -2915,7 +2915,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape()
uno::Reference< uno::XInterface > xPage(pPageCandidate->getUnoPage());
if( xPage.is() )
{
- SvxDrawPage* pDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>(xPage);
+ SvxDrawPage* pDrawPage = comphelper::getFromUnoTunnel<SvxDrawPage>(xPage);
if( pDrawPage )
{
// create one
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 4393cd1ffbf5..12ac69f92411 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -547,7 +547,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
rDataValue.Value >>= xPage;
if( xPage.is() )
{
- SvxDrawPage* pUnoPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( xPage );
+ SvxDrawPage* pUnoPage = comphelper::getFromUnoTunnel<SvxDrawPage>( xPage );
if( pUnoPage && pUnoPage->GetSdrPage() )
mpCurrentPage = pUnoPage->GetSdrPage();
}
@@ -1169,7 +1169,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
if( !mxPage.is() )
break;
- mpUnoPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( mxPage );
+ mpUnoPage = comphelper::getFromUnoTunnel<SvxDrawPage>( mxPage );
if( nullptr == mpUnoPage || nullptr == mpUnoPage->GetSdrPage() )
break;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index b52b4b80a5b5..78e79bcf6836 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -619,7 +619,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
return;
// get pPage from xPage and get Id (nPos)
- SvxDrawPage* pSvxPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( xPage );
+ SvxDrawPage* pSvxPage = comphelper::getFromUnoTunnel<SvxDrawPage>( xPage );
if( pSvxPage )
{
SdrPage* pPage = pSvxPage->GetSdrPage();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index b094ed1ee08f..f7bc19864927 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -182,7 +182,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
if ( ( mpModel == nullptr ) || ( mpPage == nullptr ) )
throw lang::DisposedException();
- SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>( xShape );
if( nullptr == pShape )
return;
@@ -253,7 +253,7 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x
if ( ( mpModel == nullptr ) || ( mpPage == nullptr ) )
throw lang::DisposedException();
- SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>( xShape );
if( nullptr == pShape )
return;
@@ -884,7 +884,7 @@ SdrPage* GetSdrPageFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xD
{
if(xDrawPage.is())
{
- SvxDrawPage* pDrawPage = comphelper::getUnoTunnelImplementation<SvxDrawPage>( xDrawPage );
+ SvxDrawPage* pDrawPage = comphelper::getFromUnoTunnel<SvxDrawPage>( xDrawPage );
if(pDrawPage)
{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 22d719c204d1..ad441e7a725d 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -175,7 +175,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape
return;
}
- SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>( xShape );
if (!pShape)
{
OSL_FAIL("could not add XShape to group shape!");
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 6750f3370ef5..12cf5d1bf321 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -111,7 +111,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
{
SolarMutexGuard aGuard;
- SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>( xShape );
if(!HasSdrObject() || !mxPage.is() || pShape == nullptr || nullptr != pShape->GetSdrObject() )
throw uno::RuntimeException();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1fa0e7d109de..1afb2f8fa73a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -304,13 +304,13 @@ uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType )
const css::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() noexcept
{
- static const UnoTunnelIdInit theSvxShapeUnoTunnelId;
+ static const comphelper::UnoIdInit theSvxShapeUnoTunnelId;
return theSvxShapeUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
{
- if( isUnoTunnelId<SvxShape>(rId) )
+ if( comphelper::isUnoTunnelId<SvxShape>(rId) )
{
return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
}
@@ -4015,7 +4015,7 @@ uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) noexc
SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt )
{
- SvxShape* pSvxShape = comphelper::getUnoTunnelImplementation<SvxShape>( xInt );
+ SvxShape* pSvxShape = comphelper::getFromUnoTunnel<SvxShape>( xInt );
return pSvxShape ? pSvxShape->GetSdrObject() : nullptr;
}
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index c25388bd264f..b40cbc3651ba 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -229,7 +229,7 @@ void SAL_CALL GalleryTheme::update( )
if( mpTheme )
{
- GalleryDrawingModel* pModel = comphelper::getUnoTunnelImplementation<GalleryDrawingModel>( Drawing );
+ GalleryDrawingModel* pModel = comphelper::getFromUnoTunnel<GalleryDrawingModel>( Drawing );
if( pModel && dynamic_cast<const FmFormModel*>(pModel->GetDoc()) )
{
@@ -248,7 +248,7 @@ void SAL_CALL GalleryTheme::update( )
uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( Drawing, uno::UNO_QUERY_THROW );
uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), uno::UNO_SET_THROW );
uno::Reference< drawing::XDrawPage > xPage( xDrawPages->getByIndex( 0 ), uno::UNO_QUERY_THROW );
- SvxDrawPage* pUnoPage = xPage.is() ? comphelper::getUnoTunnelImplementation<SvxDrawPage>( xPage ) : nullptr;
+ SvxDrawPage* pUnoPage = xPage.is() ? comphelper::getFromUnoTunnel<SvxDrawPage>( xPage ) : nullptr;
SdrModel* pOrigModel = pUnoPage ? &pUnoPage->GetSdrPage()->getSdrModelFromSdrPage() : nullptr;
SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : nullptr;
generated by cgit (git 2.34.1) at 2025-01-14 06:17:57 +0000