Browse Source

Fixed SD2-1068: #D can't open resx files if these have resources of type System.Resources.ResXNullRef

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1886 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Christian Hornung 20 years ago
parent
commit
7a4c5428ea
  1. 7
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs
  2. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs

7
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs

@ -46,6 +46,9 @@ namespace ResourceEditor @@ -46,6 +46,9 @@ namespace ResourceEditor
public int ImageIndex
{
get {
if (this.resourceValue == null) {
return -1;
}
switch(this.resourceValue.GetType().ToString()) {
case "System.String":
return 0;
@ -65,6 +68,10 @@ namespace ResourceEditor @@ -65,6 +68,10 @@ namespace ResourceEditor
public override string ToString()
{
if (ResourceValue == null) {
return "(Nothing/null)";
}
string type = ResourceValue.GetType().FullName;
string tmp = String.Empty;

2
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs

@ -219,7 +219,7 @@ namespace ResourceEditor @@ -219,7 +219,7 @@ namespace ResourceEditor
ResourceItem item = entry.Value;
string tmp = item.ToString();
string type = item.ResourceValue.GetType().FullName;
string type = item.ResourceValue == null ? "(Nothing/null)" : item.ResourceValue.GetType().FullName;
ListViewItem lv = new ListViewItem(new String[] {item.Name, type, tmp}, item.ImageIndex);
Items.Add(lv);

Loading…
Cancel
Save