external/liborcus/gcc9.patch.0 | 4 ++- external/libpagemaker/UnpackedTarball_libpagemaker.mk | 4 +++ external/python3/python-3.5.4-ssl.patch.1 | 11 ++++++++++ filter/source/xsltdialog/xmlfilterjar.hxx | 1 forms/source/component/EventThread.hxx | 1 include/svtools/imageresourceaccess.hxx | 2 + include/svx/hexcolorcontrol.hxx | 2 + include/vcl/BitmapBuffer.hxx | 2 + include/vcl/font/Feature.hxx | 1 io/source/acceptor/acc_pipe.cxx | 2 + io/source/acceptor/acc_socket.cxx | 1 io/source/connector/connector.cxx | 2 + sot/source/unoolestorage/xolesimplestorage.hxx | 2 + svtools/source/contnr/contentenumeration.hxx | 2 + svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 1 sw/IwyuFilter_sw.yaml | 6 +++++ sw/source/filter/docx/swdocxreader.hxx | 2 - sw/source/filter/html/htmlctxt.cxx | 3 ++ sw/source/filter/html/htmldrawreader.cxx | 1 sw/source/filter/html/htmlfly.hxx | 1 sw/source/filter/html/htmlform.hxx | 2 + sw/source/filter/html/htmlnumreader.cxx | 1 sw/source/filter/html/parcss1.hxx | 5 ++++ sw/source/filter/html/svxcss1.hxx | 1 sw/source/filter/html/swcss1.hxx | 3 ++ sw/source/filter/html/swhtml.cxx | 1 sw/source/filter/html/swhtml.hxx | 1 sw/source/filter/html/wrthtml.hxx | 2 - sw/source/filter/inc/fltshell.hxx | 5 ---- sw/source/filter/inc/msfilter.hxx | 4 --- sw/source/filter/inc/rtf.hxx | 2 - sw/source/filter/inc/wrtswtbl.hxx | 1 sw/source/filter/ww8/WW8Sttbf.cxx | 1 sw/source/filter/ww8/WW8Sttbf.hxx | 1 sw/source/filter/ww8/WW8TableInfo.cxx | 1 sw/source/filter/ww8/attributeoutputbase.hxx | 3 -- sw/source/filter/ww8/docxattributeoutput.cxx | 1 sw/source/filter/ww8/docxattributeoutput.hxx | 1 sw/source/filter/ww8/docxexport.cxx | 1 sw/source/filter/ww8/docxexport.hxx | 3 -- sw/source/filter/ww8/docxfootnotes.hxx | 2 + sw/source/filter/ww8/docxsdrexport.cxx | 1 sw/source/filter/ww8/escher.hxx | 2 + sw/source/filter/ww8/rtfattributeoutput.cxx | 1 sw/source/filter/ww8/rtfattributeoutput.hxx | 2 + sw/source/filter/ww8/rtfexport.cxx | 3 ++ sw/source/filter/ww8/sortedarray.hxx | 1 sw/source/filter/ww8/types.hxx | 2 + sw/source/filter/ww8/writerhelper.cxx | 2 + sw/source/filter/ww8/writerhelper.hxx | 1 sw/source/filter/ww8/writerwordglue.cxx | 1 sw/source/filter/ww8/writerwordglue.hxx | 1 sw/source/filter/ww8/wrtw8esh.cxx | 1 sw/source/filter/ww8/wrtw8sty.cxx | 1 sw/source/filter/ww8/wrtww8.cxx | 1 sw/source/filter/ww8/wrtww8.hxx | 1 sw/source/filter/ww8/ww8atr.cxx | 1 sw/source/filter/ww8/ww8glsy.cxx | 1 sw/source/filter/ww8/ww8glsy.hxx | 2 + sw/source/filter/ww8/ww8graf.hxx | 5 ++++ sw/source/filter/ww8/ww8par.cxx | 2 + sw/source/filter/ww8/ww8par2.hxx | 4 --- sw/source/filter/ww8/ww8par5.cxx | 1 sw/source/filter/ww8/ww8par6.cxx | 1 sw/source/filter/ww8/ww8scan.hxx | 7 ------ sw/source/filter/ww8/ww8struc.hxx | 6 +++-- sw/source/filter/xml/wrtxml.hxx | 3 +- sw/source/filter/xml/xmlbrshe.hxx | 3 -- sw/source/filter/xml/xmlexpit.hxx | 1 sw/source/filter/xml/xmlimp.hxx | 2 - sw/source/filter/xml/xmlimpit.hxx | 3 -- sw/source/filter/xml/xmlitem.hxx | 2 - sw/source/filter/xml/xmlithlp.hxx | 1 sw/source/filter/xml/xmltbli.hxx | 2 + sw/source/filter/xml/xmltexti.cxx | 1 vcl/opengl/x11/X11DeviceInfo.cxx | 1 xmlsecurity/source/gpg/SEInitializer.cxx | 2 + xmlsecurity/source/gpg/SecurityEnvironment.hxx | 2 + xmlsecurity/source/helper/ooxmlsecparser.hxx | 1 xmlsecurity/source/helper/xsecparser.hxx | 1 80 files changed, 115 insertions(+), 54 deletions(-)
New commits: commit 2b078eeb71f578d874a4f919d55c31ef4dc713c9 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Fri May 12 19:33:09 2023 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:37 2023 +0200 add more missing stdint Change-Id: I48de7158d1b2517432e8afd772bd39e9cfc427ef diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx index b56ce19ba194..4b7b0b5af843 100644 --- a/include/vcl/font/Feature.hxx +++ b/include/vcl/font/Feature.hxx @@ -13,6 +13,7 @@ #include <vcl/dllapi.h> #include <rtl/ustring.hxx> #include <vector> +#include <cstdint> namespace vcl { diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index 577e2c2ad3b2..f51aa0950f85 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -18,6 +18,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/wait.h> +#include <stdint.h> #include <errno.h> #include <sys/utsname.h> commit b128f80bf9794859d174db49be6de324758fcb30 Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Sun Jun 16 08:26:04 2019 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:37 2023 +0200 tdf#42949 Fix IWYU warnings in sw/source/filter/*/*hxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I7ccd6af737c21a50fe7df25266198ee6989c4c69 Reviewed-on: https://gerrit.libreoffice.org/74110 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> (cherry picked from commit 2a06796fa6f6255314cf4c1271f62154f08bac4f) diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 69aa7bf7de09..58d6a158af30 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -434,3 +434,9 @@ blacklist: sw/qa/extras/ww8import/ww8import.cxx: # Needed for for-loop range - com/sun/star/graphic/XGraphic.hpp + include/sal/types.h: + # Ignore warning during checking source/filter/ww8/types.hxx + - sal/typesizes.h + sw/source/filter/ww8/ww8scan.hxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h diff --git a/sw/source/filter/docx/swdocxreader.hxx b/sw/source/filter/docx/swdocxreader.hxx index 57900c12143b..214d2742d287 100644 --- a/sw/source/filter/docx/swdocxreader.hxx +++ b/sw/source/filter/docx/swdocxreader.hxx @@ -21,8 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_DOCX_SWDOCXREADER_HXX #include <shellio.hxx> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <tools/ref.hxx> /// Wrapper for the UNO DOCX import filter (in writerfilter) for autotext purposes. class SwDOCXReader : public StgReader diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 43f42aef10e4..0c739bfcf590 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/text/HoriOrientation.hpp> +#include <com/sun/star/text/VertOrientation.hpp> + #include <hintids.hxx> #include <svl/itemiter.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 218ffa02a200..3d715fff1bca 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -48,6 +48,7 @@ #include <drawdoc.hxx> #include <frmfmt.hxx> #include <fmtanchr.hxx> +#include <fmtornt.hxx> #include <fmtsrnd.hxx> #include <ndtxt.hxx> #include <doc.hxx> diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 88e7e3b80c0c..90722338807a 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX -#include <tools/solar.h> #include <o3tl/sorted_vector.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index b097e86a9202..562bb65089d7 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX +#include <sal/types.h> + extern const sal_Char * aEventListenerTable[]; extern const sal_Char * aEventMethodTable[]; extern const sal_Char * aEventSDOptionTable[]; diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 81df21aad9be..4060b7858d06 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <hintids.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 1a4b02c6727f..7afbd84e1c6d 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -20,6 +20,11 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_PARCSS1_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_PARCSS1_HXX +#include <rtl/ustring.hxx> +#include <tools/color.hxx> + +#include <memory> + // tokens of the CSS1 parser enum CSS1Token { diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index fdc2b1a78a67..bb4dc73ae525 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_FILTER_HTML_SVXCSS1_HXX #include <svl/itemset.hxx> +#include <svx/flagsdef.hxx> #include <editeng/svxenum.hxx> #include <rtl/textenc.h> #include "parcss1.hxx" diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx index b368bd1f068e..c6a3e6bdb8fd 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX +#include <svtools/htmltokn.h> +#include <tools/solar.h> + #include <poolfmt.hxx> #include "svxcss1.hxx" diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index df4d4eed2da5..8495d0014e1b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -83,6 +83,7 @@ #include <fchrfmt.hxx> #include <fmtinfmt.hxx> #include <fmtfollowtextflow.hxx> +#include <fmtornt.hxx> #include <docary.hxx> #include <docstat.hxx> #include <doc.hxx> diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 4c4a4d414313..b931042a3fe7 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -27,7 +27,6 @@ #include <editeng/svxenum.hxx> #include <rtl/ref.hxx> #include <fltshell.hxx> -#include <fmtornt.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/form/XFormComponent.hpp> diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index c90c784e7abc..47893227f98f 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -26,13 +26,13 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/form/XForm.hpp> -#include <vcl/field.hxx> #include <i18nlangtag/lang.h> #include <comphelper/stl_types.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/typed_flags_set.hxx> #include <rtl/ref.hxx> #include <svtools/htmlout.hxx> +#include <tools/fldunit.hxx> #include <shellio.hxx> #include <wrt_fn.hxx> diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 47c1aedab650..713709dd7caa 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -20,11 +20,7 @@ #define INCLUDED_SW_SOURCE_FILTER_INC_FLTSHELL_HXX #include <hintids.hxx> -#include <vcl/keycod.hxx> #include <tools/datetime.hxx> -#include <editeng/formatbreakitem.hxx> -#include <poolfmt.hxx> -#include <fmtornt.hxx> #include <mdiexp.hxx> #include <ndindex.hxx> #include <pam.hxx> @@ -34,7 +30,6 @@ #include <cstddef> #include <limits> #include <memory> -#include <deque> class SwTOXBase; class SwField; diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index f36c78fb3d58..4ed7d7045511 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -23,17 +23,13 @@ #include <sal/config.h> #include <cstddef> -#include <set> #include <map> #include <vector> #include <memory> #include <swtypes.hxx> #include "wwstyles.hxx" #include <rtl/textenc.h> -#include <tools/gen.hxx> -#include <filter/msfilter/util.hxx> #include "fltshell.hxx" -#include <redline.hxx> #include <shellio.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index 293e87630edc..d1e4d3fa9e3a 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX #define INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX -#include <tools/solar.h> +#include <sal/types.h> class RTFSurround { diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 6dfe3d2f4e4c..623ddeeda5c4 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX #define INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX -#include <tools/solar.h> #include <tools/color.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index b9290e24d3d5..628f3194b805 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -27,6 +27,7 @@ #include <o3tl/make_shared.hxx> #include <tools/stream.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace ww8 { diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index b404d4b69820..afd4e696780d 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -23,7 +23,6 @@ #include <memory> #include <vector> -#include <tools/solar.h> #include <rtl/ustring.hxx> #include <IDocumentExternalData.hxx> diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 0ecda9170a19..b5d4897253ea 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -29,6 +29,7 @@ #include <ndtxt.hxx> #include <dbgoutsw.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace ww8 { diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 2439cfabf5f8..72116df53bc2 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -31,13 +31,10 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <swtypes.hxx> -#include <wrtswtbl.hxx> #include <fldbas.hxx> #include <IDocumentRedlineAccess.hxx> #include <unotools/saveopt.hxx> -#include <vector> - class Point; class SvxCaseMapItem; class SvxColorItem; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c686845dce7f..6de60f9eaae5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -117,6 +117,7 @@ #include <ndtxt.hxx> #include <pagedesc.hxx> #include <paratr.hxx> +#include <poolfmt.hxx> #include <charatr.hxx> #include <swmodule.hxx> #include <swtable.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 46b3833ea49f..2d4726bbebdb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -26,6 +26,7 @@ #include "fields.hxx" #include <IMark.hxx> #include "docxexport.hxx" +#include <wrtswtbl.hxx> #include <editeng/boxitem.hxx> #include <sax/fshelper.hxx> diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 7babed3ebb44..4a0d84205d2c 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -64,6 +64,7 @@ #include <section.hxx> #include <ftninfo.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <swdbdata.hxx> #include <editeng/unoprnms.hxx> diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 1de037fb7662..0424f2619e75 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -23,13 +23,10 @@ #include "wrtww8.hxx" #include <sax/fshelper.hxx> -#include <sax/fastattribs.hxx> #include <rtl/ustring.hxx> #include <cstdio> #include <memory> -#include <vector> -#include <boost/optional.hpp> #include <ndole.hxx> class DocxAttributeOutput; diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index c2ec261d0d20..614069f0dd5d 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX +#include <sal/types.h> + #include <vector> class SwFormatFootnote; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index da04f259316e..b572a728c5db 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -29,6 +29,7 @@ #include <fmtanchr.hxx> #include <fmtsrnd.hxx> #include <fmtcntnt.hxx> +#include <fmtornt.hxx> #include <ndtxt.hxx> #include <txatbase.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index a38f0c02b0e7..3e7e49edf0fc 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -21,6 +21,8 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_ESCHER_HXX #include <filter/msfilter/escherex.hxx> +#include <svx/svdtrans.hxx> +#include "wrtww8.hxx" const sal_uInt32 nInlineHack = 0x00010001; class SwFrameFormat; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index d49dba1e57a8..35a5645e7041 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -82,6 +82,7 @@ #include <grfatr.hxx> #include <ndole.hxx> #include <lineinfo.hxx> +#include <redline.hxx> #include <rtf.hxx> #include <IDocumentSettingAccess.hxx> #include <vcl/cvtgrf.hxx> diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 1b4799d5978f..ba8f020d4994 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -26,6 +26,8 @@ #include "attributeoutputbase.hxx" #include "rtfstringbuffer.hxx" +#include <wrtswtbl.hxx> + #include <rtl/strbuf.hxx> #include <boost/optional.hpp> diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 504424b70d8a..4c8ed0281537 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -43,6 +43,8 @@ #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> #include <lineinfo.hxx> +#include <poolfmt.hxx> +#include <redline.hxx> #include <swmodule.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentStylePoolAccess.hxx> @@ -50,6 +52,7 @@ #include <svtools/rtfkeywd.hxx> #include <filter/msfilter/rtfutil.hxx> #include <unotools/docinfohelper.hxx> +#include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <sal/log.hxx> #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 2e36fba4155c..7efec13aa9ff 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX #include <osl/diagnose.h> -#include <sal/log.hxx> #include <algorithm> //simple template that manages a static [] array by sorting at construction diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx index c832e133cff8..f2fd85817c49 100644 --- a/sw/source/filter/ww8/types.hxx +++ b/sw/source/filter/ww8/types.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX +#include <sal/types.h> + #include <vector> namespace ww diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index eb46cfb1463c..5e62280a501a 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -48,6 +48,8 @@ #include <docary.hxx> #include <charfmt.hxx> #include <fchrfmt.hxx> +#include <redline.hxx> +#include "types.hxx" #include <unotools/streamwrap.hxx> #include <svtools/embedhlp.hxx> #include <numrule.hxx> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 80430bcca9d7..4f6f67e49b8d 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <sfx2/objsh.hxx> -#include "types.hxx" #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svx/svdtypes.hxx> diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index fc69bb8ed574..c802760b4cdf 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -43,6 +43,7 @@ #include <fmtclds.hxx> #include <hfspacingitem.hxx> #include <fmtfsize.hxx> +#include <poolfmt.hxx> #include <swrect.hxx> #include <fmthdft.hxx> #include <frmatr.hxx> diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index 362a8e19a342..3b532356602a 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_WRITERWORDGLUE_HXX #include "needed_cast.hxx" -#include "types.hxx" class SwFrameFormat; class SfxItemSet; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index bf682a5880d5..1f3dec9ef7ce 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -76,6 +76,7 @@ #include <ndole.hxx> #include <unodraw.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include "ww8par.hxx" #include <breakit.hxx> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 03b7ace7caa8..42345b5b147e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -57,6 +57,7 @@ #include <lineinfo.hxx> #include <fmtline.hxx> #include <swtable.hxx> +#include <redline.hxx> #include <msfilter.hxx> #include <swmodule.hxx> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 91be4679ff4d..b6e98bcde657 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -71,6 +71,7 @@ #include <shellio.hxx> #include <docstat.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <IMark.hxx> #include <swtable.hxx> #include "wrtww8.hxx" diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a8c81bf07d6c..d2ce90413a4f 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -26,7 +26,6 @@ #include <editeng/editdata.hxx> #include <shellio.hxx> -#include <wrt_fn.hxx> #include "ww8struc.hxx" #include "ww8scan.hxx" diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 10e58270ab60..6cdd6784567d 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -104,6 +104,7 @@ #include <flddat.hxx> #include <ndtxt.hxx> #include <swrect.hxx> +#include <redline.hxx> #include <reffld.hxx> #include <ftninfo.hxx> #include <charfmt.hxx> diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index f923e35617ed..a4b9e7d167fe 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -24,6 +24,7 @@ #include <swerror.h> #include <ndtxt.hxx> #include <pam.hxx> +#include <poolfmt.hxx> #include <shellio.hxx> #include <docsh.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 6d865ad787c5..61b3f6fc6741 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -22,6 +22,8 @@ #include <memory> #include <sot/storage.hxx> + +#include <doc.hxx> #include "ww8scan.hxx" class SwTextBlocks; diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index ce3c2e4410a0..0e98b7ddda5c 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -22,7 +22,12 @@ #include <vector> #include <stack> + +#include <filter/msfilter/msdffimp.hxx> +#include <svx/svdpage.hxx> + #include "writerhelper.hxx" +#include "ww8struc.hxx" struct EscherShape { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 792b83aad76a..da0d802f2dd5 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -47,6 +47,7 @@ #include <editeng/outlobj.hxx> #include <editeng/brushitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/langitem.hxx> @@ -82,6 +83,7 @@ #include <ndtxt.hxx> #include <pagedesc.hxx> #include <paratr.hxx> +#include <poolfmt.hxx> #include <fmtclbl.hxx> #include <section.hxx> #include <docsh.hxx> diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 4875270e6e27..86f84364aa0e 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -20,11 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX -#include <swtypes.hxx> #include <fmtfsize.hxx> -#include <fmtornt.hxx> -#include <fmtsrnd.hxx> -#include <editeng/lrspitem.hxx> #include <svl/itemset.hxx> #include <svx/swframetypes.hxx> #include <swtable.hxx> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 2c97062f01ff..fd517e6999b4 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -79,6 +79,7 @@ #include <breakit.hxx> #include <fmtclds.hxx> #include <pagedesc.hxx> +#include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> #include "ww8scan.hxx" diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 075756a6d558..0073caefb9ff 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -70,6 +70,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include "sortedarray.hxx" #include "sprmids.hxx" #include <fmtpdsc.hxx> #include <node.hxx> diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 45454a6d3187..f9629bbd33f8 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX -#ifndef LONG_MAX -#include <limits.h> -#endif -#include <algorithm> #include <cassert> #include <cstddef> #include <deque> @@ -36,13 +32,10 @@ #include <tools/solar.h> #include <tools/stream.hxx> #include <rtl/ustring.hxx> -#include "sortedarray.hxx" #include "ww8struc.hxx" #include "types.hxx" -#include <unomid.h> - class SvStream; //Commonly used string literals for stream and storage names in word docs diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 5e2a468947cc..f4f50e1e748d 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -22,13 +22,15 @@ #include <sal/config.h> -#include <osl/endian.h> #include <rtl/ustring.hxx> -#include <editeng/borderline.hxx> #include <filter/msfilter/util.hxx> #include <i18nlangtag/lang.h> #include <tools/color.hxx> +#include <tools/solar.h> +#include <tools/stream.hxx> + +#include <vector> #ifdef _WIN32 # pragma pack(push, 2) diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 1dbd9f63dfa0..a82a0315e056 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -19,9 +19,10 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX #define INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <shellio.hxx> diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index e9096a5a7230..1e970ff8ed04 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX #define INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX -#include <rtl/ustring.hxx> -#include <xmloff/attrlist.hxx> - class SvxBrushItem; class SwXMLExport; diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index a7d290a2d640..f3f07c33c351 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX #define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX -#include <tools/solar.h> #include <xmloff/xmlexppr.hxx> #include "xmlitmap.hxx" #include <vector> diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index fb326377d382..ed2317c73866 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> -#include <sot/storage.hxx> - #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 47a367fdd9ca..d6c19b20bea3 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -19,9 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX #define INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX -#include <limits.h> -#include <tools/solar.h> - #include <com/sun/star/xml/sax/XAttributeList.hpp> #include "xmlitmap.hxx" diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index b8248ad6dc6f..4f06cfc94d9c 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -21,8 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <tools/solar.h> -#include <limits.h> #include <xmloff/xmlictxt.hxx> class SfxItemSet; diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index e5498009bd3e..57d688feffe5 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -22,7 +22,6 @@ #include <sal/types.h> #include <xmloff/xmlement.hxx> -#include <hintids.hxx> #include <editeng/brushitem.hxx> namespace editeng { class SvxBorderLine; } diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 9d5272e46d37..e8e10df55225 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -22,6 +22,8 @@ #include <xmloff/XMLTextTableContext.hxx> +#include "xmlimp.hxx" + #include <memory> #include <unordered_map> #include <vector> diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 40d6f96e5370..0ccb11f233e2 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -61,6 +61,7 @@ #include <svtools/embedhlp.hxx> #include <svl/urihelper.hxx> #include <sfx2/frmdescr.hxx> +#include <tools/globname.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; commit 634cbff93f06566cf850e061632bd08b3cd4c55d Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed Sep 21 16:08:45 2022 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:37 2023 +0200 python3: find the bundled openssl headers This failed because it finds /usr/include header first, which doesn't contain a findable version number in 3.0.5 so fails with: warning: openssl 0x00000000 is too old for _hashlib Change-Id: Ie7d92f5940c0ea2d9b24aa6ea3051e8454c546f6 diff --git a/external/python3/python-3.5.4-ssl.patch.1 b/external/python3/python-3.5.4-ssl.patch.1 index 123588661d2f..f8f41facd5dc 100644 --- a/external/python3/python-3.5.4-ssl.patch.1 +++ b/external/python3/python-3.5.4-ssl.patch.1 @@ -81,3 +81,14 @@ diff -ru python3.orig/setup.py python3/setup.py '/usr/contrib/ssl/lib/' ] ) +--- python3/setup.py.orig2 2022-09-21 16:04:12.855249707 +0200 ++++ python3/setup.py 2022-09-21 16:04:30.752236913 +0200 +@@ -848,7 +848,7 @@ + + # look for the openssl version header on the compiler search path. + opensslv_h = find_file('openssl/opensslv.h', [], +- inc_dirs + search_for_ssl_incs_in) ++ search_for_ssl_incs_in + inc_dirs) + if opensslv_h: + name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') + if host_platform == 'darwin' and is_macosx_sdk_path(name): commit b18b9533fa1e7cd0dfecb939999bd8f62e6c2775 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Tue May 31 18:01:46 2022 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:36 2023 +0200 include memory for GCC12 Change-Id: Idd92510b66f63b68faa8a8d4fef01a18874e9905 diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index d9e20cd05847..d4a760366626 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/lang/XMultiServiceFactory.hpp> +#include <memory> #include <vector> class filter_info_impl; diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 363bf94acc6e..d16474f27dce 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> +#include <memory> #include <vector> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index 782091cf2cc3..21509310e8db 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -24,6 +24,8 @@ #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/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 515f070717c8..432b0e1451d7 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -24,6 +24,8 @@ #include <tools/color.hxx> #include <tools/link.hxx> +#include <memory> + namespace weld { class Entry; } struct ImplSVEvent; diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx index 2a064951c447..3686e5fcb508 100644 --- a/include/vcl/BitmapBuffer.hxx +++ b/include/vcl/BitmapBuffer.hxx @@ -25,6 +25,8 @@ #include <vcl/ColorMask.hxx> #include <vcl/Scanline.hxx> +#include <memory> + struct SalTwoRect; struct VCL_DLLPUBLIC BitmapBuffer diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index ad9ce09a20cb..0af2ae14a32c 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -27,6 +27,8 @@ #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> +#include <memory> + using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index ba6938928bbe..8f0614d82212 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -20,6 +20,7 @@ #include "acceptor.hxx" #include <unordered_set> +#include <memory> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index cee46004506d..fb0f703abdb2 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -34,6 +34,8 @@ #include <services.hxx> #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..af97164c1090 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -28,6 +28,8 @@ #include <osl/mutex.hxx> +#include <memory> + namespace com::sun::star::container { class XNameAccess; } namespace com::sun::star::io { class XInputStream; } namespace com::sun::star::io { class XStream; } diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index affa2b6eb9cb..0c653a31147b 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -29,6 +29,8 @@ #include <vcl/image.hxx> +#include <memory> + namespace svt { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 8407b084dbdc..003e930de45b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -31,6 +31,7 @@ #include <comphelper/interfacecontainer2.hxx> #include <vcl/vclptr.hxx> +#include <memory> namespace textconversiondlgs { diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx index f11ad59d8ba1..6ac0cbddaa3e 100644 --- a/xmlsecurity/source/gpg/SEInitializer.cxx +++ b/xmlsecurity/source/gpg/SEInitializer.cxx @@ -14,6 +14,8 @@ #include <global.h> +#include <memory> + namespace com::sun::star::uno { class XComponentContext; } using namespace css; diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx index a8aacfa5a10b..3b9a21a8f93b 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx @@ -18,6 +18,8 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <memory> + namespace com::sun::star::security { class XCertificate; } namespace GpgME { class Context; } diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index 540028b22fc9..5fe6f53eb701 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -17,6 +17,7 @@ #include <xmloff/nmspmap.hxx> +#include <memory> #include <stack> class XSecController; diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 7674bf28b84d..a54bbdac37a5 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -27,6 +27,7 @@ #include <xmloff/nmspmap.hxx> +#include <memory> #include <stack> class XMLSignatureHelper; commit 4bd2661701b703799faa6c9029ae70576739a629 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed May 10 20:00:39 2023 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:36 2023 +0200 libpagemaker: missing include Change-Id: I5f93d7d26b9f4449ce4f01fdb526e7786badd870 diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk index a090d334c3fe..c21f9b7db394 100644 --- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk +++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk @@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \ + external/libpagemaker/include.patch.1 \ +)) + # vim: set noet sw=4 ts=4: commit 5463a8f6c1f9847d0b2b395aedbdf0381eba7eef Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed May 10 19:52:02 2023 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Mon May 15 13:15:36 2023 +0200 liborcus: patch missing uint8_t Change-Id: I388a621cdb249c67ac3f819392140c4b26469e91 diff --git a/external/liborcus/gcc9.patch.0 b/external/liborcus/gcc9.patch.0 index f89b1dddccb1..e12500ba3df1 100644 --- a/external/liborcus/gcc9.patch.0 +++ b/external/liborcus/gcc9.patch.0 @@ -1,6 +1,6 @@ --- include/orcus/types.hpp +++ include/orcus/types.hpp -@@ -7,6 +7,14 @@ +@@ -7,7 +7,16 @@ #ifndef INCLUDED_ORCUS_TYPES_HPP #define INCLUDED_ORCUS_TYPES_HPP @@ -13,8 +13,10 @@ +#pragma GCC diagnostic ignored "-Wshadow" +#endif ++#include <cstdint> #include <cstdlib> #include <vector> + #include <string> @@ -145,6 +152,10 @@ typedef ::std::vector<xml_token_attr_t> xml_attrs_t;