summaryrefslogtreecommitdiff
path: root/xmloff/source/transform
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-09-14 08:19:47 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-09-15 06:07:36 +0200
commit05bc93db2de56000f65764d7e394d03747cac23d (patch)
tree975de9ae83572aac8a5c3ea8db281e1017ee5be0 /xmloff/source/transform
parent8cbb414ed737f9ffc76e1258e6671769bf63fc6c (diff)
Use <comphelper/servicehelper.hxx> implementing XUnoTunnel part 1
The header got some changes: 1. Move UnoTunnelIdInit and isUnoTunnelId into 'comphelper' namespace 2. Rename UnoTunnelIdInit to UnoIdInit, as a precondition to replace of uses of OImplementationId with it, including in XTypeProvider 3. Introduce convenience functions 'getSomething_cast' to cast between sal_Int64 and object pointers uniformly. 4. Rename getUnoTunnelImplementation to getFromUnoTunnel, both to make it a bit shorter, and to reflect its function better. Templatize it to take also css::uno::Any for convenience. 5. Introduce getSomethingImpl, inspired by sw::UnoTunnelImpl; allow it handle cases both with and without fallback to parent. 6. Adjust UNO3_GETIMPLEMENTATION_* macros TODO (in separate commits): - Drop sw::UnoTunnelImpl and sw::UnoTunnelGetImplementation - Replace all uses of OImplementationId in core with UnoIdInit - Deprecate OImplementationId in <cppuhelper/typeprovider.hxx> - Change implementations of getSomething to use getSomethingImpl - Revise uses of getSomething to use getFromUnoTunnel Change-Id: If4a3cb024130f1f552f988f0479589da1cd066e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122022 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff/source/transform')
-rw-r--r--xmloff/source/transform/MutableAttrList.cxx4
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx4
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index fc11fb964716..9373055ab1df 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -59,7 +59,7 @@ XMLMutableAttributeList::~XMLMutableAttributeList()
const css::uno::Sequence<sal_Int8>& XMLMutableAttributeList::getUnoTunnelId() noexcept
{
- static const UnoTunnelIdInit theXMLMutableAttributeListUnoTunnelId;
+ static const comphelper::UnoIdInit theXMLMutableAttributeListUnoTunnelId;
return theXMLMutableAttributeListUnoTunnelId.getSeq();
}
@@ -67,7 +67,7 @@ const css::uno::Sequence<sal_Int8>& XMLMutableAttributeList::getUnoTunnelId() no
sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
const Sequence< sal_Int8 >& rId )
{
- if( isUnoTunnelId<XMLMutableAttributeList>(rId) )
+ if( comphelper::isUnoTunnelId<XMLMutableAttributeList>(rId) )
{
return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
}
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 5495864bf120..243fd6b708db 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1946,14 +1946,14 @@ void OOo2OasisTransformer::Initialize(
const css::uno::Sequence<sal_Int8>& OOo2OasisTransformer::getUnoTunnelId() noexcept
{
- static const UnoTunnelIdInit theOOo2OasisTransformerUnoTunnelId;
+ static const comphelper::UnoIdInit theOOo2OasisTransformerUnoTunnelId;
return theOOo2OasisTransformerUnoTunnelId.getSeq();
}
// XUnoTunnel
sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8 >& rId )
{
- if( isUnoTunnelId<OOo2OasisTransformer>(rId) )
+ if( comphelper::isUnoTunnelId<OOo2OasisTransformer>(rId) )
{
return reinterpret_cast< sal_Int64 >( this );
}
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index ceb5daeffcfd..5c9cd31a9372 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1945,14 +1945,14 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() noexcept
const css::uno::Sequence<sal_Int8>& Oasis2OOoTransformer::getUnoTunnelId() noexcept
{
- static const class UnoTunnelIdInit theOasis2OOoTransformerUnoTunnelId;
+ static const class comphelper::UnoIdInit theOasis2OOoTransformerUnoTunnelId;
return theOasis2OOoTransformerUnoTunnelId.getSeq();
}
// XUnoTunnel
sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8 >& rId )
{
- if( isUnoTunnelId<Oasis2OOoTransformer>(rId) )
+ if( comphelper::isUnoTunnelId<Oasis2OOoTransformer>(rId) )
{
return reinterpret_cast< sal_Int64 >( this );
}