aboutsummaryrefslogtreecommitdiff
path: root/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx')
-rw-r--r--libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx b/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
index e417b98..f336620 100644
--- a/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
+++ b/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
@@ -6,6 +6,7 @@
#include <xsde/cxx/xml/char-table.hxx>
#include <xsde/cxx/serializer/validating/nmtoken-stl.hxx>
+#include <xsde/cxx/serializer/validating/string-common.hxx>
namespace xsde
{
@@ -42,10 +43,17 @@ namespace xsde
ok = false;
}
- if (ok)
- _characters (tmp.c_str (), tmp.size ());
- else
+ if (!ok)
+ {
_schema_error (schema_error::invalid_nmtoken_value);
+ return;
+ }
+
+ if (!string_common::validate_facets (
+ tmp.c_str (), tmp.size (), _facets (), _context ()))
+ return;
+
+ _characters (tmp.c_str (), tmp.size ());
}
}
}