From ff71b324a11e529e490ee596f653a5687e011638 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 17 Nov 2024 13:09:51 +0100 Subject: [PATCH] EEschema: fix an issue in sheet cross-references of global labels. Commit 5ca34147 (a cherry pick from master branch) broke these cross-references. If was fixed later in master branch, but these changes cannot be cherry picked. So the old code is reused in 2 functions to fix the issue. Fixes https://gitlab.com/kicad/code/kicad/-/issues/18534 --- eeschema/dialogs/dialog_table_properties.cpp | 0 eeschema/schematic.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 eeschema/dialogs/dialog_table_properties.cpp diff --git a/eeschema/dialogs/dialog_table_properties.cpp b/eeschema/dialogs/dialog_table_properties.cpp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/eeschema/schematic.cpp b/eeschema/schematic.cpp index 6766ce102a..9404599a47 100644 --- a/eeschema/schematic.cpp +++ b/eeschema/schematic.cpp @@ -453,7 +453,7 @@ std::map SCHEMATIC::GetVirtualPageToSheetNamesMap() const { std::map namesMap; - for( const SCH_SHEET_PATH& sheet : GetUnorderedSheets() ) + for( const SCH_SHEET_PATH& sheet : GetSheets() ) { if( sheet.size() == 1 ) namesMap[sheet.GetVirtualPageNumber()] = _( "" ); @@ -469,7 +469,7 @@ std::map SCHEMATIC::GetVirtualPageToSheetPagesMap() const { std::map pagesMap; - for( const SCH_SHEET_PATH& sheet : GetUnorderedSheets() ) + for( const SCH_SHEET_PATH& sheet : GetSheets() ) pagesMap[sheet.GetVirtualPageNumber()] = sheet.GetPageNumber(); return pagesMap;