diff options
Diffstat (limited to 'libxsde/xsde/cxx/serializer/validating/idref-stl.cxx')
| -rw-r--r-- | libxsde/xsde/cxx/serializer/validating/idref-stl.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/validating/idref-stl.cxx b/libxsde/xsde/cxx/serializer/validating/idref-stl.cxx index a4aee50..3fdc2de 100644 --- a/libxsde/xsde/cxx/serializer/validating/idref-stl.cxx +++ b/libxsde/xsde/cxx/serializer/validating/idref-stl.cxx @@ -6,6 +6,7 @@ #include <xsde/cxx/xml/ncname.hxx> #include <xsde/cxx/serializer/validating/idref-stl.hxx> +#include <xsde/cxx/serializer/validating/string-common.hxx> namespace xsde { @@ -27,10 +28,17 @@ namespace xsde std::string tmp; tmp.swap (value_); - if (xml::valid_ncname (tmp.c_str (), tmp.size ())) - _characters (tmp.c_str (), tmp.size ()); - else + if (!xml::valid_ncname (tmp.c_str (), tmp.size ())) + { _schema_error (schema_error::invalid_idref_value); + return; + } + + if (!string_common::validate_facets ( + tmp.c_str (), tmp.size (), _facets (), _context ())) + return; + + _characters (tmp.c_str (), tmp.size ()); } } } |