This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch win10-msvc-trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4780b8be601759b452bf0563fbf624ac4df77997 Author: Peter Kovacs <[email protected]> AuthorDate: Fri Aug 21 17:48:43 2026 +0200 connectivity: drop the precompiled header the rebase resolver kept twice TTableHelper.cxx(26): fatal error C1083: Cannot open include file: 'precompiled_connectivity.hxx' My mistake, in the rebase rather than in the port. trunk RENAMED precompiled_connectivity.hxx to per-library headers, and these two files were among the three the rebase stopped on -- our commits had added an #include immediately beneath the old name. The resolver I wrote for that conflict shape takes HEAD's block and appends any #include line from our side that HEAD does not have, which is right when the line is an addition and wrong when it is the old half of a rename. So both names survived, and one of them no longer exists. DiagramHelper.cxx, the third file, was resolved by hand and is correct. Only these two went through the resolver. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01W7pjcp2sXU1HaUwXT7kc29 --- main/connectivity/source/commontools/TTableHelper.cxx | 1 - main/connectivity/source/parse/sqliterator.cxx | 1 - 2 files changed, 2 deletions(-) diff --git a/main/connectivity/source/commontools/TTableHelper.cxx b/main/connectivity/source/commontools/TTableHelper.cxx index 855956a8b1..d3c42fe0c7 100644 --- a/main/connectivity/source/commontools/TTableHelper.cxx +++ b/main/connectivity/source/commontools/TTableHelper.cxx @@ -23,7 +23,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbtools.hxx" -#include "precompiled_connectivity.hxx" #include <iterator> #include "connectivity/TTableHelper.hxx" #include <com/sun/star/sdbc/XRow.hpp> diff --git a/main/connectivity/source/parse/sqliterator.cxx b/main/connectivity/source/parse/sqliterator.cxx index 49ae3b2380..6fceaadcd2 100644 --- a/main/connectivity/source/parse/sqliterator.cxx +++ b/main/connectivity/source/parse/sqliterator.cxx @@ -23,7 +23,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbtools.hxx" -#include "precompiled_connectivity.hxx" #include <iterator> #include "connectivity/sqliterator.hxx" #include "connectivity/sdbcx/VTable.hxx"
