summaryrefslogtreecommitdiff
path: root/codemaker/source/javamaker
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 /codemaker/source/javamaker
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 'codemaker/source/javamaker')
-rw-r--r--codemaker/source/javamaker/javatype.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 6f3186632fe1..d12f04e62a72 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1810,12 +1810,12 @@ void handleInterfaceType(
| ClassFile::ACC_ABSTRACT),
className, "java/lang/Object", ""));
SAL_WNODEPRECATED_DECLARATIONS_POP
- for (std::vector< OUString >::const_iterator i(
+ for (std::vector< unoidl::AnnotatedReference >::const_iterator i(
entity->getDirectMandatoryBases().begin());
i != entity->getDirectMandatoryBases().end(); ++i)
{
- dependencies->insert(*i);
- cf->addInterface(codemaker::convertString(*i).replace('.', '/'));
+ dependencies->insert(i->name);
+ cf->addInterface(codemaker::convertString(i->name).replace('.', '/'));
}
// As a special case, let com.sun.star.lang.XEventListener extend
// java.util.EventListener ("A tagging interface that all event listener