summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-16 14:50:21 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-05-16 16:12:45 +0200
commita1dff2901e9b6f70ea87df5e76825367b38ceaf4 (patch)
treed1284375fd10c07c736c2edec450cfd823b096d0 /cppuhelper
parent08662568a590bfb20849fce077d8b5aff8b99b57 (diff)
Support for annotations in the new UNOIDL format
...used for now to transport @deprecated information. Also, improve Idx-String (formerly Idx-Name, but also used for UTF-8 annotations now) format, using the 0x80000000 for the indirection rather than the base case. (And the README erroneously used "Offset of" Idx-String all over the place.) Change-Id: I7003b1558ab536a11a9af308f9b16a7ef8840792
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/typemanager.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 6f7cd898d464..672e377f6dc1 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -926,7 +926,7 @@ private:
getBaseType() throw (css::uno::RuntimeException) {
return entity_->getDirectMandatoryBases().empty()
? css::uno::Reference< css::reflection::XTypeDescription >()
- : manager_->resolve(entity_->getDirectMandatoryBases()[0]);
+ : manager_->resolve(entity_->getDirectMandatoryBases()[0].name);
}
virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException)
@@ -988,7 +988,7 @@ InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException) {
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
- s[i] = manager_->resolve(entity_->getDirectMandatoryBases()[i]);
+ s[i] = manager_->resolve(entity_->getDirectMandatoryBases()[i].name);
}
return s;
}
@@ -1003,7 +1003,7 @@ InterfaceTypeDescription::getOptionalBaseTypes()
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
- s[i] = manager_->resolve(entity_->getDirectOptionalBases()[i]);
+ s[i] = manager_->resolve(entity_->getDirectOptionalBases()[i].name);
}
return s;
}
@@ -1487,7 +1487,8 @@ AccumulationBasedServiceDescription::getMandatoryServices()
css::uno::Reference< css::reflection::XServiceTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i].set(
- manager_->resolve(entity_->getDirectMandatoryBaseServices()[i]),
+ manager_->resolve(
+ entity_->getDirectMandatoryBaseServices()[i].name),
css::uno::UNO_QUERY_THROW);
}
return s;
@@ -1505,7 +1506,7 @@ AccumulationBasedServiceDescription::getOptionalServices()
css::uno::Reference< css::reflection::XServiceTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i].set(
- manager_->resolve(entity_->getDirectOptionalBaseServices()[i]),
+ manager_->resolve(entity_->getDirectOptionalBaseServices()[i].name),
css::uno::UNO_QUERY_THROW);
}
return s;
@@ -1526,7 +1527,7 @@ AccumulationBasedServiceDescription::getMandatoryInterfaces()
s[i].set(
resolveTypedefs(
manager_->find(
- entity_->getDirectMandatoryBaseInterfaces()[i])),
+ entity_->getDirectMandatoryBaseInterfaces()[i].name)),
css::uno::UNO_QUERY_THROW);
}
return s;
@@ -1547,7 +1548,7 @@ AccumulationBasedServiceDescription::getOptionalInterfaces()
s[i].set(
resolveTypedefs(
manager_->find(
- entity_->getDirectOptionalBaseInterfaces()[i])),
+ entity_->getDirectOptionalBaseInterfaces()[i].name)),
css::uno::UNO_QUERY_THROW);
}
return s;