Repository.mk | 1
bin/update_pch | 1
reportdesign/Library_rpt.mk | 29 +++++
reportdesign/Library_rptxml.mk | 81 ---------------
reportdesign/Module_reportdesign.mk | 1
reportdesign/inc/ReportDefinition.hxx | 8 -
reportdesign/inc/pch/precompiled_rpt.hxx | 46 +++++---
reportdesign/inc/pch/precompiled_rptxml.cxx | 12 --
reportdesign/inc/pch/precompiled_rptxml.hxx | 116 ----------------------
reportdesign/source/core/api/ReportDefinition.cxx | 23 ----
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/util/rpt.component | 56 ++++++++++
reportdesign/util/rptxml.component | 78 --------------
solenv/clang-format/excludelist | 2
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1
16 files changed, 122 insertions(+), 337 deletions(-)
New commits:
commit 0dd4ca1f1e95b35928def64b0c110924855498ab
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 15 12:38:19 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jul 16 07:47:30 2025 +0200
reportdesign: Move xmlExport.hxx to inc/ directory
This will allow using it from the OReportDefinition
class in an upcoming commit.
Change-Id: I303c8dc69d0c4652b6dbec6a17867c164dd74abc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187911
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx
b/reportdesign/inc/xmlExport.hxx
similarity index 100%
rename from reportdesign/source/filter/xml/xmlExport.hxx
rename to reportdesign/inc/xmlExport.hxx
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index cceb85a45b5f..a59fc5ff4a9d 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -18,7 +18,7 @@
*/
#include "xmlAutoStyle.hxx"
#include "xmlHelper.hxx"
-#include "xmlExport.hxx"
+#include <xmlExport.hxx>
#include <xmloff/families.hxx>
namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 14c416e2333d..f6e870588afa 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -18,7 +18,7 @@
*/
#include <memory>
-#include "xmlExport.hxx"
+#include <xmlExport.hxx>
#include "xmlAutoStyle.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 66b9f4b49698..c524f7b4da60 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7171,6 +7171,7 @@ reportdesign/inc/conditionalexpression.hxx
reportdesign/inc/helpids.h
reportdesign/inc/reportformula.hxx
reportdesign/inc/strings.hxx
+reportdesign/inc/xmlExport.hxx
reportdesign/source/core/api/FixedLine.cxx
reportdesign/source/core/api/FixedText.cxx
reportdesign/source/core/api/FormatCondition.cxx
@@ -7236,7 +7237,6 @@ reportdesign/source/filter/xml/xmlControlProperty.cxx
reportdesign/source/filter/xml/xmlControlProperty.hxx
reportdesign/source/filter/xml/xmlEnums.hxx
reportdesign/source/filter/xml/xmlExport.cxx
-reportdesign/source/filter/xml/xmlExport.hxx
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
reportdesign/source/filter/xml/xmlFixedContent.cxx
commit a804198424f3ec6274be9eed776562e1f4b20241
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 15 11:27:19 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jul 16 07:47:24 2025 +0200
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 <m.wegh...@posteo.de>
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 <algorithm>
#include <array>
+#include <atomic>
#include <cassert>
+#include <climits>
#include <cmath>
+#include <compare>
+#include <concepts>
#include <cstddef>
#include <cstdlib>
#include <cstring>
@@ -34,6 +38,7 @@
#include <functional>
#include <initializer_list>
#include <iomanip>
+#include <iterator>
#include <limits.h>
#include <limits>
#include <map>
@@ -51,8 +56,8 @@
#include <string.h>
#include <string>
#include <string_view>
+#include <tuple>
#include <type_traits>
-#include <typeinfo>
#include <unordered_map>
#include <unordered_set>
#include <utility>
@@ -74,6 +79,7 @@
#include <rtl/instance.hxx>
#include <rtl/locale.h>
#include <rtl/math.h>
+#include <rtl/math.hxx>
#include <rtl/ref.hxx>
#include <rtl/strbuf.h>
#include <rtl/strbuf.hxx>
@@ -84,6 +90,7 @@
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
#include <rtl/unload.h>
+#include <rtl/ustrbuf.h>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
@@ -133,8 +140,10 @@
#include <vcl/salnativewidgets.hxx>
#include <vcl/settings.hxx>
#include <vcl/task.hxx>
+#include <vcl/themecolors.hxx>
#include <vcl/timer.hxx>
#include <vcl/vclenum.hxx>
+#include <vcl/vclevent.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
#include <vcl/vectorgraphicdata.hxx>
@@ -144,7 +153,6 @@
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/matrix/hommatrixtemplate.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/point/b2ipoint.hxx>
@@ -152,6 +160,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/Range2D.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/tuple/Size2D.hxx>
#include <basegfx/tuple/Tuple2D.hxx>
@@ -160,29 +169,22 @@
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
#include <basegfx/utils/common.hxx>
+#include <basegfx/utils/systemdependentdata.hxx>
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/vector/b2ivector.hxx>
#include <com/sun/star/awt/DeviceInfo.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/lang/Locale.hpp>
@@ -213,6 +215,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/XAccounting.hpp>
+#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <comphelper/compbase.hxx>
#include <comphelper/comphelperdllapi.h>
#include <comphelper/diagnose_ex.hxx>
@@ -233,8 +236,6 @@
#include <cppuhelper/implbase_ex_post.hxx>
#include <cppuhelper/implbase_ex_pre.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/propertysetmixin.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakagg.hxx>
@@ -245,10 +246,13 @@
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <editeng/EPaM.hxx>
+#include <editeng/ESelection.hxx>
#include <editeng/editengdllapi.h>
#include <editeng/outlobj.hxx>
#include <editeng/paragraphdata.hxx>
#include <i18nlangtag/lang.h>
+#include <o3tl/concepts.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/safeint.hxx>
#include <o3tl/strong_int.hxx>
@@ -258,6 +262,7 @@
#include <salhelper/salhelperdllapi.h>
#include <salhelper/simplereferenceobject.hxx>
#include <sfx2/dllapi.h>
+#include <sot/formats.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svl/cenumitm.hxx>
#include <svl/eitem.hxx>
@@ -270,6 +275,8 @@
#include <svl/svldllapi.h>
#include <svl/typedwhich.hxx>
#include <svl/whichranges.hxx>
+#include <svtools/colorcfg.hxx>
+#include <svtools/svtdllapi.h>
#include <svx/itextprovider.hxx>
#include <svx/sdr/properties/defaultproperties.hxx>
#include <svx/sdr/properties/properties.hxx>
@@ -277,6 +284,8 @@
#include <svx/sdtaitm.hxx>
#include <svx/sdtakitm.hxx>
#include <svx/svddef.hxx>
+#include <svx/svdgeodata.hxx>
+#include <svx/svdglue.hxx>
#include <svx/svdoattr.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdobjkind.hxx>
@@ -286,6 +295,7 @@
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
#include <svx/xdef.hxx>
+#include <tools/UniqueID.hxx>
#include <tools/color.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
@@ -312,11 +322,17 @@
#include <uno/data.h>
#include <uno/sequence2.h>
#include <unotools/fontdefs.hxx>
+#include <unotools/options.hxx>
#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
-#include <unotools/tempfile.hxx>
#include <unotools/unotoolsdllapi.h>
-#include <unotools/weakref.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
+#include <xmloff/dllapi.h>
+#include <xmloff/namespacemap.hxx>
+#include <xmloff/xmlictxt.hxx>
+#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmluconv.hxx>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#include <RptModel.hxx>
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 <sal/config.h>
-#if PCH_LEVEL >= 1
-#include <cassert>
-#include <cstddef>
-#include <cstring>
-#include <functional>
-#include <limits>
-#include <memory>
-#include <new>
-#include <string_view>
-#include <type_traits>
-#include <vector>
-#endif // PCH_LEVEL >= 1
-#if PCH_LEVEL >= 2
-#include <osl/diagnose.h>
-#include <osl/endian.h>
-#include <rtl/math.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/strbuf.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/string.hxx>
-#include <rtl/stringconcat.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textenc.h>
-#include <rtl/ustrbuf.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/log.hxx>
-#include <sal/types.h>
-#include <vcl/dllapi.h>
-#include <vcl/svapp.hxx>
-#endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
-#include <basegfx/color/bcolor.hxx>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/ImageScaleMode.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
-#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/reflection/ProxyFactory.hpp>
-#include <com/sun/star/report/ForceNewPage.hpp>
-#include <com/sun/star/report/GroupOn.hpp>
-#include <com/sun/star/report/KeepTogether.hpp>
-#include <com/sun/star/report/ReportPrintOption.hpp>
-#include <com/sun/star/report/XFixedLine.hpp>
-#include <com/sun/star/report/XFixedText.hpp>
-#include <com/sun/star/report/XShape.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/util/MeasureUnit.hpp>
-#include <comphelper/comphelperdllapi.h>
-#include <comphelper/documentconstants.hxx>
-#include <comphelper/genericpropertyset.hxx>
-#include <comphelper/propertysetinfo.hxx>
-#include <comphelper/sequenceashashmap.hxx>
-#include <connectivity/dbtools.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include <tools/color.hxx>
-#include <comphelper/diagnose_ex.hxx>
-#include <tools/link.hxx>
-#include <tools/toolsdllapi.h>
-#include <unotools/options.hxx>
-#include <unotools/saveopt.hxx>
-#include <unotools/unotoolsdllapi.h>
-#include <xmloff/ProgressBarHelper.hxx>
-#include <xmloff/dllapi.h>
-#include <xmloff/families.hxx>
-#include <xmloff/maptype.hxx>
-#include <xmloff/namespacemap.hxx>
-#include <xmloff/prstylei.hxx>
-#include <xmloff/txtimp.hxx>
-#include <xmloff/xmlement.hxx>
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimppr.hxx>
-#include <xmloff/xmlnamespace.hxx>
-#include <xmloff/xmlstyle.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmluconv.hxx>
-#endif // PCH_LEVEL >= 3
-#if PCH_LEVEL >= 4
-#include <RptDef.hxx>
-#include <strings.hxx>
-#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 @@
<implementation name="com.sun.star.comp.report.Shape">
<service name="com.sun.star.report.Shape"/>
</implementation>
+ <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter"
+ constructor="reportdesign_XMLOasisContentImporter_get_implementation">
+ <service name="com.sun.star.comp.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter"
+ constructor="reportdesign_ORptMetaImportHelper_get_implementation">
+ <service name="com.sun.star.comp.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter"
+ constructor="reportdesign_ORptImportHelper_get_implementation">
+ <service name="com.sun.star.comp.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter"
+ constructor="reportdesign_ORptStylesImportHelper_get_implementation">
+ <service name="com.sun.star.comp.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.ExportDocumentHandler"
+ constructor="reportdesign_ExportDocumentHandler_get_implementation">
+ <service name="com.sun.star.report.ExportDocumentHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.ExportFilter"
+ constructor="reportdesign_ORptExport_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.ImportDocumentHandler"
+ constructor="reportdesign_ImportDocumentHandler_get_implementation">
+ <service name="com.sun.star.report.ImportDocumentHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.OReportFilter"
+ constructor="reportdesign_OReportFilter_get_implementation">
+ <service name="com.sun.star.comp.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.ORptTypeDetection"
+ constructor="reportdesign_ORptTypeDetection_get_implementation">
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.XMLContentExporter"
+ constructor="reportdesign_ORptContentExportHelper_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.XMLFullExporter"
+ constructor="reportdesign_ODBFullExportHelper_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.XMLMetaExporter"
+ constructor="reportdesign_ORptMetaExportHelper_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.XMLSettingsExporter"
+ constructor="reportdesign_ORptExportHelper_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.report.XMLStylesExporter"
+ constructor="reportdesign_ORptStylesExportHelper_get_implementation">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
</component>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter"
- constructor="reportdesign_XMLOasisContentImporter_get_implementation">
- <service name="com.sun.star.comp.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter"
- constructor="reportdesign_ORptMetaImportHelper_get_implementation">
- <service name="com.sun.star.comp.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter"
- constructor="reportdesign_ORptImportHelper_get_implementation">
- <service name="com.sun.star.comp.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter"
- constructor="reportdesign_ORptStylesImportHelper_get_implementation">
- <service name="com.sun.star.comp.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.ExportDocumentHandler"
- constructor="reportdesign_ExportDocumentHandler_get_implementation">
- <service name="com.sun.star.report.ExportDocumentHandler"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.ExportFilter"
- constructor="reportdesign_ORptExport_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.ImportDocumentHandler"
- constructor="reportdesign_ImportDocumentHandler_get_implementation">
- <service name="com.sun.star.report.ImportDocumentHandler"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.OReportFilter"
- constructor="reportdesign_OReportFilter_get_implementation">
- <service name="com.sun.star.comp.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.ORptTypeDetection"
- constructor="reportdesign_ORptTypeDetection_get_implementation">
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.XMLContentExporter"
- constructor="reportdesign_ORptContentExportHelper_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.XMLFullExporter"
- constructor="reportdesign_ODBFullExportHelper_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.XMLMetaExporter"
- constructor="reportdesign_ORptMetaExportHelper_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.XMLSettingsExporter"
- constructor="reportdesign_ORptExportHelper_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.report.XMLStylesExporter"
- constructor="reportdesign_ORptStylesExportHelper_get_implementation">
- <service name="com.sun.star.document.ExportFilter"/>
- </implementation>
-</component>
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) \
commit 4ae7bf9a4fe28752332166c2089e980692a3e1b6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 15 10:10:34 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jul 16 07:47:15 2025 +0200
reportdesign: Merge the 2 OReportDefinition::WriteThroughComponent
Change-Id: I9d51aaadb841f71df8451aff379a370eb196d708
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187909
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index 7687b7eebd15..8a25cfd9404f 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -137,14 +137,6 @@ namespace reportdesign
const css::uno::Sequence< css::uno::Any> & rArguments,
const css::uno::Reference< css::embed::XStorage >&
_xStorageToSaveTo);
- /// write a single output stream
- /// (to be called either directly or by WriteThroughComponent(...))
- bool WriteThroughComponent(
- const css::uno::Reference< css::io::XOutputStream> & xOutputStream,
- const css::uno::Reference< css::lang::XComponent> & xComponent,
- const OUString& rServiceName,
- const css::uno::Sequence< css::uno::Any> & rArguments);
-
void notifyEvent(const OUString& _sEventName);
void init();
void fillArgs(utl::MediaDescriptor& _aDescriptor);
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index ab4ee631e0dc..1585d161f99c 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1449,6 +1449,8 @@ bool OReportDefinition::WriteThroughComponent(
const uno::Sequence<uno::Any> & rArguments,
const uno::Reference<embed::XStorage>& _xStorageToSaveTo)
{
+ OSL_ENSURE( xComponent.is(), "Need component!" );
+
// open stream
uno::Reference<io::XStream> xStream =
_xStorageToSaveTo->openStreamElement(rStreamName,
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE);
@@ -1474,25 +1476,6 @@ bool OReportDefinition::WriteThroughComponent(
xStreamProp->setPropertyValue( u"UseCommonStoragePasswordEncryption"_ustr,
uno::Any( true ) );
- // set buffer and create outputstream
-
- // write the stuff
- bool bRet = WriteThroughComponent(
- xOutputStream, xComponent,
- rServiceName, rArguments);
- // finally, commit stream.
- return bRet;
-}
-
-bool OReportDefinition::WriteThroughComponent(
- const uno::Reference<io::XOutputStream> & xOutputStream,
- const uno::Reference<lang::XComponent> & xComponent,
- const OUString& rServiceName,
- const uno::Sequence<uno::Any> & rArguments)
-{
- OSL_ENSURE( xOutputStream.is(), "I really need an output stream!" );
- OSL_ENSURE( xComponent.is(), "Need component!" );
-
// get component
uno::Reference< xml::sax::XWriter > xSaxWriter(
xml::sax::Writer::create(m_aProps->m_xContext) );
@@ -1511,7 +1494,7 @@ bool OReportDefinition::WriteThroughComponent(
m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
rServiceName, aArgs, m_aProps->m_xContext), uno::UNO_QUERY);
OSL_ENSURE( xExporter.is(),
- "can't instantiate export filter component" );
+ "can't instantiate export filter component" );
if( !xExporter.is() )
return false;
