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%2FTextTableCellEditor.java;h=24fade56ae6a839b93195f7e723a699c42475256;hp=2c84b6ad1d16abc8662e052c67f4bd9f2c394ed6;hb=5915c1bbd6d0c6125aa3c815c7843339190f28e4;hpb=dfa52ccefe2e4c36965ad3ccf5e19b778cae0d99

diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/TextTableCellEditor.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/TextTableCellEditor.java
index 2c84b6ad1..24fade56a 100644
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/TextTableCellEditor.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/TextTableCellEditor.java
@@ -136,7 +136,14 @@ class TextTableCellEditor extends DefaultCellEditor implements SpreadsheetCellEd
     	String str = (String)getCellEditorValue();
 
     	String cellName = SpreadsheetUtils.cellName(row, column);
-    	String expression = clientModel.getPossiblePropertyAt(cellName, ClientModel.CONTENT_EXPRESSION);
+    	Object expressionO = clientModel.getPossiblePropertyAt(cellName, ClientModel.CONTENT_EXPRESSION);
+    	String expression = null;
+    	if(expressionO instanceof String) {
+    		expression = (String)expressionO;
+    	} else if(expressionO instanceof Variant) {
+    		expression = ((Variant)expressionO).getValue().toString();
+    	}
+    	
 		if(expression == null) {
 			Variant content = SpreadsheetUtils.getSafeClientVariant(clientModel, cellName, ClientModel.CONTENT);
 			if(content != null)