From 560b0ea00eafdf41a974585ebf47a2a611e720c6 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 23 Jun 2007 22:03:21 +0000 Subject: [PATCH] Fixed WpfDesign unit tests. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2578 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs | 2 +- .../WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs index 78f921e9fe..da5ef4f376 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer protected XamlDesignContext CreateContext(string xaml) { log = new StringBuilder(); - XamlDesignContext context = new XamlDesignContext(new XmlTextReader(new StringReader(xaml)), null); + XamlDesignContext context = new XamlDesignContext(new XmlTextReader(new StringReader(xaml)), new XamlLoadSettings()); /*context.Services.Component.ComponentRegistered += delegate(object sender, DesignItemEventArgs e) { log.AppendLine("Register " + ItemIdentity(e.Item)); }; diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs index 6fad201241..e4bfbfac0e 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Globalization; using System.Diagnostics; using System.IO; using System.Reflection; @@ -158,7 +159,10 @@ namespace ICSharpCode.WpfDesign.XamlDom object instance; if (initializeFromTextValueInsteadOfConstructor != null) { - instance = TypeDescriptor.GetConverter(elementType).ConvertFromString(initializeFromTextValueInsteadOfConstructor.Text); + instance = TypeDescriptor.GetConverter(elementType).ConvertFromString( + document.GetTypeDescriptorContext(), + CultureInfo.InvariantCulture, + initializeFromTextValueInsteadOfConstructor.Text); } else { instance = settings.CreateInstanceCallback(elementType, emptyObjectArray); }