From 73aa1e763eeb631eaaf23c236d263832678314c4 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 15 Mar 2015 13:59:44 +0100
Subject: Fix getFieldDescriptor with index ignoring inherited fields

---
 src/core/model/Ontology.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/core/model/Ontology.cpp')

diff --git a/src/core/model/Ontology.cpp b/src/core/model/Ontology.cpp
index bc7b1a7..0341df8 100644
--- a/src/core/model/Ontology.cpp
+++ b/src/core/model/Ontology.cpp
@@ -657,9 +657,17 @@ Rooted<FieldDescriptor> Descriptor::getFieldDescriptor(
 	ssize_t idx = ousia::getFieldDescriptorIndex(fds, name);
 	if (idx != -1) {
 		return fds[idx];
-	} else {
-		return nullptr;
 	}
+	return nullptr;
+}
+
+Rooted<FieldDescriptor> Descriptor::getFieldDescriptor(size_t idx) const
+{
+	NodeVector<FieldDescriptor> fds = getFieldDescriptors();
+	if (idx < fds.size()) {
+		return fds[idx];
+	}
+	return nullptr;
 }
 
 bool Descriptor::addAndSortFieldDescriptor(Handle<FieldDescriptor> fd,
-- 
cgit v1.2.3