From 42c0480b4fbf80afa0c5b13650a0af74311d7202 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 3 Mar 2015 20:20:40 +0100 Subject: Implemented annotation handling --- src/formats/osxml/OsxmlEventParser.hpp | 7 +++---- src/formats/osxml/OsxmlParser.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/formats/osxml') diff --git a/src/formats/osxml/OsxmlEventParser.hpp b/src/formats/osxml/OsxmlEventParser.hpp index 4c5a485..888d5d6 100644 --- a/src/formats/osxml/OsxmlEventParser.hpp +++ b/src/formats/osxml/OsxmlEventParser.hpp @@ -81,12 +81,11 @@ public: * @param className is a string variant containing the name of the * annotation class that should end here. May be empty (or nullptr), if no * elementName has been specified at the end of the annotation. - * @param elementName is the name of the annotation element that should be - * ended here. May be empty (or nullptr), if no elementName has been - * specified at the end of the annotation. + * @param args is a map variant containing the arguments that were given + * to the annotation definition. */ virtual void annotationEnd(const Variant &className, - const Variant &elementName) = 0; + const Variant::mapType &args) = 0; /** * Called whenever the command or annotation tags end. diff --git a/src/formats/osxml/OsxmlParser.cpp b/src/formats/osxml/OsxmlParser.cpp index 10cc77a..a9a0ea8 100644 --- a/src/formats/osxml/OsxmlParser.cpp +++ b/src/formats/osxml/OsxmlParser.cpp @@ -79,9 +79,9 @@ public: } void annotationEnd(const Variant &className, - const Variant &elementName) override + const Variant::mapType &args) override { - stack.annotationEnd(className, elementName); + stack.annotationEnd(className, args); } void rangeEnd() override { stack.rangeEnd(); } -- cgit v1.2.3