chart2/source/view/inc/PlottingPositionHelper.hxx | 4 ++++ compilerplugins/clang/test/unusedfields.cxx | 1 + connectivity/source/inc/java/tools.hxx | 4 ++++ external/breakpad/UnpackedTarball_breakpad.mk | 1 + external/breakpad/include.patch | 10 ++++++++++ external/ct2n/include.patch.0 | 10 ++++++++++ external/pdfium/include.patch | 11 +++++++++++ forms/source/xforms/propertysetbase.hxx | 1 + fpicker/source/office/contentenumeration.hxx | 4 ++++ include/sfx2/sidebar/SidebarPanelBase.hxx | 4 ++++ include/vcl/BitmapBuffer.hxx | 4 ++++ include/vcl/filter/PngImageReader.hxx | 4 ++++ shell/source/backends/kf5be/kf5backend.cxx | 2 ++ sot/source/unoolestorage/xolesimplestorage.hxx | 2 ++ starmath/inc/token.hxx | 2 ++ sw/source/uibase/docvw/OverlayRanges.hxx | 1 + sw/source/uibase/docvw/ShadowOverlayObject.hxx | 4 ++++ unoxml/qa/unit/domtest.cxx | 8 ++++---- xmlsecurity/source/gpg/SecurityEnvironment.hxx | 3 +++ xmlsecurity/source/helper/ooxmlsecparser.hxx | 1 + xmlsecurity/source/helper/xsecparser.hxx | 1 + 21 files changed, 78 insertions(+), 4 deletions(-)
New commits: commit f75130dcf240f3fe0d11d4374e1ad4e36d92e416 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 4 17:00:06 2024 +0000 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Feb 27 23:45:14 2024 +0100 std::size/SAL_N_ELEMENTS also counts the null terminator which libxml2 2.12 will fail on with error: 'Extra content at the end of the document' Change-Id: I9d5da9fdd826cce8462ede8c510eaea7281b760f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161627 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161643 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 0a80d2a4cadc..f9bdec2917eb 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -207,9 +207,9 @@ struct BasicTest : public test::BootstrapFixture mxErrHandler.set( new ErrorHandler() ); uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); - mxValidInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); - mxWarningInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(warningTestFile), SAL_N_ELEMENTS(warningTestFile))) ); - mxErrorInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(errorTestFile), SAL_N_ELEMENTS(errorTestFile))) ); + mxValidInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile)-1)) ); + mxWarningInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(warningTestFile), SAL_N_ELEMENTS(warningTestFile)-1)) ); + mxErrorInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(errorTestFile), SAL_N_ELEMENTS(errorTestFile)-1)) ); mxDomBuilder->setErrorHandler(mxErrHandler.get()); } @@ -293,7 +293,7 @@ struct SerializerTest : public test::BootstrapFixture mxErrHandler.set( new ErrorHandler() ); uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); - mxInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); + mxInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile)-1)) ); mxDomBuilder->setErrorHandler(mxErrHandler.get()); mxHandler.set( new DocumentHandler ); mxTokHandler.set( new TokenHandler ); commit 92b398862f773e49cb5fe4b0363ef99775eac1b7 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Aug 9 23:07:12 2021 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Feb 27 23:45:13 2024 +0100 Missing include (for std::unique_ptr, with recent libstdc++ 12 trunk) Change-Id: I61b7823dd740ea7cdfe0d7403a50ac73b24d1c4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120229 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 74fc37cdea80..3343196e7e45 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX +#include <sal/config.h> + +#include <memory> + #include <chartview/ExplicitScaleValues.hxx> #include <basegfx/range/b2drectangle.hxx> diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx index 2ec4ab815414..205e1a605203 100644 --- a/compilerplugins/clang/test/unusedfields.cxx +++ b/compilerplugins/clang/test/unusedfields.cxx @@ -11,6 +11,7 @@ // expected-no-diagnostics #else +#include <memory> #include <vector> #include <ostream> #include <com/sun/star/uno/Any.hxx> diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index e3763cd655a0..f8e694063374 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX +#include <sal/config.h> + +#include <memory> + #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.h> diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index d46901e0a39c..7111495843bf 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <map> +#include <memory> namespace com { namespace sun { namespace star { namespace uno { class Any; diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index 0f6e37277376..d568f9b07f8c 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX #define INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX +#include <sal/config.h> + +#include <memory> + #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <salhelper/thread.hxx> #include <ucbhelper/content.hxx> diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index f1cc0e26b93d..4f28b632f37e 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX #define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX +#include <sal/config.h> + +#include <memory> + #include <sfx2/dllapi.h> #include <cppuhelper/compbase.hxx> diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx index 3686e5fcb508..d6f1c8232c0a 100644 --- a/include/vcl/BitmapBuffer.hxx +++ b/include/vcl/BitmapBuffer.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_VCL_BITMAPBUFFER_HXX #define INCLUDED_VCL_BITMAPBUFFER_HXX +#include <sal/config.h> + +#include <memory> + #include <vcl/dllapi.h> #include <vcl/BitmapPalette.hxx> #include <vcl/ColorMask.hxx> diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx index 97b2616883b2..4fe1bb74aa4b 100644 --- a/include/vcl/filter/PngImageReader.hxx +++ b/include/vcl/filter/PngImageReader.hxx @@ -11,6 +11,10 @@ #ifndef INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX #define INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX +#include <sal/config.h> + +#include <memory> + #include <vcl/dllapi.h> #include <com/sun/star/uno/Reference.hxx> diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx index f55a5150bd3f..e6a349358e5f 100644 --- a/shell/source/backends/kf5be/kf5backend.cxx +++ b/shell/source/backends/kf5be/kf5backend.cxx @@ -19,6 +19,8 @@ #include <sal/config.h> +#include <memory> + #include <QtWidgets/QApplication> #include <boost/noncopyable.hpp> diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index af97164c1090..20260dc42782 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -22,6 +22,8 @@ #include <sal/config.h> +#include <memory> + #include <com/sun/star/embed/XOLESimpleStorage.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index 8abe85e61858..45538077da73 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -23,6 +23,8 @@ #include <rtl/ustring.hxx> #include <o3tl/typed_flags_set.hxx> +#include <memory> + // TokenGroups enum class TG { NONE = 0x000000, diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index f8ea5694b128..8deecac241fd 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -23,6 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <basegfx/range/b2drange.hxx> +#include <memory> #include <vector> #include <memory> diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index 4b333cf4c06f..506b801d0991 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX #define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX +#include <sal/config.h> + +#include <memory> + #include <svx/sdr/overlay/overlayobject.hxx> #include <memory> diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx index f3213e77e23b..5ed662afa5cc 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx @@ -11,6 +11,9 @@ #define INCLUDED_XMLSECURITY_SOURCE_GPG_SECURITYENVIRONMENT_HXX #include <sal/config.h> + +#include <memory> + #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index 5fe6f53eb701..bb27a219ea28 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -18,6 +18,7 @@ #include <xmloff/nmspmap.hxx> #include <memory> +#include <optional> #include <stack> class XSecController; diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index a54bbdac37a5..3abaf7c7e8be 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -28,6 +28,7 @@ #include <xmloff/nmspmap.hxx> #include <memory> +#include <optional> #include <stack> class XMLSignatureHelper; commit e1f41f200a6a2d89571bfa539a9e2584287a9493 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon May 23 10:21:54 2022 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Feb 27 23:45:13 2024 +0100 Missing #include <stdint.h> in various external code ...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including <cstdint> for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include <stdint.h> rather than <cstdint>.) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/breakpad/UnpackedTarball_breakpad.mk b/external/breakpad/UnpackedTarball_breakpad.mk index af6f68053328..d69c83c936ce 100644 --- a/external/breakpad/UnpackedTarball_breakpad.mk +++ b/external/breakpad/UnpackedTarball_breakpad.mk @@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\ external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1 \ external/breakpad/c++20-allocator.patch \ external/breakpad/SIGSTKSZ.patch \ + external/breakpad/include.patch \ )) ifeq ($(COM_IS_CLANG),TRUE) diff --git a/external/breakpad/include.patch b/external/breakpad/include.patch new file mode 100644 index 000000000000..e90ae9c11744 --- /dev/null +++ b/external/breakpad/include.patch @@ -0,0 +1,10 @@ +--- src/client/linux/handler/minidump_descriptor.h ++++ src/client/linux/handler/minidump_descriptor.h +@@ -31,6 +31,7 @@ + #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ + + #include <assert.h> ++#include <stdint.h> + #include <sys/types.h> + + #include <string> diff --git a/external/ct2n/include.patch.0 b/external/ct2n/include.patch.0 new file mode 100644 index 000000000000..8852b533311d --- /dev/null +++ b/external/ct2n/include.patch.0 @@ -0,0 +1,10 @@ +--- core/src/textcodec/JPTextEncoder.cpp ++++ core/src/textcodec/JPTextEncoder.cpp +@@ -36,6 +36,7 @@ + // and the grateful thanks of the Qt team. + + #include "JPTextEncoder.h" ++#include <stdint.h> + + /* + * This data is derived from Unicode 1.1, diff --git a/external/pdfium/include.patch b/external/pdfium/include.patch new file mode 100644 index 000000000000..75c0e3b9272a --- /dev/null +++ b/external/pdfium/include.patch @@ -0,0 +1,11 @@ +--- constants/annotation_flags.h ++++ constants/annotation_flags.h +@@ -5,6 +5,8 @@ + #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ + #define CONSTANTS_ANNOTATION_FLAGS_H_ + ++#include <stdint.h> ++ + namespace pdfium { + namespace annotation_flags { +
