Merged the following revisions from trunk:

asp.net editor fixes:
73390
73398
73403
73405

Other fixes:
73393
73394
73395


svn path=/branches/monodevelop/0.13/; revision=73916

1 files changed, 5 insertions, 4 deletions

diff --git a/Extras/AspNetEdit/AspNetEdit.Editor.Persistence/RootParsingObject.cs b/Extras/AspNetEdit/AspNetEdit.Editor.Persistence/RootParsingObject.cs
index b2d31d8be8..e726d3a75b 100644
--- a/Extras/AspNetEdit/AspNetEdit.Editor.Persistence/RootParsingObject.cs
+++ b/Extras/AspNetEdit/AspNetEdit.Editor.Persistence/RootParsingObject.cs
@@ -30,7 +30,8 @@
 

 using System;

 using System.Text;

-using System.Web.UI.Design;

+using System.Web.UI.Design;
+using System.Web.UI;

 using System.Collections;

 using System.ComponentModel.Design;

 

@@ -53,7 +54,7 @@ namespace AspNetEdit.Editor.Persistence
 		}

 

 		public override void AddText (string text)

-		{

+		{
 			stringBuilder.Append (text);

 		}

 

@@ -62,9 +63,9 @@ namespace AspNetEdit.Editor.Persistence
 			controls.Add (control);

 		}

 

-		public void BuildObject (out object[] controls, out string documentText)

+		public void GetParsedContent (out Control[] controls, out string documentText)

 		{

-			controls = this.controls.ToArray ();

+			controls = (Control[]) this.controls.ToArray (typeof(System.Web.UI.Control));

 			documentText = stringBuilder.ToString ();

 		}