X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FSchemaConversionBase.java;fp=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FSchemaConversionBase.java;h=6621cc716f17853f3549644bf2f6b42cf8cc6d44;hb=ffd0151a26057732dc81543a12ae2c1bc00af4b4;hp=51707cb6d351ca7a04556a8f2404afefd8bab3ed;hpb=e6033ad7c18d4c6719da06fa7d8eb08a75d280f9;p=simantics%2Finterop.git

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
index 51707cb..6621cc7 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
@@ -28,6 +28,7 @@ import org.w3._2001.xmlschema.Any;
 import org.w3._2001.xmlschema.Attribute;
 import org.w3._2001.xmlschema.AttributeGroup;
 import org.w3._2001.xmlschema.ComplexContent;
+import org.w3._2001.xmlschema.ComplexRestrictionType;
 import org.w3._2001.xmlschema.ComplexType;
 import org.w3._2001.xmlschema.Element;
 import org.w3._2001.xmlschema.ExplicitGroup;
@@ -541,6 +542,13 @@ public final class SchemaConversionBase {
 				QName type = extensionType.getBase();
 				return type;
 			}
+			ComplexRestrictionType restriction = complexContent.getRestriction();
+			if (restriction != null)
+				return restriction.getBase();
+		}
+		if (complexType.isMixed()) {
+			// Handle characters data of mixed ComplexType as String.
+			return new QName(SCHEMA_NS, "string");
 		}
 		return null;
 	}