1 files changed, 3 insertions, 13 deletions
diff --git a/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java
index af4707c60ec3..b7704a687441 100644
--- a/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java
@@ -106,22 +106,12 @@ public class TableExpandableItemsHandler extends AbstractExpandableItemsHandler<
   }
 
   public Pair<Component, Rectangle> getCellRendererAndBounds(TableCell key) {
-    Rectangle cellRect = getCellRect(key);
-
-    int modelColumnIndex = myComponent.convertColumnIndexToModel(key.column);
-    final int modelRowIndex = myComponent.convertRowIndexToModel(key.row);
-    TableModel model = myComponent.getModel();
-    if (key.row < 0 || key.row >= model.getRowCount() || key.column < 0 || key.column >= model.getColumnCount()) {
+    if (key.row < 0 || key.row >= myComponent.getRowCount() || key.column < 0 || key.column >= myComponent.getColumnCount()) {
       return null;
     }
 
-    Component renderer = myComponent
-      .getCellRenderer(key.row, key.column)
-      .getTableCellRendererComponent(myComponent,
-                                     model.getValueAt(modelRowIndex, modelColumnIndex),
-                                     myComponent.getSelectionModel().isSelectedIndex(key.row),
-                                     myComponent.hasFocus(),
-                                     key.row, key.column);
+    Rectangle cellRect = getCellRect(key);
+    Component renderer = myComponent.prepareRenderer(myComponent.getCellRenderer(key.row, key.column), key.row, key.column);
     cellRect.width = renderer.getPreferredSize().width;
 
     return Pair.create(renderer, cellRect);