Merge remote-tracking branch 'origin/roslyn' into new-project-model

1 files changed, 6 insertions, 5 deletions

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
index f4e140d29e..356dcaf632 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
@@ -28,6 +28,7 @@
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.DesignerSupport.Projects
 {
@@ -42,9 +43,9 @@ namespace MonoDevelop.DesignerSupport.Projects
 		{
 			// Return the ProjectFile object of the file being edited
 			
-			if (Document.HasProject) {
-				string file = Document.FileName;
-				return Document.Project.Files.GetFile (file);
+			if (DocumentContext.HasProject) {
+				string file = DocumentContext.Name;
+				return DocumentContext.Project.Files.GetFile (file);
 			}
 			else
 				return null;
@@ -61,8 +62,8 @@ namespace MonoDevelop.DesignerSupport.Projects
 
 		public void OnChanged (object obj)
 		{
-			if (Document.HasProject)
-				IdeApp.ProjectOperations.SaveAsync (Document.Project);
+			if (DocumentContext.HasProject)
+				IdeApp.ProjectOperations.SaveAsync (DocumentContext.Project);
 		}
 	}
 }