From a804198424f3ec6274be9eed776562e1f4b20241 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Tue, 15 Jul 2025 11:27:19 +0200 Subject: [PATCH] reportdesign: Merge Library_rptxml into Library_rpt This will allow creating instances of the C++ classes involved in XML export directly from rpt instead of going via the UNO service constructors/abstraction to do so (currently in OReportDefinition::WriteThroughComponent). Writer also doesn't split the core model and XML export logic in into separate libraries (see sw/Library_sw.mk). rpt pch was updated using this command: ./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system --include:module --include:local Change-Id: I40a0fbe4bb3ef679b2255f891e8a6b67d442fd5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187910 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- Repository.mk | 1 - bin/update_pch | 1 - reportdesign/Library_rpt.mk | 29 +++++ reportdesign/Library_rptxml.mk | 81 ------------ reportdesign/Module_reportdesign.mk | 1 - reportdesign/inc/pch/precompiled_rpt.hxx | 46 ++++--- reportdesign/inc/pch/precompiled_rptxml.cxx | 12 -- reportdesign/inc/pch/precompiled_rptxml.hxx | 116 ------------------ reportdesign/util/rpt.component | 56 +++++++++ reportdesign/util/rptxml.component | 78 ------------ .../gbuild/extensions/pre_MergedLibsList.mk | 1 - 11 files changed, 116 insertions(+), 306 deletions(-) delete mode 100644 reportdesign/Library_rptxml.mk delete mode 100644 reportdesign/inc/pch/precompiled_rptxml.cxx delete mode 100644 reportdesign/inc/pch/precompiled_rptxml.hxx delete mode 100644 reportdesign/util/rptxml.component diff --git a/Repository.mk b/Repository.mk index ffe619045326..53469a5e43f3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -557,7 +557,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,python, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \ rpt \ rptui \ - rptxml \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ diff --git a/bin/update_pch b/bin/update_pch index 9a50a1782c01..bde3e6b75f30 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -84,7 +84,6 @@ DEFAULTS = \ 'package.xstor' : ( 2, EXCLUDE, INCLUDE, EXCLUDE), # 3.8 'reportdesign.rpt' : ( 9, EXCLUDE, INCLUDE, INCLUDE), # 9.4 'reportdesign.rptui' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 13.1 - 'reportdesign.rptxml' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 7.6 'sal.sal' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 4.2 'sc.sc' : (12, EXCLUDE, INCLUDE, INCLUDE), # 92.6 'sc.scfilt' : ( 4, EXCLUDE, EXCLUDE, INCLUDE), # 39.9 diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index f785485bc4fa..4a3d7e3e10c3 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\ i18nlangtag \ sal \ salhelper \ + sax \ sfx \ svl \ svt \ @@ -50,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\ tl \ utl \ vcl \ + xo \ )) $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt,services)) @@ -87,6 +89,33 @@ $(eval $(call gb_Library_add_exception_objects,rpt,\ reportdesign/source/core/sdr/RptPage \ reportdesign/source/core/sdr/UndoActions \ reportdesign/source/core/sdr/UndoEnv \ + reportdesign/source/filter/xml/dbloader2 \ + reportdesign/source/filter/xml/xmlAutoStyle \ + reportdesign/source/filter/xml/xmlCell \ + reportdesign/source/filter/xml/xmlColumn \ + reportdesign/source/filter/xml/xmlComponent \ + reportdesign/source/filter/xml/xmlCondPrtExpr \ + reportdesign/source/filter/xml/xmlControlProperty \ + reportdesign/source/filter/xml/xmlExport \ + reportdesign/source/filter/xml/xmlExportDocumentHandler \ + reportdesign/source/filter/xml/xmlfilter \ + reportdesign/source/filter/xml/xmlFixedContent \ + reportdesign/source/filter/xml/xmlFormatCondition \ + reportdesign/source/filter/xml/xmlFormattedField \ + reportdesign/source/filter/xml/xmlFunction \ + reportdesign/source/filter/xml/xmlGroup \ + reportdesign/source/filter/xml/xmlHelper \ + reportdesign/source/filter/xml/xmlImage \ + reportdesign/source/filter/xml/xmlImportDocumentHandler \ + reportdesign/source/filter/xml/xmlMasterFields \ + reportdesign/source/filter/xml/xmlPropertyHandler \ + reportdesign/source/filter/xml/xmlReport \ + reportdesign/source/filter/xml/xmlReportElement \ + reportdesign/source/filter/xml/xmlReportElementBase \ + reportdesign/source/filter/xml/xmlSection \ + reportdesign/source/filter/xml/xmlStyleImport \ + reportdesign/source/filter/xml/xmlSubDocument \ + reportdesign/source/filter/xml/xmlTable \ )) # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk deleted file mode 100644 index c7ac8309814b..000000000000 --- a/reportdesign/Library_rptxml.mk +++ /dev/null @@ -1,81 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,rptxml)) - -$(eval $(call gb_Library_set_include,rptxml,\ - $$(INCLUDE) \ - -I$(SRCDIR)/reportdesign/inc \ - -I$(SRCDIR)/reportdesign/source/inc \ -)) - -$(eval $(call gb_Library_use_external,rptxml,boost_headers)) - -$(eval $(call gb_Library_set_precompiled_header,rptxml,reportdesign/inc/pch/precompiled_rptxml)) - -$(eval $(call gb_Library_use_sdk_api,rptxml)) - -$(eval $(call gb_Library_use_custom_headers,rptxml,\ - officecfg/registry \ -)) - -$(eval $(call gb_Library_use_libraries,rptxml,\ - comphelper \ - cppu \ - cppuhelper \ - dbtools \ - editeng \ - rpt \ - sal \ - salhelper \ - sax \ - sfx \ - sot \ - svl \ - svxcore \ - tl \ - ucbhelper \ - utl \ - vcl \ - xo \ -)) - -$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml,services)) - -$(eval $(call gb_Library_add_exception_objects,rptxml,\ - reportdesign/source/filter/xml/dbloader2 \ - reportdesign/source/filter/xml/xmlAutoStyle \ - reportdesign/source/filter/xml/xmlCell \ - reportdesign/source/filter/xml/xmlColumn \ - reportdesign/source/filter/xml/xmlComponent \ - reportdesign/source/filter/xml/xmlCondPrtExpr \ - reportdesign/source/filter/xml/xmlControlProperty \ - reportdesign/source/filter/xml/xmlExport \ - reportdesign/source/filter/xml/xmlExportDocumentHandler \ - reportdesign/source/filter/xml/xmlfilter \ - reportdesign/source/filter/xml/xmlFixedContent \ - reportdesign/source/filter/xml/xmlFormatCondition \ - reportdesign/source/filter/xml/xmlFormattedField \ - reportdesign/source/filter/xml/xmlFunction \ - reportdesign/source/filter/xml/xmlGroup \ - reportdesign/source/filter/xml/xmlHelper \ - reportdesign/source/filter/xml/xmlImage \ - reportdesign/source/filter/xml/xmlImportDocumentHandler \ - reportdesign/source/filter/xml/xmlMasterFields \ - reportdesign/source/filter/xml/xmlPropertyHandler \ - reportdesign/source/filter/xml/xmlReport \ - reportdesign/source/filter/xml/xmlReportElement \ - reportdesign/source/filter/xml/xmlReportElementBase \ - reportdesign/source/filter/xml/xmlSection \ - reportdesign/source/filter/xml/xmlStyleImport \ - reportdesign/source/filter/xml/xmlSubDocument \ - reportdesign/source/filter/xml/xmlTable \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index d827dc1ba9c6..88db258318d2 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,reportdesign)) $(eval $(call gb_Module_add_targets,reportdesign,\ Library_rpt \ Library_rptui \ - Library_rptxml \ UIConfig_dbreport \ )) diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 6e52bedf1e00..bc4c0ef7cd0f 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2023-07-19 09:28:24 using: + Generated on 2025-07-15 11:31:34 using: ./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,8 +24,12 @@ #if PCH_LEVEL >= 1 #include #include +#include #include +#include #include +#include +#include #include #include #include @@ -34,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -51,8 +56,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -74,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -133,8 +140,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -144,7 +153,6 @@ #include #include #include -#include #include #include #include @@ -152,6 +160,7 @@ #include #include #include +#include #include #include #include @@ -160,29 +169,22 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include -#include #include #include #include -#include -#include -#include -#include #include #include #include @@ -213,6 +215,7 @@ #include #include #include +#include #include #include #include @@ -233,8 +236,6 @@ #include #include #include -#include -#include #include #include #include @@ -245,10 +246,13 @@ #include #include #include +#include +#include #include #include #include #include +#include #include #include #include @@ -258,6 +262,7 @@ #include #include #include +#include #include #include #include @@ -270,6 +275,8 @@ #include #include #include +#include +#include #include #include #include @@ -277,6 +284,8 @@ #include #include #include +#include +#include #include #include #include @@ -286,6 +295,7 @@ #include #include #include +#include #include #include #include @@ -312,11 +322,17 @@ #include #include #include +#include #include #include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include diff --git a/reportdesign/inc/pch/precompiled_rptxml.cxx b/reportdesign/inc/pch/precompiled_rptxml.cxx deleted file mode 100644 index b7b388c7ee46..000000000000 --- a/reportdesign/inc/pch/precompiled_rptxml.cxx +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "precompiled_rptxml.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx b/reportdesign/inc/pch/precompiled_rptxml.hxx deleted file mode 100644 index 5879739fa19b..000000000000 --- a/reportdesign/inc/pch/precompiled_rptxml.hxx +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* - This file has been autogenerated by update_pch.sh. It is possible to edit it - manually (such as when an include file has been moved/renamed/removed). All such - manual changes will be rewritten by the next run of update_pch.sh (which presumably - also fixes all possible problems, so it's usually better to use it). - - Generated on 2021-03-08 13:14:10 using: - ./bin/update_pch reportdesign rptxml --cutoff=2 --exclude:system --exclude:module --include:local - - If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./reportdesign/inc/pch/precompiled_rptxml.hxx "make reportdesign.build" --find-conflicts -*/ - -#include -#if PCH_LEVEL >= 1 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif // PCH_LEVEL >= 1 -#if PCH_LEVEL >= 2 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif // PCH_LEVEL >= 2 -#if PCH_LEVEL >= 3 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif // PCH_LEVEL >= 3 -#if PCH_LEVEL >= 4 -#include -#include -#endif // PCH_LEVEL >= 4 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component index 7b3be6603471..b1cf9692419a 100644 --- a/reportdesign/util/rpt.component +++ b/reportdesign/util/rpt.component @@ -46,4 +46,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component deleted file mode 100644 index 7e9c3817c113..000000000000 --- a/reportdesign/util/rptxml.component +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 6e0439af7d82..00163603e34e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -171,7 +171,6 @@ gb_MERGE_LIBRARY_LIST += \ $(call gb_Helper_optional,SCRIPTING,protocolhandler) \ rpt \ rptui \ - rptxml \ $(call gb_Helper_optional,SCRIPTING,scriptframe) \ sdbc2 \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \