name resolver could also be name provider.

diff --git a/mcs/class/System.Xaml/System.Xaml/ValueSerializerContext.cs b/mcs/class/System.Xaml/System.Xaml/ValueSerializerContext.cs
index 5bc49831d55d429c4abe19a62fad3475a92b07ac..edc3706bd38edebfd2a1b791ede62d72668d6bee 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/ValueSerializerContext.cs
+++ b/mcs/class/System.Xaml/System.Xaml/ValueSerializerContext.cs
@@ -63,6 +63,8 @@ namespace System.Xaml
                                return namespace_resolver;
                        if (serviceType == typeof (IXamlNameResolver))
                                return name_resolver;
+                       if (serviceType == typeof (IXamlNameProvider))
+                               return name_resolver;
                        if (serviceType == typeof (IXamlTypeResolver))
                                return type_resolver;
                        if (serviceType == typeof (IXamlSchemaContextProvider))

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlNameResolver.cs b/mcs/class/System.Xaml/System.Xaml/XamlNameResolver.cs
index aeeacf1a56e9f2617b211d81df47a44482c09f5a..32910eb90ffce54a2556fdf22c2b5d423e77a3b8 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlNameResolver.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlNameResolver.cs
@@ -28,7 +28,8 @@ using System.Windows.Markup;
 
 namespace System.Xaml
 {
-       internal class XamlNameResolver : IXamlNameResolver
+       // FIXME: implement IXamlNameProvider (either within or outside this class)
+       internal class XamlNameResolver : IXamlNameResolver, IXamlNameProvider
        {
                public XamlNameResolver ()
                {
@@ -106,7 +107,7 @@ namespace System.Xaml
                        return objects.ContainsKey (name);
                }
                
-               internal string GetName (object value)
+               public string GetName (object value)
                {
                        foreach (var no in objects.Values)
                                if (object.ReferenceEquals (no.Value, value))