Merge pull request #4621 from alexanderkyte/strdup_env

[mono.git] / mcs / class / System.Design / System.ComponentModel.Design / DesignSurfaceManager.cs

diff --git a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs
index 38d1a604c06117f34cde38f6d5f1d8015f32928e..0a0d67474183ebc5b95351f61e94a4ca52ff9f0f 100644 (file)
--- a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs
+++ b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs
@@ -73,9 +73,9 @@ namespace System.ComponentModel.Design
                {
                }
 
-               public DesignSurfaceManager (IServiceProvider serviceProvider)
+               public DesignSurfaceManager (IServiceProvider parentProvider)
                {
-                       _parentProvider = serviceProvider;
+                       _parentProvider = parentProvider;
                        this.ServiceContainer.AddService (typeof (IDesignerEventService), new DesignerEventService ());
                }
 
@@ -224,10 +224,10 @@ namespace System.ComponentModel.Design
                                
                }
                
-               public object GetService (Type service)
+               public object GetService (Type serviceType)
                {
                        if (_serviceContainer != null)
-                               return _serviceContainer.GetService (service);
+                               return _serviceContainer.GetService (serviceType);
 
                        return null;
                }