X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.ui%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fui%2FSelectionListener.java;h=8a8da732b3e121c082dd8ac3aab4cd22d65ba31c;hp=d2eece5bd2b6275927f5980c0d30841d5c7c5219;hb=5915c1bbd6d0c6125aa3c815c7843339190f28e4;hpb=dfa52ccefe2e4c36965ad3ccf5e19b778cae0d99

diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SelectionListener.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SelectionListener.java
index d2eece5bd..8a8da732b 100644
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SelectionListener.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SelectionListener.java
@@ -62,7 +62,16 @@ public class SelectionListener implements ListSelectionListener {
 
 			final Object cell = table.getValueAt(selectedRows[0], selectedColumns[0]);
 			if(cell != null) {
-				String expression = clientModel.getPossiblePropertyAt(SpreadsheetUtils.cellName(selectedRows[0], selectedColumns[0]), ClientModel.CONTENT_EXPRESSION);
+
+				String expression = "";
+
+				Object expressionO = clientModel.getPossiblePropertyAt(SpreadsheetUtils.cellName(selectedRows[0], selectedColumns[0]), ClientModel.CONTENT_EXPRESSION);
+				if(expressionO instanceof String) {
+					expression = (String)expressionO;
+				} else if(expressionO instanceof Variant) {
+					expression = ((Variant)expressionO).toString();
+				}
+
 				if(expression == null) {
 					Variant content = SpreadsheetUtils.getSafeClientVariant(clientModel, SpreadsheetUtils.cellName(selectedRows[0], selectedColumns[0]), ClientModel.CONTENT);
 					if(content != null)