summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-11-24 09:09:02 +0000
committerMiklos Vajna <vmiklos@collabora.com>2023-11-28 16:27:13 +0100
commit572bbe30c4242a5360144c223171a8efce28fda4 (patch)
treecc26a8fd2704d1cf82b360165c4029ab5687cf3c
parentBump version to 21.06.39.1 (diff)
downloadcore-572bbe30c4242a5360144c223171a8efce28fda4.tar.gz
core-572bbe30c4242a5360144c223171a8efce28fda4.zip
fix build for more recent compilers
Change-Id: Ie4729f9e4b0706b1d25dfaef4f558b985561af63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159918 Tested-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx1
-rw-r--r--external/liborcus/include.patch.010
-rw-r--r--external/libpagemaker/UnpackedTarball_libpagemaker.mk6
-rw-r--r--external/libpagemaker/includes.patch10
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.hxx1
-rw-r--r--forms/source/component/EventThread.hxx1
-rw-r--r--forms/source/xforms/propertysetbase.hxx1
-rw-r--r--fpicker/source/office/contentenumeration.cxx1
-rw-r--r--fpicker/source/office/contentenumeration.hxx1
-rw-r--r--framework/inc/uielement/toolbarwrapper.hxx1
-rw-r--r--include/oox/crypto/StrongEncryptionDataSpace.hxx1
-rw-r--r--include/sfx2/sidebar/SidebarPanelBase.hxx1
-rw-r--r--include/svtools/imageresourceaccess.hxx1
-rw-r--r--include/vcl/font/Feature.hxx1
-rw-r--r--io/source/acceptor/acc_pipe.cxx1
-rw-r--r--io/source/acceptor/acc_socket.cxx1
-rw-r--r--io/source/connector/connector.cxx1
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.hxx1
-rw-r--r--starmath/inc/token.hxx1
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx1
-rw-r--r--sw/source/uibase/docvw/OverlayRanges.hxx1
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.hxx1
-rw-r--r--xmlsecurity/source/helper/ooxmlsecparser.hxx1
-rw-r--r--xmlsecurity/source/helper/xsecparser.hxx1
24 files changed, 47 insertions, 0 deletions
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 9e40dab0a79d..9d7838bf2018 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/Optional.hpp>
+#include <memory>
#include <vector>
namespace weld { class Builder; class Widget; class Window; }
diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0
index a3275b1b13fa..ee7dfd57372c 100644
--- a/external/liborcus/include.patch.0
+++ b/external/liborcus/include.patch.0
@@ -28,3 +28,13 @@
using namespace std;
+--- include/orcus/types.hpp
++++ include/orcus/types.hpp
+@@ -16,6 +16,7 @@
+ #pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+
++#include <cstdint>
+ #include <cstdlib>
+ #include <vector>
+ #include <string>
diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
index 752d5c0ebe21..aca23bee600c 100644
--- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk
+++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
@@ -11,6 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libpagemaker))
$(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0))
+
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libpagemaker))
+$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
+ external/libpagemaker/includes.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libpagemaker/includes.patch b/external/libpagemaker/includes.patch
new file mode 100644
index 000000000000..25723cc866a1
--- /dev/null
+++ b/external/libpagemaker/includes.patch
@@ -0,0 +1,10 @@
+--- src/lib/PMDTypes.h
++++ src/lib/PMDTypes.h
+@@ -11,6 +11,7 @@
+ #define __PMDTYPES_H__
+
+ #include <boost/optional.hpp>
++#include <cstdint>
+
+ #include "Units.h"
+
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 7e469fb202fb..1e36221b0110 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
#include <vector>
class filter_info_impl;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index be9e9696734e..20aff73113db 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
+#include <memory>
#include <vector>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index d6ba2efda2eb..a69ad487d4ea 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <map>
+#include <memory>
namespace com::sun::star::uno {
class Any;
diff --git a/fpicker/source/office/contentenumeration.cxx b/fpicker/source/office/contentenumeration.cxx
index 044e67e7bc43..8a773ce207bc 100644
--- a/fpicker/source/office/contentenumeration.cxx
+++ b/fpicker/source/office/contentenumeration.cxx
@@ -34,6 +34,7 @@
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
+#include <memory>
namespace svt
{
diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx
index f6a48c5c3360..9c36f0372ee7 100644
--- a/fpicker/source/office/contentenumeration.hxx
+++ b/fpicker/source/office/contentenumeration.hxx
@@ -25,6 +25,7 @@
#include <ucbhelper/content.hxx>
#include <rtl/ustring.hxx>
#include <tools/datetime.hxx>
+#include <memory>
namespace svt
{
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index fcbb15ce17e9..6526b364df6f 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ui/XUIFunctionListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
namespace weld
{
diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx
index f3fcff9edaab..0399d03b6eee 100644
--- a/include/oox/crypto/StrongEncryptionDataSpace.hxx
+++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx
@@ -17,6 +17,7 @@
#include <com/sun/star/packages/XPackageEncryption.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <oox/crypto/CryptoEngine.hxx>
+#include <memory>
namespace com::sun::star::uno
{
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 971e286ca74f..94adaad938e3 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/ui/XToolPanel.hpp>
#include <com/sun/star/ui/XSidebarPanel.hpp>
#include <com/sun/star/ui/XUpdateModel.hpp>
+#include <memory>
class PanelLayout;
diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index d7e8a5629b11..3686385adf14 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -23,6 +23,7 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/uno/Reference.hxx>
+#include <memory>
namespace com :: sun :: star :: io { class XInputStream; }
namespace com :: sun :: star :: uno { class XComponentContext; }
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 13c798fbcf32..65992a309c17 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -12,6 +12,7 @@
#include <vcl/dllapi.h>
#include <rtl/ustring.hxx>
+#include <cstdint>
#include <vector>
namespace vcl::font
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 69f1cad79206..c671e2a278a8 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -26,6 +26,7 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <cppuhelper/implbase.hxx>
+#include <memory>
using namespace ::osl;
using namespace ::cppu;
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 9700cd566bb8..41722235ff21 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -19,6 +19,7 @@
#include "acceptor.hxx"
+#include <memory>
#include <unordered_set>
#include <osl/mutex.hxx>
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index c6f01e130814..88e2332957f3 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include "connector.hxx"
+#include <memory>
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.Connector"
#define SERVICE_NAME "com.sun.star.connection.Connector"
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index ef0214ba61c3..3169c9ccc1be 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -27,6 +27,7 @@
#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
+#include <memory>
namespace com::sun::star::container { class XNameAccess; }
namespace com::sun::star::io { class XInputStream; }
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index cc295cc5fe28..555799b6bee8 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -34,6 +34,7 @@
#include <rtl/ustring.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <tools/color.hxx>
+#include <memory>
// TokenGroups
enum class TG
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index e31765478cf0..e3a6d7d2cae2 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/interfacecontainer2.hxx>
+#include <memory>
namespace textconversiondlgs
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index e086b8462ea2..829f0c4001dc 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -22,6 +22,7 @@
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <memory>
#include <vector>
class SwView;
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index df8e27009f5e..4d43849cbbe8 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -20,6 +20,7 @@
#pragma once
#include <svx/sdr/overlay/overlayobject.hxx>
+#include <memory>
class SwView;
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx
index 4c6d06caaa31..a72c5d4cc8e9 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx
@@ -17,6 +17,7 @@
#include <xmloff/namespacemap.hxx>
+#include <memory>
#include <stack>
class XSecController;
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 6dcc29985c85..f58a030138b2 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -27,6 +27,7 @@
#include <xmloff/namespacemap.hxx>
+#include <memory>
#include <stack>
class XMLSignatureHelper;