accessibility/source/standard/vclxaccessibletoolbox.cxx | 6
animations/source/animcore/animcore.cxx | 4
basctl/source/basicide/basicrenderable.cxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/accessibility/AccessibleChartView.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 2
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ChartController_Position.cxx | 2
chart2/source/controller/main/ChartController_Properties.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 8
chart2/source/controller/uitest/uiobject.cxx | 2
chart2/source/model/main/ChartModel.cxx | 2
chart2/source/tools/NumberFormatterWrapper.cxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 2
chart2/source/view/main/ChartView.cxx | 8
comphelper/source/misc/accimplaccess.cxx | 2
configmgr/source/childaccess.cxx | 2
connectivity/source/commontools/ConnectionWrapper.cxx | 2
connectivity/source/commontools/TConnection.cxx | 2
connectivity/source/drivers/ado/AColumn.cxx | 2
connectivity/source/drivers/ado/AColumns.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 2
connectivity/source/drivers/ado/AGroup.cxx | 2
connectivity/source/drivers/ado/AGroups.cxx | 2
connectivity/source/drivers/ado/AIndex.cxx | 2
connectivity/source/drivers/ado/AIndexes.cxx | 2
connectivity/source/drivers/ado/AKey.cxx | 2
connectivity/source/drivers/ado/AKeys.cxx | 2
connectivity/source/drivers/ado/ATable.cxx | 4
connectivity/source/drivers/ado/ATables.cxx | 2
connectivity/source/drivers/ado/AUser.cxx | 2
connectivity/source/drivers/ado/AUsers.cxx | 2
connectivity/source/drivers/ado/AView.cxx | 2
connectivity/source/drivers/ado/AViews.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 2
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 2
connectivity/source/drivers/dbase/DIndexes.cxx | 2
connectivity/source/drivers/dbase/DResultSet.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/dbase/DTables.cxx | 2
connectivity/source/drivers/file/FConnection.cxx | 2
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2
connectivity/source/drivers/file/FDriver.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 2
connectivity/source/drivers/file/FTable.cxx | 2
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/firebird/Driver.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
connectivity/source/drivers/hsqldb/HTable.cxx | 2
connectivity/source/drivers/mysql_jdbc/YDriver.cxx | 5
connectivity/source/drivers/mysql_jdbc/YTable.cxx | 4
connectivity/source/drivers/writer/WTable.cxx | 4
connectivity/source/sdbcx/VCollection.cxx | 2
connectivity/source/sdbcx/VDescriptor.cxx | 4
dbaccess/source/core/api/RowSet.cxx | 8
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/core/api/querydescriptor.cxx | 2
dbaccess/source/core/api/table.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 4
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/ui/browser/brwview.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/querydesign/JoinExchange.cxx | 4
dbaccess/source/ui/uno/ColumnControl.cxx | 2
editeng/source/uno/unofield.cxx | 6
editeng/source/uno/unonrule.cxx | 6
editeng/source/uno/unotext.cxx | 28 +-
editeng/source/uno/unotext2.cxx | 2
filter/source/msfilter/eschesdo.cxx | 2
filter/source/svg/svgexport.cxx | 8
filter/source/svg/svgfilter.cxx | 2
forms/source/component/Columns.cxx | 4
forms/source/component/Grid.cxx | 6
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextmodel.cxx | 2
forms/source/solar/component/navbarcontrol.cxx | 2
forms/source/xforms/binding.cxx | 2
forms/source/xforms/model.cxx | 8
forms/source/xforms/model_helper.hxx | 12 -
forms/source/xforms/model_ui.cxx | 8
forms/source/xforms/submission.cxx | 10
framework/source/fwi/uielement/constitemcontainer.cxx | 6
framework/source/fwi/uielement/itemcontainer.cxx | 4
framework/source/fwi/uielement/rootitemcontainer.cxx | 6
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 6
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 6
framework/source/uielement/fontmenucontroller.cxx | 2
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/headermenucontroller.cxx | 2
framework/source/uielement/langselectionmenucontroller.cxx | 2
framework/source/uielement/macrosmenucontroller.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 6
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/uielement/popuptoolbarcontroller.cxx | 8
framework/source/uielement/recentfilesmenucontroller.cxx | 2
framework/source/uielement/resourcemenucontroller.cxx | 10
framework/source/uielement/thesaurusmenucontroller.cxx | 2
framework/source/uielement/toolbarmodemenucontroller.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 8
include/comphelper/servicehelper.hxx | 111
++++++----
oox/source/export/chartexport.cxx | 2
package/source/zippackage/ZipPackage.cxx | 2
package/source/zippackage/ZipPackageFolder.cxx | 2
package/source/zippackage/ZipPackageStream.cxx | 2
pyuno/source/module/pyuno.cxx | 2
pyuno/source/module/pyuno_adapter.cxx | 2
pyuno/source/module/pyuno_runtime.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 4
reportdesign/source/core/api/Section.cxx | 2
reportdesign/source/core/sdr/RptObject.cxx | 2
reportdesign/source/core/sdr/RptPage.cxx | 4
reportdesign/source/core/sdr/UndoActions.cxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 6
reportdesign/source/ui/misc/RptUndo.cxx | 2
sc/qa/unit/copy_paste_test.cxx | 2
sc/source/core/data/documen8.cxx | 4
sc/source/core/data/document.cxx | 8
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/oox/pivottablebuffer.cxx | 2
sc/source/filter/xml/XMLConverter.cxx | 2
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2
sc/source/filter/xml/xmlbodyi.cxx | 6
sc/source/filter/xml/xmlcelli.cxx | 6
sc/source/filter/xml/xmlcoli.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 18 -
sc/source/filter/xml/xmlimprt.cxx | 14 -
sc/source/filter/xml/xmlrowi.cxx | 2
sc/source/filter/xml/xmlstyli.cxx | 6
sc/source/filter/xml/xmlsubti.cxx | 2
sc/source/filter/xml/xmltabi.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 4
sc/source/ui/app/drwtrans.cxx | 4
sc/source/ui/app/transobj.cxx | 8
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 2
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 36 +--
sc/source/ui/unoobj/dapiuno.cxx | 6
sc/source/ui/unoobj/docuno.cxx | 24 +-
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/shapeuno.cxx | 10
sc/source/ui/unoobj/styleuno.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 12 -
sc/source/ui/unoobj/viewuno.cxx | 6
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/vba/vbaeventshelper.cxx | 4
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/vba/vbarange.cxx | 8
sc/source/ui/vba/vbaworkbook.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 4
sc/source/ui/view/drawview.cxx | 6
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/tabview.cxx | 6
sc/source/ui/view/tabview3.cxx | 6
sc/source/ui/view/tabview5.cxx | 6
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/view/viewfun3.cxx | 2
sc/source/ui/view/viewfun7.cxx | 4
sd/source/core/drawdoc2.cxx | 4
sd/source/core/sdpage.cxx | 2
sd/source/core/text/textapi.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 10
sd/source/ui/app/sdxfer.cxx | 4
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/framework/factories/Pane.cxx | 4
sd/source/ui/framework/factories/PresentationFactory.cxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4
sd/source/ui/framework/module/CenterViewFocusModule.cxx | 4
sd/source/ui/framework/module/ShellStackGuard.cxx | 2
sd/source/ui/framework/module/ToolBarModule.cxx | 2
sd/source/ui/sidebar/PanelFactory.cxx | 2
sd/source/ui/sidebar/SlideBackground.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 4
sd/source/ui/unoidl/SdUnoDrawView.cxx | 10
sd/source/ui/unoidl/SdUnoOutlineView.cxx | 2
sd/source/ui/unoidl/unocpres.cxx | 6
sd/source/ui/unoidl/unolayer.cxx | 6
sd/source/ui/unoidl/unomodel.cxx | 16 -
sd/source/ui/unoidl/unopage.cxx | 18 -
sd/source/ui/unoidl/unosrch.cxx | 10
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/ViewTabBar.cxx | 4
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/thumbnailviewacc.cxx | 12 -
sfx2/source/doc/objserv.cxx | 4
starmath/source/mathml/export.cxx | 14 -
starmath/source/mathml/import.cxx | 16 -
starmath/source/mathml/mathmlexport.cxx | 14 -
starmath/source/mathml/mathmlimport.cxx | 12 -
starmath/source/unomodel.cxx | 6
starmath/source/view.cxx | 2
svl/source/items/style.cxx | 6
svl/source/numbers/numfmuno.cxx | 2
svtools/source/control/valueacc.cxx | 12 -
svtools/source/uno/unoimap.cxx | 4
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 6
svx/source/fmcomp/gridcell.cxx | 8
svx/source/mnuctrls/smarttagmenu.cxx | 2
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdobj.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 4
svx/source/unodraw/unomod.cxx | 2
svx/source/unodraw/unopage.cxx | 6
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap3.cxx | 2
svx/source/unodraw/unoshape.cxx | 6
svx/source/unogallery/unogaltheme.cxx | 4
sw/inc/unobaseclass.hxx | 22 -
sw/source/core/layout/dumpfilter.cxx | 2
sw/source/core/unocore/TextCursorHelper.cxx | 4
sw/source/core/unocore/unobkm.cxx | 10
sw/source/core/unocore/unochart.cxx | 6
sw/source/core/unocore/unocrsrhelper.cxx | 20 -
sw/source/core/unocore/unodraw.cxx | 12 -
sw/source/core/unocore/unofield.cxx | 8
sw/source/core/unocore/unoflatpara.cxx | 8
sw/source/core/unocore/unoframe.cxx | 6
sw/source/core/unocore/unoftn.cxx | 8
sw/source/core/unocore/unoidx.cxx | 16 -
sw/source/core/unocore/unoobj.cxx | 10
sw/source/core/unocore/unoobj2.cxx | 22 -
sw/source/core/unocore/unoparagraph.cxx | 4
sw/source/core/unocore/unoport.cxx | 4
sw/source/core/unocore/unoportenum.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 18 -
sw/source/core/unocore/unosect.cxx | 8
sw/source/core/unocore/unosett.cxx | 4
sw/source/core/unocore/unosrch.cxx | 4
sw/source/core/unocore/unostyle.cxx | 6
sw/source/core/unocore/unotbl.cxx | 12 -
sw/source/core/unocore/unotext.cxx | 62 ++---
sw/source/core/view/printdata.cxx | 2
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/html/htmlform.cxx | 4
sw/source/filter/indexing/IndexingExportFilter.cxx | 3
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 4
sw/source/filter/xml/xmlexp.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 8
sw/source/ui/dbui/mmlayoutpage.cxx | 2
sw/source/ui/index/cntex.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 6
sw/source/uibase/misc/glosdoc.cxx | 6
sw/source/uibase/shells/basesh.cxx | 2
sw/source/uibase/uiview/uivwimp.cxx | 4
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 8
sw/source/uibase/uno/unodispatch.cxx | 4
sw/source/uibase/uno/unomailmerge.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 10
sw/source/uibase/uno/unotxvw.cxx | 4
sw/source/uibase/utlui/uiitems.cxx | 2
sw/source/uibase/utlui/unotools.cxx | 4
toolkit/source/awt/vclxgraphics.cxx | 2
toolkit/source/awt/vclxmenu.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/source/awt/vclxtopwindow.cxx | 2
toolkit/source/awt/vclxwindow.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 6
toolkit/source/controls/grid/gridcolumn.cxx | 2
toolkit/source/controls/stdtabcontroller.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 4
toolkit/source/hatchwindow/hatchwindow.cxx | 2
toolkit/source/helper/unowrapper.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 16 -
unoxml/source/dom/element.cxx | 4
unoxml/source/dom/node.cxx | 16 -
unoxml/source/xpath/xpathapi.cxx | 6
vcl/source/gdi/graph.cxx | 2
vcl/source/graphic/BinaryDataContainerTools.cxx | 2
vcl/source/graphic/UnoGraphic.cxx | 2
vcl/source/graphic/UnoGraphicProvider.cxx | 2
vcl/source/treelist/transfer.cxx | 4
xmloff/source/core/attrlist.cxx | 2
xmloff/source/core/unoatrcn.cxx | 4
xmloff/source/core/xmlimp.cxx | 6
xmloff/source/style/xmlnumfe.cxx | 4
xmloff/source/style/xmlnumfi.cxx | 4
xmloff/source/transform/MutableAttrList.cxx | 4
xmloff/source/transform/OOo2Oasis.cxx | 4
xmloff/source/transform/Oasis2OOo.cxx | 4
xmlsecurity/source/gpg/CertificateImpl.cxx | 4
xmlsecurity/source/gpg/SecurityEnvironment.cxx | 4
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 4
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 2
302 files changed, 795 insertions(+), 778 deletions(-)
New commits:
commit 21a9ec75777f97886aa92a2a8a7c5945a8d0746f
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Sep 14 08:51:02 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Sep 15 06:07:49 2021 +0200
Use <comphelper/servicehelper.hxx> implementing XUnoTunnel part 2
Replace uses of sw::UnoTunnelImpl and sw::UnoTunnelGetImplementation with
respective comphelper::getSomethingImpl and comphelper::getFromUnoTunnel.
Drop the former from sw/inc/unobaseclass.hxx.
TODO (in separate commits):
- Replace all uses of OImplementationId in core with UnoTunnelIdInit
- Deprecate OImplementationId in <cppuhelper/typeprovider.hxx>
- Change implementations of getSomething to use getSomethingImpl
- Revise uses of getSomething to use getFromUnoTunnel
Change-Id: I1e350a88260277a67b833af56b285ac2277f433a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122075
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 477df5aab185..0dc56aad2886 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -97,28 +97,6 @@ namespace sw {
template<typename T>
using UnoImplPtr = std::unique_ptr<T, UnoImplPtrDeleter<T> >;
- template< class C > C *
- UnoTunnelGetImplementation( css::uno::Reference< css::lang::XUnoTunnel >
const & xUnoTunnel)
- {
- if (!xUnoTunnel.is()) { return 0; }
- C *const pC( reinterpret_cast< C* >(
- ::sal::static_int_cast< sal_IntPtr >(
- xUnoTunnel->getSomething(C::getUnoTunnelId()))));
- return pC;
- }
-
- template< class C > sal_Int64
- UnoTunnelImpl(const css::uno::Sequence< sal_Int8 > & rId,
- C *const pThis)
- {
- if (comphelper::isUnoTunnelId<C>(rId))
- {
- return ::sal::static_int_cast< sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(pThis) );
- }
- return 0;
- }
-
} // namespace sw
#endif // INCLUDED_SW_INC_UNOBASECLASS_HXX
diff --git a/sw/source/core/unocore/unobkm.cxx
b/sw/source/core/unocore/unobkm.cxx
index 5ee6dac48ab0..bea687b818fc 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -188,7 +188,7 @@ uno::Reference<text::XTextContent>
SwXBookmark::CreateXBookmark(
const uno::Reference< lang::XUnoTunnel> & xUT)
{
SwXBookmark *const pXBkm(
- ::sw::UnoTunnelGetImplementation<SwXBookmark>(xUT));
+ comphelper::getFromUnoTunnel<SwXBookmark>(xUT));
if (pXBkm && (pDoc == pXBkm->m_pImpl->m_pDoc))
{
return pXBkm->m_pImpl->m_pRegisteredBookmark;
@@ -204,7 +204,7 @@ const uno::Sequence< sal_Int8 > &
SwXBookmark::getUnoTunnelId()
sal_Int64 SAL_CALL SwXBookmark::getSomething( const uno::Sequence< sal_Int8 >&
rId )
{
- return ::sw::UnoTunnelImpl<SwXBookmark>(rId, this);
+ return comphelper::getSomethingImpl<SwXBookmark>(rId, this);
}
void SwXBookmark::attachToRangeEx(
@@ -222,9 +222,9 @@ void SwXBookmark::attachToRangeEx(
OTextCursorHelper* pCursor = nullptr;
if(xRangeTunnel.is())
{
- pRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ pRange = comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
}
SwDoc *const pDoc =
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index 3cdea60b7eb1..6b3db84c0e35 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -130,7 +130,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
if (xShape.is())
{
SvxShape *const pSvxShape(
- ::sw::UnoTunnelGetImplementation<SvxShape>(xShape));
+ comphelper::getFromUnoTunnel<SvxShape>(xShape));
if (pSvxShape)
{
SdrObject *const pSdrObject = pSvxShape->GetSdrObject();
@@ -150,7 +150,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
return;
}
- SwXShape *const
pShape(::sw::UnoTunnelGetImplementation<SwXShape>(xTunnel));
+ SwXShape *const pShape(comphelper::getFromUnoTunnel<SwXShape>(xTunnel));
if (pShape)
{
uno::Reference<uno::XAggregation> const xAgg(
@@ -158,7 +158,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
if (xAgg.is())
{
SvxShape *const pSvxShape(
- ::sw::UnoTunnelGetImplementation<SvxShape>(xTunnel));
+ comphelper::getFromUnoTunnel<SvxShape>(xTunnel));
if (pSvxShape)
{
SdrObject *const pSdrObject = pSvxShape->GetSdrObject();
@@ -172,7 +172,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
}
OTextCursorHelper *const pCursor(
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xTunnel));
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xTunnel));
if (pCursor)
{
if (pCursor->GetDoc() == &rTargetDoc)
@@ -183,7 +183,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
}
SwXTextRanges* const pRanges(
- ::sw::UnoTunnelGetImplementation<SwXTextRanges>(xTunnel));
+ comphelper::getFromUnoTunnel<SwXTextRanges>(xTunnel));
if (pRanges)
{
SwUnoCursor const* pUnoCursor = pRanges->GetCursor();
@@ -197,7 +197,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
// check these before Range to prevent misinterpretation of text frames
// and cells also implement XTextRange
SwXFrame *const pFrame(
- ::sw::UnoTunnelGetImplementation<SwXFrame>(xTunnel));
+ comphelper::getFromUnoTunnel<SwXFrame>(xTunnel));
if (pFrame)
{
const SwFrameFormat *const pFrameFormat(pFrame->GetFrameFormat());
@@ -209,7 +209,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
}
SwXTextTable *const pTextTable(
- ::sw::UnoTunnelGetImplementation<SwXTextTable>(xTunnel));
+ comphelper::getFromUnoTunnel<SwXTextTable>(xTunnel));
if (pTextTable)
{
SwFrameFormat *const pFrameFormat(pTextTable->GetFrameFormat());
@@ -221,7 +221,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
}
SwXCell *const pCell(
- ::sw::UnoTunnelGetImplementation<SwXCell>(xTunnel));
+ comphelper::getFromUnoTunnel<SwXCell>(xTunnel));
if (pCell)
{
SwFrameFormat *const pFrameFormat(pCell->GetFrameFormat());
@@ -254,7 +254,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface>
const& xIfc,
}
SwXCellRange *const pCellRange(
- ::sw::UnoTunnelGetImplementation<SwXCellRange>(xTunnel));
+ comphelper::getFromUnoTunnel<SwXCellRange>(xTunnel));
if (pCellRange)
{
SwUnoCursor const*const pUnoCursor(pCellRange->GetTableCursor());
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index fec80e3e7c13..6e3e86f8f651 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -468,7 +468,7 @@ const uno::Sequence< sal_Int8 > &
SwXFieldMaster::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXFieldMaster::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXFieldMaster>(rId, this);
+ return comphelper::getSomethingImpl<SwXFieldMaster>(rId, this);
}
OUString SAL_CALL
@@ -1180,7 +1180,7 @@ const uno::Sequence< sal_Int8 > &
SwXTextField::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXTextField::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXTextField>(rId, this);
+ return comphelper::getSomethingImpl<SwXTextField>(rId, this);
}
SwXTextField::SwXTextField(
diff --git a/sw/source/core/unocore/unoflatpara.cxx
b/sw/source/core/unocore/unoflatpara.cxx
index daf57af4e417..5f49d500c305 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -323,7 +323,7 @@ sal_Int64 SAL_CALL
SwXFlatParagraph::getSomething(
const uno::Sequence< sal_Int8 >& rId)
{
- return sw::UnoTunnelImpl(rId, this);
+ return comphelper::getSomethingImpl(rId, this);
}
SwXFlatParagraphIterator::SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32
nType, bool bAutomatic )
@@ -505,7 +505,7 @@ uno::Reference< text::XFlatParagraph >
SwXFlatParagraphIterator::getParaAfter(co
const uno::Reference<lang::XUnoTunnel> xFPTunnel(xPara, uno::UNO_QUERY);
SAL_WARN_IF(!xFPTunnel.is(), "sw.core", "invalid argument");
- SwXFlatParagraph* const
pFlatParagraph(sw::UnoTunnelGetImplementation<SwXFlatParagraph>(xFPTunnel));
+ SwXFlatParagraph* const
pFlatParagraph(comphelper::getFromUnoTunnel<SwXFlatParagraph>(xFPTunnel));
if ( !pFlatParagraph )
return xRet;
@@ -551,7 +551,7 @@ uno::Reference< text::XFlatParagraph >
SwXFlatParagraphIterator::getParaBefore(c
const uno::Reference<lang::XUnoTunnel> xFPTunnel(xPara, uno::UNO_QUERY);
SAL_WARN_IF(!xFPTunnel.is(), "sw.core", "invalid argument");
- SwXFlatParagraph* const
pFlatParagraph(sw::UnoTunnelGetImplementation<SwXFlatParagraph>(xFPTunnel));
+ SwXFlatParagraph* const
pFlatParagraph(comphelper::getFromUnoTunnel<SwXFlatParagraph>(xFPTunnel));
if ( !pFlatParagraph )
return xRet;
diff --git a/sw/source/core/unocore/unoftn.cxx
b/sw/source/core/unocore/unoftn.cxx
index 2b3d686b8de7..f56fd117c395 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -175,7 +175,7 @@ const uno::Sequence< sal_Int8 > &
SwXFootnote::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXFootnote>(rId, this) );
+ const sal_Int64 nRet( comphelper::getSomethingImpl<SwXFootnote>(rId, this)
);
return nRet ? nRet : SwXText::getSomething(rId);
}
@@ -297,9 +297,9 @@ SwXFootnote::attach(const uno::Reference< text::XTextRange
> & xTextRange)
const uno::Reference<lang::XUnoTunnel> xRangeTunnel(
xTextRange, uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
SwDoc *const pNewDoc =
pRange ? &pRange->GetDoc() : (pCursor ? pCursor->GetDoc() : nullptr);
if (!pNewDoc)
diff --git a/sw/source/core/unocore/unoidx.cxx
b/sw/source/core/unocore/unoidx.cxx
index ce461692d85a..8582726eafa5 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -434,7 +434,7 @@ const uno::Sequence< sal_Int8 > &
SwXDocumentIndex::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXDocumentIndex::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXDocumentIndex>(rId, this);
+ return comphelper::getSomethingImpl<SwXDocumentIndex>(rId, this);
}
OUString SAL_CALL
@@ -1301,9 +1301,9 @@ SwXDocumentIndex::attach(const uno::Reference<
text::XTextRange > & xTextRange)
}
const uno::Reference<XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
SwDoc *const pDoc =
pRange ? &pRange->GetDoc() : (pCursor ? pCursor->GetDoc() : nullptr);
@@ -1663,7 +1663,7 @@ const uno::Sequence< sal_Int8 > &
SwXDocumentIndexMark::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXDocumentIndexMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXDocumentIndexMark>(rId, this);
+ return comphelper::getSomethingImpl<SwXDocumentIndexMark>(rId, this);
}
OUString SAL_CALL
@@ -1771,9 +1771,9 @@ SwXDocumentIndexMark::attach(
const uno::Reference<XUnoTunnel> xRangeTunnel(xTextRange, uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
SwDoc *const pDoc =
pRange ? &pRange->GetDoc() : (pCursor ? pCursor->GetDoc() : nullptr);
if (!pDoc)
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 1f6eaf7d33d4..f964d386ccd8 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -856,7 +856,7 @@ const uno::Sequence< sal_Int8 > &
SwXTextCursor::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXTextCursor::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXTextCursor>(rId, this) );
+ const sal_Int64 nRet( comphelper::getSomethingImpl<SwXTextCursor>(rId,
this) );
return nRet ? nRet : OTextCursorHelper::getSomething(rId);
}
@@ -1044,9 +1044,9 @@ SwXTextCursor::gotoRange(
OTextCursorHelper* pCursor = nullptr;
if(xRangeTunnel.is())
{
- pRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ pRange = comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
}
if (!pRange && !pCursor)
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 1dff3dfe1e2a..b9bd6dc9cd10 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -912,7 +912,7 @@ const uno::Sequence< sal_Int8 > &
SwXTextRange::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXTextRange::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXTextRange>(rId, this);
+ return comphelper::getSomethingImpl<SwXTextRange>(rId, this);
}
OUString SAL_CALL
@@ -1119,13 +1119,13 @@ bool XTextRangeToSwPaM( SwUnoInternalPaM & rToFill,
SwXHeadFootText* pHeadText = nullptr;
if(xRangeTunnel.is())
{
- pRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ pRange = comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
pPortion=
- ::sw::UnoTunnelGetImplementation<SwXTextPortion>(xRangeTunnel);
- pText = ::sw::UnoTunnelGetImplementation<SwXText>(xRangeTunnel);
- pPara = ::sw::UnoTunnelGetImplementation<SwXParagraph>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextPortion>(xRangeTunnel);
+ pText = comphelper::getFromUnoTunnel<SwXText>(xRangeTunnel);
+ pPara = comphelper::getFromUnoTunnel<SwXParagraph>(xRangeTunnel);
if (eMode == TextRangeMode::AllowTableNode)
pHeadText = dynamic_cast<SwXHeadFootText*>(pText);
}
@@ -1640,7 +1640,7 @@ const uno::Sequence< sal_Int8 > &
SwXTextRanges::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXTextRanges>(rId, this);
+ return comphelper::getSomethingImpl<SwXTextRanges>(rId, this);
}
/*
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index 99132a6fd949..9f74a4f7daa1 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -294,7 +294,7 @@ const uno::Sequence< sal_Int8 > &
SwXParagraph::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXParagraph::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXParagraph>(rId, this);
+ return comphelper::getSomethingImpl<SwXParagraph>(rId, this);
}
OUString SAL_CALL
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index c5afac478431..3b6ec7c0049f 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -158,7 +158,7 @@ const uno::Sequence< sal_Int8 > &
SwXReferenceMark::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXReferenceMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXReferenceMark>(rId, this);
+ return comphelper::getSomethingImpl<SwXReferenceMark>(rId, this);
}
OUString SAL_CALL SwXReferenceMark::getImplementationName()
@@ -279,9 +279,9 @@ SwXReferenceMark::attach(const uno::Reference<
text::XTextRange > & xTextRange)
OTextCursorHelper* pCursor = nullptr;
if(xRangeTunnel.is())
{
- pRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ pRange = comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
}
SwDoc *const pDocument =
pRange ? &pRange->GetDoc() : (pCursor ? pCursor->GetDoc() : nullptr);
@@ -850,7 +850,7 @@ const uno::Sequence< sal_Int8 > & SwXMeta::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXMeta::getSomething( const uno::Sequence< sal_Int8 > & i_rId )
{
- return ::sw::UnoTunnelImpl<SwXMeta>(i_rId, this);
+ return comphelper::getSomethingImpl<SwXMeta>(i_rId, this);
}
// XServiceInfo
@@ -950,9 +950,9 @@ SwXMeta::AttachImpl(const uno::Reference< text::XTextRange
> & i_xTextRange,
static_cast< ::cppu::OWeakObject* >(this), 0);
}
SwXTextRange *const pRange(
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel));
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel));
OTextCursorHelper *const pCursor( pRange ? nullptr :
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel));
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel));
if (!pRange && !pCursor)
{
throw lang::IllegalArgumentException(
diff --git a/sw/source/core/unocore/unosect.cxx
b/sw/source/core/unocore/unosect.cxx
index 4cbf679158c7..599089da5604 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -236,7 +236,7 @@ const uno::Sequence< sal_Int8 > &
SwXTextSection::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXTextSection::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXTextSection>(rId, this);
+ return comphelper::getSomethingImpl<SwXTextSection>(rId, this);
}
uno::Reference< text::XTextSection > SAL_CALL
@@ -286,9 +286,9 @@ SwXTextSection::attach(const uno::Reference<
text::XTextRange > & xTextRange)
OTextCursorHelper* pCursor = nullptr;
if(xRangeTunnel.is())
{
- pRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ pRange = comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
}
SwDoc *const pDoc =
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 57630ebc5388..9062b949dd3d 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -298,9 +298,9 @@ SwXText::insertString(const uno::Reference<
text::XTextRange >& xTextRange,
const uno::Reference<lang::XUnoTunnel> xRangeTunnel(xTextRange,
uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
if ((!pRange || &pRange ->GetDoc() != GetDoc()) &&
(!pCursor || pCursor->GetDoc() != GetDoc()))
{
@@ -436,9 +436,9 @@ SwXText::insertControlCharacter(
const uno::Reference<lang::XUnoTunnel> xRangeTunnel(
xTextRange, uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(
xRangeTunnel);
if (pRange)
{
@@ -469,9 +469,9 @@ SwXText::insertControlCharacter(
const uno::Reference<lang::XUnoTunnel> xRangeTunnel(
xTextRange, uno::UNO_QUERY);
SwXTextRange *const pRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xRangeTunnel);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xRangeTunnel);
SwCursor aCursor(*aPam.GetPoint(), nullptr);
SwUnoCursorHelper::SelectPam(aCursor, true);
@@ -584,17 +584,17 @@ SwXText::insertTextContent(
throw aArgException;
}
SwXDocumentIndexMark *const pDocumentIndexMark =
- ::sw::UnoTunnelGetImplementation<SwXDocumentIndexMark>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXDocumentIndexMark>(xContentTunnel);
SwXTextSection *const pSection =
- ::sw::UnoTunnelGetImplementation<SwXTextSection>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXTextSection>(xContentTunnel);
SwXBookmark *const pBookmark =
- ::sw::UnoTunnelGetImplementation<SwXBookmark>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXBookmark>(xContentTunnel);
SwXReferenceMark *const pReferenceMark =
- ::sw::UnoTunnelGetImplementation<SwXReferenceMark>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXReferenceMark>(xContentTunnel);
SwXMeta *const pMeta =
- ::sw::UnoTunnelGetImplementation<SwXMeta>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXMeta>(xContentTunnel);
SwXTextField* pTextField =
- ::sw::UnoTunnelGetImplementation<SwXTextField>(xContentTunnel);
+ comphelper::getFromUnoTunnel<SwXTextField>(xContentTunnel);
if (pTextField && pTextField->GetServiceId() !=
SwServiceType::FieldTypeAnnotation)
pTextField = nullptr;
@@ -640,9 +640,9 @@ SwXText::insertTextContentBefore(
const uno::Reference<lang::XUnoTunnel> xSuccTunnel(xSuccessor,
uno::UNO_QUERY);
SwXTextSection *const pXSection =
- ::sw::UnoTunnelGetImplementation<SwXTextSection>(xSuccTunnel);
+ comphelper::getFromUnoTunnel<SwXTextSection>(xSuccTunnel);
SwXTextTable *const pXTable =
- ::sw::UnoTunnelGetImplementation<SwXTextTable>(xSuccTunnel);
+ comphelper::getFromUnoTunnel<SwXTextTable>(xSuccTunnel);
SwFrameFormat *const pTableFormat = pXTable ? pXTable->GetFrameFormat() :
nullptr;
SwTextNode * pTextNode = nullptr;
if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
@@ -695,9 +695,9 @@ SwXText::insertTextContentAfter(
const uno::Reference<lang::XUnoTunnel> xPredTunnel(xPredecessor,
uno::UNO_QUERY);
SwXTextSection *const pXSection =
- ::sw::UnoTunnelGetImplementation<SwXTextSection>(xPredTunnel);
+ comphelper::getFromUnoTunnel<SwXTextSection>(xPredTunnel);
SwXTextTable *const pXTable =
- ::sw::UnoTunnelGetImplementation<SwXTextTable>(xPredTunnel);
+ comphelper::getFromUnoTunnel<SwXTextTable>(xPredTunnel);
SwFrameFormat *const pTableFormat = pXTable ? pXTable->GetFrameFormat() :
nullptr;
bool bRet = false;
SwTextNode * pTextNode = nullptr;
@@ -745,9 +745,9 @@ SwXText::removeTextContentBefore(
const uno::Reference<lang::XUnoTunnel> xSuccTunnel(xSuccessor,
uno::UNO_QUERY);
SwXTextSection *const pXSection =
- ::sw::UnoTunnelGetImplementation<SwXTextSection>(xSuccTunnel);
+ comphelper::getFromUnoTunnel<SwXTextSection>(xSuccTunnel);
SwXTextTable *const pXTable =
- ::sw::UnoTunnelGetImplementation<SwXTextTable>(xSuccTunnel);
+ comphelper::getFromUnoTunnel<SwXTextTable>(xSuccTunnel);
SwFrameFormat *const pTableFormat = pXTable ? pXTable->GetFrameFormat() :
nullptr;
if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
{
@@ -797,9 +797,9 @@ SwXText::removeTextContentAfter(
const uno::Reference<lang::XUnoTunnel> xPredTunnel(xPredecessor,
uno::UNO_QUERY);
SwXTextSection *const pXSection =
- ::sw::UnoTunnelGetImplementation<SwXTextSection>(xPredTunnel);
+ comphelper::getFromUnoTunnel<SwXTextSection>(xPredTunnel);
SwXTextTable *const pXTable =
- ::sw::UnoTunnelGetImplementation<SwXTextTable>(xPredTunnel);
+ comphelper::getFromUnoTunnel<SwXTextTable>(xPredTunnel);
SwFrameFormat *const pTableFormat = pXTable ? pXTable->GetFrameFormat() :
nullptr;
if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
{
@@ -1207,7 +1207,7 @@ const uno::Sequence< sal_Int8 > &
SwXText::getUnoTunnelId()
sal_Int64 SAL_CALL
SwXText::getSomething(const uno::Sequence< sal_Int8 >& rId)
{
- return ::sw::UnoTunnelImpl<SwXText>(rId, this);
+ return comphelper::getSomethingImpl<SwXText>(rId, this);
}
uno::Reference< text::XTextRange > SAL_CALL
@@ -1362,7 +1362,7 @@ SwXText::insertTextPortion(
const uno::Reference< lang::XUnoTunnel > xRangeTunnel(
xTextCursor, uno::UNO_QUERY_THROW );
SwXTextCursor *const pTextCursor =
- ::sw::UnoTunnelGetImplementation<SwXTextCursor>(xRangeTunnel);
+ comphelper::getFromUnoTunnel<SwXTextCursor>(xRangeTunnel);
bool bIllegalException = false;
bool bRuntimeException = false;
@@ -2256,7 +2256,7 @@ SwXText::copyText(
uno::Reference<lang::XUnoTunnel> const xSourceTunnel(xSource,
uno::UNO_QUERY);
SwXText const*const pSource( xSourceTunnel.is()
- ? ::sw::UnoTunnelGetImplementation<SwXText>(xSourceTunnel)
+ ? comphelper::getFromUnoTunnel<SwXText>(xSourceTunnel)
: nullptr);
uno::Reference< text::XText > const xText(xSource, uno::UNO_QUERY_THROW);
@@ -2268,7 +2268,7 @@ SwXText::copyText(
uno::UNO_QUERY_THROW);
OTextCursorHelper *const pCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xCursorTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xCursorTunnel);
if (!pCursor)
{
throw uno::RuntimeException();
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index c55d5c5667a5..73d24dd77b2f 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -59,7 +59,7 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor>
const & rCursor )
Reference<XUnoTunnel> xTunnel( rCursor, UNO_QUERY);
OSL_ENSURE(xTunnel.is(), "missing XUnoTunnel for XTextCursor");
OTextCursorHelper *const pXCursor =
- ::sw::UnoTunnelGetImplementation<OTextCursorHelper>(xTunnel);
+ comphelper::getFromUnoTunnel<OTextCursorHelper>(xTunnel);
OSL_ENSURE( pXCursor, "OTextCursorHelper missing" );
return pXCursor ? pXCursor->GetDoc() : nullptr;
}
@@ -69,7 +69,7 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange>
const & rRange )
Reference<XUnoTunnel> xTunnel(rRange, UNO_QUERY);
OSL_ENSURE(xTunnel.is(), "missing XUnoTunnel for XTextRange");
SwXTextRange *const pXRange =
- ::sw::UnoTunnelGetImplementation<SwXTextRange>(xTunnel);
+ comphelper::getFromUnoTunnel<SwXTextRange>(xTunnel);
// #i115174#: this may be a SvxUnoTextRange
// OSL_ENSURE( pXRange, "SwXTextRange missing" );
return pXRange ? &pXRange->GetDoc() : nullptr;
commit 05bc93db2de56000f65764d7e394d03747cac23d
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Sep 14 08:19:47 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Sep 15 06:07:36 2021 +0200
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.kagan...@collabora.com>
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index cf3bf77169e7..61c837697576 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -142,7 +142,7 @@ namespace
sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence<
sal_Int8 >& _rId )
{
- if (isUnoTunnelId<OToolBoxWindowItem>(_rId))
+ if (comphelper::isUnoTunnelId<OToolBoxWindowItem>(_rId))
return reinterpret_cast< sal_Int64>( this );
return 0;
@@ -301,7 +301,7 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem(
ToolBoxItemsMap::iterator co
NotifyAccessibleEvent( AccessibleEventId::CHILD, Any( xItemAcc ),
Any() );
}
- auto pWindowItem =
comphelper::getUnoTunnelImplementation<OToolBoxWindowItem>(xItemAcc);
+ auto pWindowItem =
comphelper::getFromUnoTunnel<OToolBoxWindowItem>(xItemAcc);
if ( !pWindowItem )
{
static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get()
)->ReleaseToolBox();
@@ -333,7 +333,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl(
ToolBox::ImplToolItems::size_type _
{
Reference< XAccessible > xItemAcc( aIndexAdjust->second );
- auto pWindowItem =
comphelper::getUnoTunnelImplementation<OToolBoxWindowItem>(xItemAcc);
+ auto pWindowItem =
comphelper::getFromUnoTunnel<OToolBoxWindowItem>(xItemAcc);
if ( !pWindowItem )
{
VCLXAccessibleToolBoxItem* pItem = static_cast<
VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 425c1c8a6f7a..4f365409c3fc 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2090,7 +2090,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const
Reference< XChangesLis
// XUnoTunnel
::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8
>& rId )
{
- if( isUnoTunnelId<AnimationNode>(rId) )
+ if( comphelper::isUnoTunnelId<AnimationNode>(rId) )
{
return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr
>(this));
@@ -2103,7 +2103,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const
Reference< XChangesLis
const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
{
- static const UnoTunnelIdInit theAnimationNodeUnoTunnelId;
+ static const comphelper::UnoIdInit theAnimationNodeUnoTunnelId;
return theAnimationNodeUnoTunnelId.getSeq();
}
diff --git a/basctl/source/basicide/basicrenderable.cxx
b/basctl/source/basicide/basicrenderable.cxx
index 12bb90610877..79e381399703 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -88,7 +88,7 @@ VclPtr< Printer > Renderable::getPrinter() const
if( aValue >>= xRenderDevice )
{
- VCLXDevice* pDevice =
comphelper::getUnoTunnelImplementation<VCLXDevice>(xRenderDevice);
+ VCLXDevice* pDevice =
comphelper::getFromUnoTunnel<VCLXDevice>(xRenderDevice);
VclPtr< OutputDevice > pOut = pDevice ? pDevice->GetOutputDevice() :
VclPtr< OutputDevice >();
pPrinter = dynamic_cast<Printer*>(pOut.get());
}
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 8b539d9dc644..a4c1a4befa2b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -631,7 +631,7 @@ Reference< XAccessible > SAL_CALL
AccessibleBase::getAccessibleAtPoint( const aw
awt::Rectangle SAL_CALL AccessibleBase::getBounds()
{
ExplicitValueProvider *pExplicitValueProvider(
- comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(
m_aAccInfo.m_xView ));
+ comphelper::getFromUnoTunnel<ExplicitValueProvider>(
m_aAccInfo.m_xView ));
if( pExplicitValueProvider )
{
VclPtr<vcl::Window> pWindow( VCLUnoHelper::GetWindow(
m_aAccInfo.m_xWindow ));
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx
b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 0738f52abc36..6ea9befe8009 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -299,7 +299,7 @@ void SAL_CALL AccessibleChartView::initialize( const
Sequence< Any >& rArguments
Reference< chart2::XChartDocument > xChartDoc( xChartModel,
uno::UNO_QUERY );
if( xChartDoc.is())
m_spObjectHierarchy =
- std::make_shared<ObjectHierarchy>( xChartDoc,
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView) );
+ std::make_shared<ObjectHierarchy>( xChartDoc,
comphelper::getFromUnoTunnel<ExplicitValueProvider>(m_xChartView) );
else
m_spObjectHierarchy.reset();
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 898e4676c763..aef26f4a483a 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1043,7 +1043,7 @@ namespace {
uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const
uno::Reference<uno::XInterface>& xChartView)
{
- auto pProvider =
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(xChartView);
+ auto pProvider =
comphelper::getFromUnoTunnel<ExplicitValueProvider>(xChartView);
if( pProvider )
return pProvider->getDrawModelWrapper()->getShapeFactory();
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index a7aeb35d72d6..f06ff56559fa 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -70,7 +70,7 @@ double
InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
{
double fStepWidth = 0.001;
- ExplicitValueProvider* pExplicitValueProvider(
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(xChartView) );
+ ExplicitValueProvider* pExplicitValueProvider(
comphelper::getFromUnoTunnel<ExplicitValueProvider>(xChartView) );
if( pExplicitValueProvider )
{
Reference< XAxis > xAxis;
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 8f6b0644e6e3..5ae751ad96b0 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1485,7 +1485,7 @@ DrawModelWrapper* ChartController::GetDrawModelWrapper()
{
if( !m_pDrawModelWrapper )
{
- ExplicitValueProvider* pProvider =
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView );
+ ExplicitValueProvider* pProvider =
comphelper::getFromUnoTunnel<ExplicitValueProvider>( m_xChartView );
if( pProvider )
m_pDrawModelWrapper = pProvider->getDrawModelWrapper();
if ( m_pDrawModelWrapper )
diff --git a/chart2/source/controller/main/ChartController_Position.cxx
b/chart2/source/controller/main/ChartController_Position.cxx
index c6af3878bdd7..4b9479c78dab 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -177,7 +177,7 @@ void ChartController::executeDispatch_PositionAndSize(const
::css::uno::Sequence
if(pOutItemSet || pArgs)
{
awt::Rectangle aOldObjectRect;
- ExplicitValueProvider*
pProvider(comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(
m_xChartView ));
+ ExplicitValueProvider*
pProvider(comphelper::getFromUnoTunnel<ExplicitValueProvider>( m_xChartView ));
if( pProvider )
aOldObjectRect = pProvider->getRectangleOfObject(aCID);
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index e7a35fef3410..57eadfb63ca9 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -733,7 +733,7 @@ bool
ChartController::executeDlg_ObjectProperties_withoutUndoGuard(
std::unique_ptr<wrapper::ItemConverter> pItemConverter(
createItemConverter( rObjectCID, getModel(), m_xCC,
m_pDrawModelWrapper->getSdrModel(),
-
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView),
+
comphelper::getFromUnoTunnel<ExplicitValueProvider>(m_xChartView),
pRefSizeProv.get()));
if (!pItemConverter)
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 73b7ad46a9d9..1d58ddc70b40 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1301,7 +1301,7 @@ void ChartController::execute_Command( const
CommandEvent& rCEvt )
}
}
- Menu* pPopupMenu =
comphelper::getUnoTunnelImplementation<VCLXMenu>(xPopupMenu)->GetMenu();
+ Menu* pPopupMenu =
comphelper::getFromUnoTunnel<VCLXMenu>(xPopupMenu)->GetMenu();
boost::property_tree::ptree aMenu =
SfxDispatcher::fillPopupMenu(pPopupMenu);
boost::property_tree::ptree aRoot;
aRoot.add_child("menu", aMenu);
@@ -1382,7 +1382,7 @@ bool ChartController::execute_KeyInput( const KeyEvent&
rKEvt )
{
// Navigation (Tab/F3/Home/End)
uno::Reference< XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY
);
- ObjectKeyNavigation aObjNav( m_aSelection.getSelectedOID(), xChartDoc,
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ));
+ ObjectKeyNavigation aObjNav( m_aSelection.getSelectedOID(), xChartDoc,
comphelper::getFromUnoTunnel<ExplicitValueProvider>( m_xChartView ));
awt::KeyEvent aKeyEvent( ::svt::AcceleratorExecute::st_VCLKey2AWTKey(
aKeyCode ));
bReturn = aObjNav.handleKeyEvent( aKeyEvent );
if( bReturn )
@@ -1649,7 +1649,7 @@ bool ChartController::requestQuickHelp(
// set rectangle
ExplicitValueProvider * pValueProvider(
- comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(
m_xChartView ));
+ comphelper::getFromUnoTunnel<ExplicitValueProvider>( m_xChartView
));
if( pValueProvider )
rOutEqualRect = pValueProvider->getRectangleOfObject( aCID, true );
}
@@ -1804,7 +1804,7 @@ bool ChartController::impl_moveOrResizeObject(
( aRefSize.Width > 0 && aRefSize.Height > 0 ) )
{
ExplicitValueProvider * pValueProvider(
- comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(
m_xChartView ));
+ comphelper::getFromUnoTunnel<ExplicitValueProvider>(
m_xChartView ));
if( pValueProvider )
{
awt::Rectangle aRect( pValueProvider->getRectangleOfObject(
rCID ));
diff --git a/chart2/source/controller/uitest/uiobject.cxx
b/chart2/source/controller/uitest/uiobject.cxx
index 651c407565d7..45915a62e554 100644
--- a/chart2/source/controller/uitest/uiobject.cxx
+++ b/chart2/source/controller/uitest/uiobject.cxx
@@ -175,7 +175,7 @@ std::set<OUString> ChartWindowUIObject::get_children() const
css::uno::Reference< css::chart2::XChartDocument > xChartDoc(
pController->getModel(), css::uno::UNO_QUERY );
css::uno::Reference<css::uno::XInterface> xChartView =
pController->getChartView();
- chart::ExplicitValueProvider* pValueProvider =
comphelper::getUnoTunnelImplementation<chart::ExplicitValueProvider>(
xChartView );
+ chart::ExplicitValueProvider* pValueProvider =
comphelper::getFromUnoTunnel<chart::ExplicitValueProvider>( xChartView );
chart::ObjectHierarchy aHierarchy(xChartDoc, pValueProvider);
chart::ObjectIdentifier aIdentifier =
chart::ObjectHierarchy::getRootNodeOID();
aChildren.insert(aIdentifier.getObjectCID());
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index 9960f84c00b1..c5bf2167184d 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1210,7 +1210,7 @@ Reference< util::XNumberFormatsSupplier > const &
ChartModel::getNumberFormatsSu
// ____ XUnoTunnel ___
::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >&
aIdentifier )
{
- if( isUnoTunnelId<SvNumberFormatsSupplierObj>(aIdentifier) )
+ if( comphelper::isUnoTunnelId<SvNumberFormatsSupplierObj>(aIdentifier) )
{
Reference< lang::XUnoTunnel > xTunnel( getNumberFormatsSupplier(),
uno::UNO_QUERY );
if( xTunnel.is() )
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx
b/chart2/source/tools/NumberFormatterWrapper.cxx
index e6bc55d0556f..f5bef49d19de 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -57,7 +57,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const
uno::Reference< util::XNum
OUString sNullDate( "NullDate" );
if ( xProp.is() &&
xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) )
m_aNullDate = xProp->getPropertyValue(sNullDate);
- SvNumberFormatsSupplierObj* pSupplierObj =
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( xSupplier );
+ SvNumberFormatsSupplierObj* pSupplierObj =
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier );
if( pSupplierObj )
m_pNumberFormatter = pSupplierObj->GetNumberFormatter();
SAL_WARN_IF(!m_pNumberFormatter,"chart2.tools","need a numberformatter");
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index e2b983d7d63a..17295029e26d 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -377,7 +377,7 @@ static bool lcl_hasWordBreak( const
Reference<drawing::XShape>& xShape )
if (!xShape.is())
return false;
- SvxShape* pShape =
comphelper::getUnoTunnelImplementation<SvxShape>(xShape);
+ SvxShape* pShape = comphelper::getFromUnoTunnel<SvxShape>(xShape);
SvxShapeText* pShapeText = dynamic_cast<SvxShapeText*>(pShape);
if (!pShapeText)
return false;
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index c9ef9f953bb6..499bb55c1504 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1033,7 +1033,7 @@ struct CreateShapeParam2D
const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
{
- static const UnoTunnelIdInit theExplicitValueProviderUnoTunnelId;
+ static const comphelper::UnoIdInit theExplicitValueProviderUnoTunnelId;
return theExplicitValueProviderUnoTunnelId.getSeq();
}
@@ -1204,7 +1204,7 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const
datatransfer::DataFlav
// ____ XUnoTunnel ___
::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8
>& aIdentifier )
{
- if( isUnoTunnelId<ExplicitValueProvider>(aIdentifier) )
+ if( comphelper::isUnoTunnelId<ExplicitValueProvider>(aIdentifier) )
{
ExplicitValueProvider* pProvider = this;
return reinterpret_cast<sal_Int64>(pProvider);
@@ -1736,7 +1736,7 @@ bool ChartView::getExplicitValuesForAxis(
SdrPage* ChartView::getSdrPage()
{
- auto pSvxDrawPage =
comphelper::getUnoTunnelImplementation<SvxDrawPage>(m_xDrawPage);
+ auto pSvxDrawPage = comphelper::getFromUnoTunnel<SvxDrawPage>(m_xDrawPage);
if(pSvxDrawPage)
return pSvxDrawPage->GetSdrPage();
@@ -1898,7 +1898,7 @@ awt::Rectangle
ExplicitValueProvider::AddSubtractAxisTitleSizes(
uno::Reference< chart2::XTitle > xSecondTitle_Width(
TitleHelper::getTitle( TitleHelper::SECONDARY_Y_AXIS_TITLE, rModel ) );
if( xTitle_Height.is() || xTitle_Width.is() || xSecondTitle_Height.is() ||
xSecondTitle_Width.is() )
{
- ExplicitValueProvider* pExplicitValueProvider =
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(xChartView);
+ ExplicitValueProvider* pExplicitValueProvider =
comphelper::getFromUnoTunnel<ExplicitValueProvider>(xChartView);
if( pExplicitValueProvider )
{
//detect whether x axis points into x direction or not
diff --git a/comphelper/source/misc/accimplaccess.cxx
b/comphelper/source/misc/accimplaccess.cxx
index 49304aad3270..b3d4a372d2b2 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -49,7 +49,7 @@ namespace comphelper
sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const
Sequence< sal_Int8 >& _rIdentifier )
{
- if (isUnoTunnelId<OAccessibleImplementationAccess>(_rIdentifier))
+ if
(comphelper::isUnoTunnelId<OAccessibleImplementationAccess>(_rIdentifier))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index ecaae9f522e5..221a98e24f67 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -57,7 +57,7 @@ namespace configmgr {
css::uno::Sequence< sal_Int8 > const & ChildAccess::getTunnelId()
{
- static const UnoTunnelIdInit theChildAccessUnoTunnelId;
+ static const comphelper::UnoIdInit theChildAccessUnoTunnelId;
return theChildAccessUnoTunnelId.getSeq();
}
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx
b/connectivity/source/commontools/ConnectionWrapper.cxx
index d7d999058a24..eb08aa4fe82c 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -154,7 +154,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( )
// css::lang::XUnoTunnel
sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8
>& rId )
{
- if (isUnoTunnelId<OConnectionWrapper>(rId))
+ if (comphelper::isUnoTunnelId<OConnectionWrapper>(rId))
return reinterpret_cast< sal_Int64 >( this );
if(m_xUnoTunnel.is())
diff --git a/connectivity/source/commontools/TConnection.cxx
b/connectivity/source/commontools/TConnection.cxx
index 89ab7e9ca11d..6e7709cc2e1a 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -57,7 +57,7 @@ void OMetaConnection::disposing()
//XUnoTunnel
sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence<
sal_Int8 >& rId )
{
- return (isUnoTunnelId<OMetaConnection>(rId))
+ return (comphelper::isUnoTunnelId<OMetaConnection>(rId))
? reinterpret_cast< sal_Int64 >( this )
: sal_Int64(0);
}
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index c73e2cb245af..2f0f5ca53f2e 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -90,7 +90,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelId()
sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoColumn>(rId)
+ return comphelper::isUnoTunnelId<OAdoColumn>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OColumn_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AColumns.cxx
b/connectivity/source/drivers/ado/AColumns.cxx
index 88d10ecd9af3..6297871d5b62 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -62,7 +62,7 @@ Reference< XPropertySet > OColumns::createDescriptor()
// XAppend
sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
- rtl::Reference<OAdoColumn> pColumn =
getUnoTunnelImplementation<OAdoColumn>( descriptor );
+ rtl::Reference<OAdoColumn> pColumn = getFromUnoTunnel<OAdoColumn>(
descriptor );
Reference< XPropertySet > xColumn;
if ( !pColumn.is() )
{
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index 664990f66564..0669955356bf 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -490,7 +490,7 @@ void OConnection::disposing()
sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence<
sal_Int8 >& rId )
{
- return isUnoTunnelId<OConnection>(rId)
+ return comphelper::isUnoTunnelId<OConnection>(rId)
?
reinterpret_cast< sal_Int64 >( this )
:
diff --git a/connectivity/source/drivers/ado/AGroup.cxx
b/connectivity/source/drivers/ado/AGroup.cxx
index b41fbdbba05d..3a5a736431c0 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -93,7 +93,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelId()
sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoGroup>(rId)
+ return comphelper::isUnoTunnelId<OAdoGroup>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OGroup_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AGroups.cxx
b/connectivity/source/drivers/ado/AGroups.cxx
index 211f34f6bebe..e3fb165b0a34 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -58,7 +58,7 @@ Reference< XPropertySet > OGroups::createDescriptor()
// XAppend
sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
- OAdoGroup* pGroup = getUnoTunnelImplementation<OAdoGroup>(descriptor);
+ OAdoGroup* pGroup = getFromUnoTunnel<OAdoGroup>(descriptor);
if ( pGroup == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_GROUP_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/ado/AIndex.cxx
b/connectivity/source/drivers/ado/AIndex.cxx
index 61a047bc9b00..3445ab78a240 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -82,7 +82,7 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelId()
sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoIndex>(rId)
+ return comphelper::isUnoTunnelId<OAdoIndex>(rId)
? reinterpret_cast< sal_Int64 >( this )
: sdbcx::OIndex::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx
b/connectivity/source/drivers/ado/AIndexes.cxx
index 616cd863ada4..c2cdb76081d2 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -58,7 +58,7 @@ Reference< XPropertySet > OIndexes::createDescriptor()
// XAppend
sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
- OAdoIndex* pIndex = getUnoTunnelImplementation<OAdoIndex>(descriptor);
+ OAdoIndex* pIndex = getFromUnoTunnel<OAdoIndex>(descriptor);
if ( pIndex == nullptr )
m_pConnection->throwGenericSQLException(
STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/ado/AKey.cxx
b/connectivity/source/drivers/ado/AKey.cxx
index 764765b35620..6c3db4537e85 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -78,7 +78,7 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelId()
sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoKey>(rId)
+ return comphelper::isUnoTunnelId<OAdoKey>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OKey_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AKeys.cxx
b/connectivity/source/drivers/ado/AKeys.cxx
index 0d921c39842b..a18d91709455 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -58,7 +58,7 @@ Reference< XPropertySet > OKeys::createDescriptor()
// XAppend
sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
- OAdoKey* pKey = getUnoTunnelImplementation<OAdoKey>( descriptor );
+ OAdoKey* pKey = getFromUnoTunnel<OAdoKey>( descriptor );
if ( pKey == nullptr)
m_pConnection->throwGenericSQLException(
STR_INVALID_KEY_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/ado/ATable.cxx
b/connectivity/source/drivers/ado/ATable.cxx
index 92f28ce56a06..6b2175a46b29 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -139,7 +139,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelId()
sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoTable>(rId)
+ return comphelper::isUnoTunnelId<OAdoTable>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
@@ -168,7 +168,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString&
colName, const Refer
checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
bool bError = true;
- OAdoColumn* pColumn =
comphelper::getUnoTunnelImplementation<OAdoColumn>(descriptor);
+ OAdoColumn* pColumn = comphelper::getFromUnoTunnel<OAdoColumn>(descriptor);
if(pColumn != nullptr)
{
WpADOColumns aColumns = m_aTable.get_Columns();
diff --git a/connectivity/source/drivers/ado/ATables.cxx
b/connectivity/source/drivers/ado/ATables.cxx
index 9ce87634e425..b8f6fb9d2c72 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -65,7 +65,7 @@ Reference< XPropertySet > OTables::createDescriptor()
// XAppend
sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
- OAdoTable* pTable = getUnoTunnelImplementation<OAdoTable>( descriptor );
+ OAdoTable* pTable = getFromUnoTunnel<OAdoTable>( descriptor );
if ( pTable == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_TABLE_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/ado/AUser.cxx
b/connectivity/source/drivers/ado/AUser.cxx
index 724334cea696..4d86ce97d63f 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -77,7 +77,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelId()
sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoUser>(rId)
+ return comphelper::isUnoTunnelId<OAdoUser>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OUser_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AUsers.cxx
b/connectivity/source/drivers/ado/AUsers.cxx
index 2620e915a89e..9d0dab6e8d4c 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -56,7 +56,7 @@ Reference< XPropertySet > OUsers::createDescriptor()
// XAppend
sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
- OUserExtend* pUser = getUnoTunnelImplementation<OUserExtend>( descriptor );
+ OUserExtend* pUser = getFromUnoTunnel<OUserExtend>( descriptor );
if ( pUser == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_USER_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/ado/AView.cxx
b/connectivity/source/drivers/ado/AView.cxx
index b53c1a026200..5460bab249c2 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -52,7 +52,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelId()
sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OAdoView>(rId)
+ return comphelper::isUnoTunnelId<OAdoView>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OView_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AViews.cxx
b/connectivity/source/drivers/ado/AViews.cxx
index cbe239e73825..22fe40142d25 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -61,7 +61,7 @@ Reference< XPropertySet > OViews::createDescriptor()
// XAppend
sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
- OAdoView* pView = getUnoTunnelImplementation<OAdoView>( descriptor );
+ OAdoView* pView = getFromUnoTunnel<OAdoView>( descriptor );
if ( pView == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_VIEW_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
diff --git a/connectivity/source/drivers/calc/CTable.cxx
b/connectivity/source/drivers/calc/CTable.cxx
index f2c50362ab30..382142ece38e 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -621,7 +621,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelId()
sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return (isUnoTunnelId<OCalcTable>(rId))
+ return (comphelper::isUnoTunnelId<OCalcTable>(rId))
? reinterpret_cast< sal_Int64 >( this )
: OCalcTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 4bb3a0c7179a..601f1585eaef 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -294,7 +294,7 @@ Reference< XResultSet > SAL_CALL
ODbaseDatabaseMetaData::getIndexInfo(
aRow[4] = new
ORowSetValueDecorator(getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))));
aRow[6] = new ORowSetValueDecorator(*pBegin);
- auto pIndex =
comphelper::getUnoTunnelImplementation<ODbaseIndex>(xIndex);
+ auto pIndex = comphelper::getFromUnoTunnel<ODbaseIndex>(xIndex);
if(pIndex)
{
aRow[11] = new
ORowSetValueDecorator(static_cast<sal_Int32>(pIndex->getHeader().db_maxkeys));
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx
b/connectivity/source/drivers/dbase/DIndex.cxx
index 04f46be9a513..f2dce48c62b7 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -111,7 +111,7 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelId()
sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId )
{
- return (isUnoTunnelId<ODbaseIndex>(rId))
+ return (comphelper::isUnoTunnelId<ODbaseIndex>(rId))
? reinterpret_cast< sal_Int64 >( this )
: ODbaseIndex_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx
b/connectivity/source/drivers/dbase/DIndexes.cxx
index 2a4cf72fb496..d97e1187b5fd 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -107,7 +107,7 @@ sdbcx::ObjectType ODbaseIndexes::appendObject( const
OUString& _rForName, const
// XDrop
void ODbaseIndexes::dropObject(sal_Int32 _nPos, const OUString&
/*_sElementName*/)
{
- auto pIndex =
comphelper::getUnoTunnelImplementation<ODbaseIndex>(getObject(_nPos));
+ auto pIndex = comphelper::getFromUnoTunnel<ODbaseIndex>(getObject(_nPos));
if ( pIndex )
pIndex->DropImpl();
}
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx
b/connectivity/source/drivers/dbase/DResultSet.cxx
index 17cbac2e41ab..148dc145ad9e 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -155,7 +155,7 @@ Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows(
const Sequence< An
bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier>
&_xIndex)
{
- auto pIndex =
comphelper::getUnoTunnelImplementation<dbase::ODbaseIndex>(_xIndex);
+ auto pIndex = comphelper::getFromUnoTunnel<dbase::ODbaseIndex>(_xIndex);
if(pIndex)
{
std::unique_ptr<dbase::OIndexIterator> pIter =
pIndex->createIterator();
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index f597ce615b5f..a270d3ad007f 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -742,7 +742,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelId()
sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return (isUnoTunnelId<ODbaseTable>(rId))
+ return (comphelper::isUnoTunnelId<ODbaseTable>(rId))
? reinterpret_cast< sal_Int64 >( this )
: ODbaseTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/dbase/DTables.cxx
b/connectivity/source/drivers/dbase/DTables.cxx
index 74c81c62601b..266816eeb776 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -65,7 +65,7 @@ Reference< XPropertySet > ODbaseTables::createDescriptor()
// XAppend
sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
- auto pTable =
comphelper::getUnoTunnelImplementation<ODbaseTable>(descriptor);
+ auto pTable = comphelper::getFromUnoTunnel<ODbaseTable>(descriptor);
if(pTable)
{
pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(_rForName));
diff --git a/connectivity/source/drivers/file/FConnection.cxx
b/connectivity/source/drivers/file/FConnection.cxx
index 964d8ff16861..3b0dacea6f37 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -401,7 +401,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId )
{
- return (isUnoTunnelId<OConnection>(rId))
+ return (comphelper::isUnoTunnelId<OConnection>(rId))
? reinterpret_cast< sal_Int64 >( this )
: sal_Int64(0);
}
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 215c381aa8c1..c41f985d0bb0 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -393,7 +393,7 @@ Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTablePrivileges(
xNames->getByName(*pBegin), css::uno::UNO_QUERY);
if(xTable.is())
{
- auto pTable =
comphelper::getUnoTunnelImplementation<OFileTable>(xTable);
+ auto pTable =
comphelper::getFromUnoTunnel<OFileTable>(xTable);
if(pTable && !pTable->isReadOnly())
{
aRow[6] = ODatabaseMetaDataResultSet::getInsertValue();
diff --git a/connectivity/source/drivers/file/FDriver.cxx
b/connectivity/source/drivers/file/FDriver.cxx
index 9bd0692bac26..4b6d45fe7420 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -172,7 +172,7 @@ Reference< XTablesSupplier > SAL_CALL
OFileDriver::getDataDefinitionByConnection
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODriver_BASE::rBHelper.bDisposed);
- if (OConnection* pSearchConnection =
comphelper::getUnoTunnelImplementation<OConnection>(connection))
+ if (OConnection* pSearchConnection =
comphelper::getFromUnoTunnel<OConnection>(connection))
{
for (auto const& elem : m_xConnections)
{
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index 4d29f1de7a84..7c2649d8fc8f 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1391,7 +1391,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelId()
sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OResultSet>(rId)
+ return comphelper::isUnoTunnelId<OResultSet>(rId)
? reinterpret_cast< sal_Int64 >( this )
: 0;
}
diff --git a/connectivity/source/drivers/file/FTable.cxx
b/connectivity/source/drivers/file/FTable.cxx
index b47bfb811a1f..7da609bb4ae0 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -130,7 +130,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelId()
sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return isUnoTunnelId<OFileTable>(rId)
+ return comphelper::isUnoTunnelId<OFileTable>(rId)
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 040770fe0e6d..dd827eca52a7 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -382,7 +382,7 @@ Reference< XClob> Connection::createClob(ISC_QUAD const *
pBlobId)
// virtual
sal_Int64 SAL_CALL Connection::getSomething(const
css::uno::Sequence<sal_Int8>& rId)
{
- return (isUnoTunnelId<Connection>(rId)) ?
reinterpret_cast<sal_Int64>(this) : sal_Int64(0);
+ return (comphelper::isUnoTunnelId<Connection>(rId)) ?
reinterpret_cast<sal_Int64>(this) : sal_Int64(0);
}
// static
diff --git a/connectivity/source/drivers/firebird/Driver.cxx
b/connectivity/source/drivers/firebird/Driver.cxx
index fbf29293a31c..c9dc6155d0e0 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -191,7 +191,7 @@ sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( )
uno::Reference< XTablesSupplier > SAL_CALL
FirebirdDriver::getDataDefinitionByConnection(
const uno::Reference< XConnection >&
rConnection)
{
- if (Connection* pConnection =
comphelper::getUnoTunnelImplementation<Connection>(rConnection))
+ if (Connection* pConnection =
comphelper::getFromUnoTunnel<Connection>(rConnection))
return pConnection->createCatalog();
return {};
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx
b/connectivity/source/drivers/flat/ETable.cxx
index 0574130ee993..43116033add6 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -562,7 +562,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelId()
sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return (isUnoTunnelId<OFlatTable>(rId))
+ return (comphelper::isUnoTunnelId<OFlatTable>(rId))
? reinterpret_cast< sal_Int64 >( this )
: OFlatTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e4d4e399ba2a..962e574879cf 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -333,7 +333,7 @@ namespace connectivity
if ( xOrig.is() )
{
// now we have to set the URL to get the correct answer
for metadata()->getURL()
- auto pMetaConnection =
comphelper::getUnoTunnelImplementation<OMetaConnection>(xOrig);
+ auto pMetaConnection =
comphelper::getFromUnoTunnel<OMetaConnection>(xOrig);
if ( pMetaConnection )
pMetaConnection->setURL(url);
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx
b/connectivity/source/drivers/hsqldb/HTable.cxx
index 89d75fac7e3d..76d0c5b332ee 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -127,7 +127,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelId()
sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId )
{
- return (isUnoTunnelId<OHSQLTable>(rId))
+ return (comphelper::isUnoTunnelId<OHSQLTable>(rId))
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
index 0225381c74b3..ad8ce525feac 100644
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -255,8 +255,7 @@ Reference<XConnection> SAL_CALL
ODriverDelegator::connect(const OUString& url,
if (xConnection.is())
{
// now we have to set the URL to get the correct answer for
metadata()->getURL()
- auto pMetaConnection
- =
comphelper::getUnoTunnelImplementation<OMetaConnection>(xConnection);
+ auto pMetaConnection =
comphelper::getFromUnoTunnel<OMetaConnection>(xConnection);
if (pMetaConnection)
pMetaConnection->setURL(url);
m_aConnections.push_back(
@@ -321,7 +320,7 @@ ODriverDelegator::getDataDefinitionByConnection(const
Reference<XConnection>& co
checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed);
Reference<XTablesSupplier> xTab;
- auto pConnection =
comphelper::getUnoTunnelImplementation<OMetaConnection>(connection);
+ auto pConnection =
comphelper::getFromUnoTunnel<OMetaConnection>(connection);
if (pConnection)
{
TWeakPairVector::iterator i
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 26e0fde19632..22c6bfa6df6c 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -128,8 +128,8 @@ Sequence<sal_Int8> OMySQLTable::getUnoTunnelId()
sal_Int64 OMySQLTable::getSomething(const Sequence<sal_Int8>& rId)
{
- return (isUnoTunnelId<OMySQLTable>(rId)) ?
reinterpret_cast<sal_Int64>(this)
- :
OTable_TYPEDEF::getSomething(rId);
+ return (comphelper::isUnoTunnelId<OMySQLTable>(rId)) ?
reinterpret_cast<sal_Int64>(this)
+ :
OTable_TYPEDEF::getSomething(rId);
}
// XAlterTable
diff --git a/connectivity/source/drivers/writer/WTable.cxx
b/connectivity/source/drivers/writer/WTable.cxx
index 8448132556e6..a1e97ab836ed 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -220,8 +220,8 @@ uno::Sequence<sal_Int8> OWriterTable::getUnoTunnelId()
sal_Int64 OWriterTable::getSomething(const uno::Sequence<sal_Int8>& rId)
{
- return (isUnoTunnelId<OWriterTable>(rId)) ?
reinterpret_cast<sal_Int64>(this)
- :
OWriterTable_BASE::getSomething(rId);
+ return (comphelper::isUnoTunnelId<OWriterTable>(rId)) ?
reinterpret_cast<sal_Int64>(this)
+ :
OWriterTable_BASE::getSomething(rId);
}
bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols,
bool bRetrieveData)
diff --git a/connectivity/source/sdbcx/VCollection.cxx
b/connectivity/source/sdbcx/VCollection.cxx
index c7f8e0ba9ff0..0aa6c0d3c627 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -374,7 +374,7 @@ void SAL_CALL OCollection::appendByDescriptor( const
Reference< XPropertySet >&
if ( !xNewlyCreated.is() )
throw RuntimeException();
- ODescriptor* pDescriptor =
comphelper::getUnoTunnelImplementation<ODescriptor>( xNewlyCreated );
+ ODescriptor* pDescriptor = comphelper::getFromUnoTunnel<ODescriptor>(
xNewlyCreated );
if ( pDescriptor )
pDescriptor->setNew( false );
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx
b/connectivity/source/sdbcx/VDescriptor.cxx
index 8a32a1b58b39..0d70aa0b41af 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -46,7 +46,7 @@ namespace connectivity::sdbcx
// css::lang::XUnoTunnel
sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8
>& rId )
{
- return (isUnoTunnelId<ODescriptor>(rId))
+ return (comphelper::isUnoTunnelId<ODescriptor>(rId))
? reinterpret_cast< sal_Int64 >( this )
: 0;
}
@@ -87,7 +87,7 @@ namespace connectivity::sdbcx
bool ODescriptor::isNew( const Reference< XInterface >& _rxDescriptor )
{
- ODescriptor* pImplementation =
comphelper::getUnoTunnelImplementation<ODescriptor>( _rxDescriptor );
+ ODescriptor* pImplementation =
comphelper::getFromUnoTunnel<ODescriptor>( _rxDescriptor );
return pImplementation && pImplementation->isNew();
}
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index f7deaa0c1d5e..798783587995 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -437,7 +437,7 @@ void SAL_CALL ORowSet::release() noexcept
// css::XUnoTunnel
sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId )
{
- if (isUnoTunnelId<ORowSet>(rId))
+ if (comphelper::isUnoTunnelId<ORowSet>(rId))
return reinterpret_cast<sal_Int64>(this);
return 0;
@@ -2141,7 +2141,7 @@ void ORowSet::notifyRowSetAndClonesRowDelete( const Any&
_rBookmark )
// notify the clones
for (auto const& elem : m_aClones)
{
- auto pClone =
comphelper::getUnoTunnelImplementation<ORowSetClone>(elem.get());
+ auto pClone = comphelper::getFromUnoTunnel<ORowSetClone>(elem.get());
if(pClone)
pClone->onDeleteRow( _rBookmark );
}
@@ -2154,7 +2154,7 @@ void ORowSet::notifyRowSetAndClonesRowDeleted( const Any&
_rBookmark, sal_Int32
// notify the clones
for (auto const& clone : m_aClones)
{
- auto pClone =
comphelper::getUnoTunnelImplementation<ORowSetClone>(clone.get());
+ auto pClone = comphelper::getFromUnoTunnel<ORowSetClone>(clone.get());
if(pClone)
pClone->onDeletedRow( _rBookmark, _nPos );
}
@@ -2909,7 +2909,7 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelId()
// css::XUnoTunnel
sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId
)
{
- if (isUnoTunnelId<ORowSetClone>(rId))
+ if (comphelper::isUnoTunnelId<ORowSetClone>(rId))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/dbaccess/source/core/api/TableDeco.cxx
b/dbaccess/source/core/api/TableDeco.cxx
index 6dff0b3b0964..e4b3a07e697d 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -451,7 +451,7 @@ OUString SAL_CALL ODBTableDecorator::getName()
sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8
>& rId )
{
- if (isUnoTunnelId<ODBTableDecorator>(rId))
+ if (comphelper::isUnoTunnelId<ODBTableDecorator>(rId))
return reinterpret_cast<sal_Int64>(this);
sal_Int64 nRet = 0;
diff --git a/dbaccess/source/core/api/querydescriptor.cxx
b/dbaccess/source/core/api/querydescriptor.cxx
index 2ba824d0afbd..bd0c59c75fbf 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -140,7 +140,7 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base()
sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence<
sal_Int8 >& _rIdentifier )
{
- if (isUnoTunnelId<OQueryDescriptor_Base>(_rIdentifier))
+ if (comphelper::isUnoTunnelId<OQueryDescriptor_Base>(_rIdentifier))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/dbaccess/source/core/api/table.cxx
b/dbaccess/source/core/api/table.cxx
index 054c1de241cb..94cb5646032d 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -297,7 +297,7 @@ void SAL_CALL ODBTable::alterColumnByName( const OUString&
_rName, const Referen
sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId )
{
sal_Int64 nRet(0);
- if (isUnoTunnelId<ODBTable>(rId))
+ if (comphelper::isUnoTunnelId<ODBTable>(rId))
nRet = reinterpret_cast<sal_Int64>(this);
else
nRet = OTable_Base::getSomething(rId);
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index e08fc61b65bb..d18be06e882b 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -545,7 +545,7 @@ void OContentHelper::notifyPropertiesChange( const
Sequence< PropertyChangeEvent
// css::lang::XUnoTunnel
sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId )
{
- if (isUnoTunnelId<OContentHelper>(rId))
+ if (comphelper::isUnoTunnelId<OContentHelper>(rId))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8e17e0440abc..651dca08f674 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -709,7 +709,7 @@ void ODatabaseContext::databaseDocumentURLChange( const
OUString& _rOldURL, cons
sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >&
rId )
{
- if (isUnoTunnelId<ODatabaseContext>(rId))
+ if (comphelper::isUnoTunnelId<ODatabaseContext>(rId))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index c9ca13c41ebb..5b3772983d7c 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -526,7 +526,7 @@ void ODefinitionContainer::implAppend(const OUString&
_rName, const Reference< X
// #i44786#
lcl_ensureName( _rxNewObject, _rName );
- ::rtl::Reference< OContentHelper > pContent =
comphelper::getUnoTunnelImplementation<OContentHelper>( _rxNewObject );
+ ::rtl::Reference< OContentHelper > pContent =
comphelper::getFromUnoTunnel<OContentHelper>( _rxNewObject );
if ( pContent.is() )
{
TContentPtr pImpl = pContent->getImpl();
@@ -585,7 +585,7 @@ void ODefinitionContainer::approveNewObject(const OUString&
_sName,const Referen
DBA_RES( RID_STR_NAME_ALREADY_USED ),
*this );
- ::rtl::Reference< OContentHelper > pContent(
comphelper::getUnoTunnelImplementation<OContentHelper>( _rxObject ) );
+ ::rtl::Reference< OContentHelper > pContent(
comphelper::getFromUnoTunnel<OContentHelper>( _rxObject ) );
if ( !pContent.is() )
throw IllegalArgumentException(
DBA_RES( RID_STR_OBJECT_CONTAINER_MISMATCH ),
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 4554a1fd4dcb..cfd552b36d7e 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -636,7 +636,7 @@ OUString SAL_CALL
ODocumentContainer::composeHierarchicalName( const OUString& i
::rtl::Reference<OContentHelper> pContent;
try
{
- pContent =
comphelper::getUnoTunnelImplementation<OContentHelper>(const_cast<ODocumentContainer*>(this)->implGetByName(
_sName, true ));
+ pContent =
comphelper::getFromUnoTunnel<OContentHelper>(const_cast<ODocumentContainer*>(this)->implGetByName(
_sName, true ));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/ui/browser/brwview.cxx
b/dbaccess/source/ui/browser/brwview.cxx
index 4aa7c4c5abb9..b68819d6740a 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -251,7 +251,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const
Reference< css::awt::XWindowPeer > xPeer = m_xGrid->getPeer();
if ( xPeer.is() )
{
- SbaXGridPeer* pPeer =
comphelper::getUnoTunnelImplementation<SbaXGridPeer>(xPeer);
+ SbaXGridPeer* pPeer =
comphelper::getFromUnoTunnel<SbaXGridPeer>(xPeer);
UnoDataBrowserView* pTHIS =
const_cast<UnoDataBrowserView*>(this);
if ( pPeer )
{
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index f9871eaee981..0006f45de56f 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -667,7 +667,7 @@ SvNumberFormatter* SbaGridControl::GetDatasourceFormatter()
{
Reference< css::util::XNumberFormatsSupplier > xSupplier =
::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet >
(getDataSource(),UNO_QUERY)), true, getContext());
- SvNumberFormatsSupplierObj* pSupplierImpl =
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( xSupplier );
+ SvNumberFormatsSupplierObj* pSupplierImpl =
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier );
if ( !pSupplierImpl )
return nullptr;
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index d62d9ea3e482..336fa15bac9f 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(OFieldDescControl, FormatClickHdl,
weld::Button&, void)
sal_Int32 nOldFormatKey(pActFieldDescr->GetFormatKey());
SvxCellHorJustify rOldJustify = pActFieldDescr->GetHorJustify();
Reference< XNumberFormatsSupplier > xSupplier =
GetFormatter()->getNumberFormatsSupplier();
- SvNumberFormatsSupplierObj* pSupplierImpl =
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( xSupplier );
+ SvNumberFormatsSupplierObj* pSupplierImpl =
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier );
if (!pSupplierImpl)
return;
diff --git a/dbaccess/source/ui/misc/DExport.cxx
b/dbaccess/source/ui/misc/DExport.cxx
index 61a6481f1a11..adab71f29d8f 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -772,7 +772,7 @@ void ODatabaseExport::ensureFormatter()
if ( !m_pFormatter )
{
Reference< XNumberFormatsSupplier > xSupplier =
m_xFormatter->getNumberFormatsSupplier();
- auto pSupplierImpl =
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>(xSupplier);
+ auto pSupplierImpl =
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>(xSupplier);
m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() :
nullptr;
Reference<XPropertySet> xNumberFormatSettings =
xSupplier->getNumberFormatSettings();
xNumberFormatSettings->getPropertyValue("NullDate") >>= m_aNullDate;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx
b/dbaccess/source/ui/misc/TokenWriter.cxx
index bde1e9a138a5..c0401f591a6f 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -862,7 +862,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,
sal_Int32 nWidthPixel, sal
"=" +
pChar;
- SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ?
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>(m_xFormatter->getNumberFormatsSupplier())
: nullptr;
+ SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ?
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>(m_xFormatter->getNumberFormatsSupplier())
: nullptr;
SvNumberFormatter* pFormatter = pSupplierImpl ?
pSupplierImpl->GetNumberFormatter() : nullptr;
if(pFormatter)
{
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 2f60f2c33421..4086e7b442f2 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1036,7 +1036,7 @@ void setEvalDateFormatForFormatter(Reference<
css::util::XNumberFormatter > cons
Reference< css::util::XNumberFormatsSupplier > xSupplier =
_rxFormatter->getNumberFormatsSupplier();
- auto pSupplierImpl =
comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>(xSupplier);
+ auto pSupplierImpl =
comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>(xSupplier);
OSL_ENSURE(pSupplierImpl,"No Supplier!");
if ( pSupplierImpl )
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx
b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 2fda531e716c..d2c5c98b94e1 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -56,7 +56,7 @@ namespace dbaui
OJoinExchangeData OJoinExchObj::GetSourceDescription(const Reference<
XTransferable >& _rxObject)
{
OJoinExchangeData aReturn;
- auto pImplementation =
comphelper::getUnoTunnelImplementation<OJoinExchObj>(_rxObject);
+ auto pImplementation =
comphelper::getFromUnoTunnel<OJoinExchObj>(_rxObject);
if (pImplementation)
aReturn = pImplementation->m_jxdSourceDescription;
return aReturn;
@@ -71,7 +71,7 @@ namespace dbaui
sal_Int64 SAL_CALL OJoinExchObj::getSomething( const Sequence< sal_Int8 >&
_rIdentifier )
{
- if (isUnoTunnelId<OJoinExchObj>(_rIdentifier))
+ if (comphelper::isUnoTunnelId<OJoinExchObj>(_rIdentifier))
return reinterpret_cast<sal_Int64>(this);
return 0;
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx
b/dbaccess/source/ui/uno/ColumnControl.cxx
index 19dddf59d8a4..51adc7d651fc 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -69,7 +69,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference<
XToolkit >& /*rToolkit
vcl::Window* pParentWin = nullptr;
if (rParentPeer.is())
{
- VCLXWindow* pParent =
comphelper::getUnoTunnelImplementation<VCLXWindow>(rParentPeer);
+ VCLXWindow* pParent =
comphelper::getFromUnoTunnel<VCLXWindow>(rParentPeer);
if (pParent)
pParentWin = pParent->GetWindow();
}
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index c2b0aa5bdd8d..efe9165ea647 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -231,13 +231,13 @@ static tools::Time setTime( util::DateTime const & rDate )
const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId()
noexcept
{
- static const UnoTunnelIdInit theSvxUnoTextFieldUnoTunnelId;
+ static const comphelper::UnoIdInit theSvxUnoTextFieldUnoTunnelId;
return theSvxUnoTextFieldUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence<
sal_Int8 >& rId )
{
- if( isUnoTunnelId<SvxUnoTextField>(rId) )
+ if( comphelper::isUnoTunnelId<SvxUnoTextField>(rId) )
{
return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
}
@@ -654,7 +654,7 @@ OUString SAL_CALL SvxUnoTextField::getPresentation(
sal_Bool bShowCommand )
// Interface text::XTextContent
void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange
>& xTextRange )
{
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRange>( xTextRange );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRange>( xTextRange );
if(pRange == nullptr)
throw lang::IllegalArgumentException();
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 9f861b7f9c2a..5ac7c4c1ba41 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -474,7 +474,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const
Sequence<beans::Propert
const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule )
{
- SvxUnoNumberingRules* pRule =
comphelper::getUnoTunnelImplementation<SvxUnoNumberingRules>( xRule );
+ SvxUnoNumberingRules* pRule =
comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( xRule );
if( pRule == nullptr )
throw IllegalArgumentException();
@@ -509,10 +509,10 @@ sal_Int16 SvxUnoNumberingRules::Compare( const Any& Any1,
const Any& Any2 )
if( x1.get() == x2.get() )
return 0;
- SvxUnoNumberingRules* pRule1 =
comphelper::getUnoTunnelImplementation<SvxUnoNumberingRules>( x1 );
+ SvxUnoNumberingRules* pRule1 =
comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( x1 );
if( pRule1 )
{
- SvxUnoNumberingRules* pRule2 =
comphelper::getUnoTunnelImplementation<SvxUnoNumberingRules>( x2 );
+ SvxUnoNumberingRules* pRule2 =
comphelper::getFromUnoTunnel<SvxUnoNumberingRules>( x2 );
if( pRule2 )
{
const SvxNumRule& rRule1 = pRule1->getNumRule();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 76537f8b425b..7696a5dbd648 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -312,7 +312,7 @@ uno::Reference< text::XTextRange > SAL_CALL
SvxUnoTextRangeBase::getStart()
{
CheckSelection( maSelection, pForwarder );
- SvxUnoTextBase* pText =
comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( getText() );
+ SvxUnoTextBase* pText = comphelper::getFromUnoTunnel<SvxUnoTextBase>(
getText() );
if(pText == nullptr)
throw uno::RuntimeException();
@@ -340,7 +340,7 @@ uno::Reference< text::XTextRange > SAL_CALL
SvxUnoTextRangeBase::getEnd()
{
CheckSelection( maSelection, pForwarder );
- SvxUnoTextBase* pText =
comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( getText() );
+ SvxUnoTextBase* pText = comphelper::getFromUnoTunnel<SvxUnoTextBase>(
getText() );
if(pText == nullptr)
throw uno::RuntimeException();
@@ -1453,8 +1453,8 @@ uno::Sequence< OUString >
SvxUnoTextRangeBase::getSupportedServiceNames_Static()
// XTextRangeCompare
sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const
uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange
>& xR2 )
{
- SvxUnoTextRangeBase* pR1 =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xR1 );
- SvxUnoTextRangeBase* pR2 =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xR2 );
+ SvxUnoTextRangeBase* pR1 =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( xR1 );
+ SvxUnoTextRangeBase* pR2 =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( xR2 );
if( (pR1 == nullptr) || (pR2 == nullptr) )
throw lang::IllegalArgumentException();
@@ -1477,8 +1477,8 @@ sal_Int16 SAL_CALL
SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc
sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const
uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange
>& xR2 )
{
- SvxUnoTextRangeBase* pR1 =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xR1 );
- SvxUnoTextRangeBase* pR2 =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xR2 );
+ SvxUnoTextRangeBase* pR1 =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( xR1 );
+ SvxUnoTextRangeBase* pR2 =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( xR2 );
if( (pR1 == nullptr) || (pR2 == nullptr) )
throw lang::IllegalArgumentException();
@@ -1688,7 +1688,7 @@ uno::Reference< text::XTextCursor > SAL_CALL
SvxUnoTextBase::createTextCursorByR
if( aTextPosition.is() )
{
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( aTextPosition );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( aTextPosition );
if(pRange)
xCursor = createTextCursorBySelection( pRange->GetSelection() );
}
@@ -1703,7 +1703,7 @@ void SAL_CALL SvxUnoTextBase::insertString( const
uno::Reference< text::XTextRan
if( !xRange.is() )
return;
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRange>( xRange );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRange>( xRange );
if(!pRange)
return;
@@ -1750,7 +1750,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter(
const uno::Reference< text
}
case text::ControlCharacter::LINE_BREAK:
{
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRange>( xRange );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRange>( xRange );
if(pRange)
{
ESelection aRange = pRange->GetSelection();
@@ -1781,7 +1781,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter(
const uno::Reference< text
}
case text::ControlCharacter::APPEND_PARAGRAPH:
{
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRange>( xRange );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRange>( xRange );
if(pRange)
{
ESelection aRange = pRange->GetSelection();
@@ -2135,13 +2135,13 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoTextBase::getSupportedServiceNames_Stat
const uno::Sequence< sal_Int8 > & SvxUnoTextBase::getUnoTunnelId() noexcept
{
- static const UnoTunnelIdInit theSvxUnoTextBaseUnoTunnelId;
+ static const comphelper::UnoIdInit theSvxUnoTextBaseUnoTunnelId;
return theSvxUnoTextBaseUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8
>& rId )
{
- if( isUnoTunnelId<SvxUnoTextBase>(rId) )
+ if( comphelper::isUnoTunnelId<SvxUnoTextBase>(rId) )
{
return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
}
@@ -2209,13 +2209,13 @@ uno::Sequence< sal_Int8 > SAL_CALL
SvxUnoText::getImplementationId( )
const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() noexcept
{
- static const UnoTunnelIdInit theSvxUnoTextUnoTunnelId;
+ static const comphelper::UnoIdInit theSvxUnoTextUnoTunnelId;
return theSvxUnoTextUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >&
rId )
{
- if( isUnoTunnelId<SvxUnoText>(rId) )
+ if( comphelper::isUnoTunnelId<SvxUnoText>(rId) )
{
return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
}
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 8ff342d915bb..12b56ca4c68e 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -554,7 +554,7 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const
uno::Reference< text::XTextRang
if( !xRange.is() )
return;
- SvxUnoTextRangeBase* pRange =
comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xRange );
+ SvxUnoTextRangeBase* pRange =
comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( xRange );
if( !pRange )
return;
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index cd4a9529d6e9..f73ffd2b29da 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -881,7 +881,7 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
mpSolverContainer.reset( new EscherSolverContainer );
}
else
- pSvxDrawPage =
comphelper::getUnoTunnelImplementation<SvxDrawPage>(mXDrawPage);
+ pSvxDrawPage = comphelper::getFromUnoTunnel<SvxDrawPage>(mXDrawPage);
return pSvxDrawPage != nullptr;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7e5f188e7725..4b81f491a204 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
... etc. - the rest is truncated
