Included bugfixes from Alex.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@408 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -1193,7 +1193,7 @@
 					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
 					<MenuItem id       = "Rebuild project"
 					          label    = "${res:XML.MainMenu.BuildMenu.RebuildProject}"
-					          shortcut = "ALT|F9"
+					          shortcut = "Alt|F9"
 					          class    = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"/>
 					<MenuItem id    = "Clean project"
 					          label = "${res:XML.MainMenu.BuildMenu.CleanProject}"

src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs

@@ -363,7 +363,11 @@ namespace ICSharpCode.NRefactory.Parser
 		
 		public override object Visit(ReturnStatement returnStatement, object data)
 		{
-			CodeMethodReturnStatement returnStmt = new CodeMethodReturnStatement((CodeExpression)returnStatement.Expression.AcceptVisitor(this,data));
+			CodeMethodReturnStatement returnStmt;
+			if (returnStatement.Expression.IsNull)
+				returnStmt = new CodeMethodReturnStatement();
+			else
+				returnStmt = new CodeMethodReturnStatement((CodeExpression)returnStatement.Expression.AcceptVisitor(this,data));
 
 			AddStmt(returnStmt);
 

src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCommand.cs

@@ -69,12 +69,15 @@ namespace ICSharpCode.Core
 		public static Keys ParseShortcut(string shortcutString)
 		{
 			Keys shortCut = Keys.None;
-			try {
+			if (shortcutString.Length > 0) {
-				foreach (string key in shortcutString.Split('|')) {
+				try {
-					shortCut  |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), key);
+					foreach (string key in shortcutString.Split('|')) {
+						shortCut  |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), key);
+					}
+				} catch (Exception ex) {
+					MessageService.ShowError(ex);
+					return System.Windows.Forms.Keys.None;
 				}
-			} catch (Exception) {
-				return System.Windows.Forms.Keys.None;
 			}
 			return shortCut;
 		}