Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit f16fd98

Browse files
committed
Merge pull request #507 from gumme/WpfDesignerPasteErrorFix
Wpf designer fixes when pasting items
2 parents 8fdacbc + 5a599d2 commit f16fd98

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlEditOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void Paste()
131131
AddInParent(parent, pastedItems);
132132
pasted = true;
133133
}
134-
} else if (pastedItems.Count == 1 && parent.ContentProperty.Value == null && parent.ContentProperty.ValueOnInstance == null && DefaultPlacementBehavior.CanContentControlAdd((ContentControl)parent.View)) {
134+
} else if (pastedItems.Count == 1 && parent.ContentProperty.Value == null && parent.ContentProperty.ValueOnInstance == null && parent.View is ContentControl && DefaultPlacementBehavior.CanContentControlAdd((ContentControl)parent.View)) {
135135
AddInParent(parent, pastedItems);
136136
pasted = true;
137137
}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@ public static XamlObject ParseSnippet(XamlObject root, string xaml, XamlParserSe
726726

727727
XamlParser parser = new XamlParser();
728728
parser.settings = settings;
729+
parser.errorSink = (IXamlErrorSink)settings.ServiceProvider.GetService(typeof(IXamlErrorSink));
729730
parser.document = root.OwnerDocument;
730731
var xamlObject = parser.ParseObject(element as XmlElement);
731732
if (xamlObject != null)

0 commit comments

Comments
 (0)