diff options
| -rw-r--r-- | Source/SPCustomQuery.m | 5 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index a945a53d..5184edf7 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -2287,7 +2287,10 @@ [fieldEditor setAllowNULL:allowNULL]; id originalData = [resultData cellDataAtRow:rowIndex column:[[aTableColumn identifier] integerValue]]; - if ([originalData isNSNull]) originalData = [prefs objectForKey:SPNullValue]; + if ([originalData isNSNull]) + originalData = [NSString stringWithString:[prefs objectForKey:SPNullValue]]; + else if ([originalData isKindOfClass:[MCPGeometryData class]]) + originalData = [originalData wktString]; id editData = [[fieldEditor editWithObject:originalData fieldName:[columnDefinition objectForKey:@"name"] diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 4fb1bd3e..a69ad5e2 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -3888,7 +3888,10 @@ [fieldEditor setAllowNULL:allowNULL]; id cellValue = [tableValues cellDataAtRow:rowIndex column:[[aTableColumn identifier] integerValue]]; - if ([cellValue isNSNull]) cellValue = [NSString stringWithString:[prefs objectForKey:SPNullValue]]; + if ([cellValue isNSNull]) + cellValue = [NSString stringWithString:[prefs objectForKey:SPNullValue]]; + else if ([cellValue isKindOfClass:[MCPGeometryData class]]) + cellValue = [cellValue wktString]; id editData = [[fieldEditor editWithObject:cellValue fieldName:[[aTableColumn headerCell] stringValue] |