From df3eaf0e033707012969253183b8f192f0a6e512 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 26 May 2024 19:28:02 +0100
Subject: [PATCH] Trim before sorting.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17046
---
 eeschema/fields_data_model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/fields_data_model.cpp b/eeschema/fields_data_model.cpp
index 9dc8da718f..75ed29c8fa 100644
--- a/eeschema/fields_data_model.cpp
+++ b/eeschema/fields_data_model.cpp
@@ -317,8 +317,8 @@ bool FIELDS_EDITOR_GRID_DATA_MODEL::cmp( const DATA_MODEL_ROW&          lhGroup,
 
     // Primary sort key is sortCol; secondary is always REFERENCE (column 0)
 
-    wxString lhs = dataModel->GetValue( (DATA_MODEL_ROW&) lhGroup, sortCol );
-    wxString rhs = dataModel->GetValue( (DATA_MODEL_ROW&) rhGroup, sortCol );
+    wxString lhs = dataModel->GetValue( lhGroup, sortCol ).Trim( true ).Trim( false );
+    wxString rhs = dataModel->GetValue( rhGroup, sortCol ).Trim( true ).Trim( false );
 
     if( lhs == rhs || sortCol == REFERENCE_FIELD )
     {