tdf#146619 Use more forward declarations in include/tools

Change-Id: Iab2938f82a9fd7ef3334d69c4fd07a9d963a9e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198237
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen@collabora.com>

include/IwyuFilter_include.yaml

@@ -305,6 +305,9 @@ excludelist:
     include/tools/simdsupport.hxx:
     # Needed for CPU intrinsics detection to work
     - emmintrin.h
+    include/tools/XmlWriter.hxx:
+    # Not to be confused with std <concepts>
+    - o3tl/concepts.hxx
     include/unotest/bootstrapfixturebase.hxx:
     # These are used in virtually all test files, too much work to move them everywhere
     - cppunit/TestAssert.h

include/tools/GenericTypeSerializer.hxx

@@ -20,13 +20,17 @@
 #define INCLUDED_TOOLS_GENERICTYPESERIALIZER_HXX
 
 #include <tools/toolsdllapi.h>
-#include <tools/color.hxx>
-#include <tools/gen.hxx>
-#include <tools/stream.hxx>
-#include <tools/fract.hxx>
+
+class Color;
+class Fraction;
+class Point;
+class Size;
+class SvStream;
 
 namespace tools
 {
+class Rectangle;
+
 class TOOLS_DLLPUBLIC GenericTypeSerializer
 {
 public:

include/tools/datetimeutils.hxx

@@ -10,7 +10,12 @@
 #ifndef INCLUDED_TOOLS_DATETIMEUTILS_HXX
 #define INCLUDED_TOOLS_DATETIMEUTILS_HXX
 
-#include <tools/datetime.hxx>
+//#include <tools/datetime.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/toolsdllapi.h>
+
+class Date;
+class DateTime;
 
 // This function converts a 'DateTime' object to an 'OString' object
 TOOLS_DLLPUBLIC OString DateTimeToOString(const DateTime& rDateTime);

include/tools/globname.hxx

@@ -20,7 +20,10 @@
 #define INCLUDED_TOOLS_GLOBNAME_HXX
 
 #include <tools/toolsdllapi.h>
-#include <com/sun/star/uno/Sequence.hxx>
+
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 struct SAL_WARN_UNUSED SvGUID
 {

include/tools/poly.hxx

@@ -21,8 +21,8 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/toolsdllapi.h>
-#include <tools/gen.hxx>
 #include <tools/degree.hxx>
+#include <tools/long.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
@@ -57,8 +57,10 @@ enum class PolyFlags : sal_uInt8
     Symmetric // smooth and symmetrical transition between curves
 };
 
+class Point;
 class SvStream;
 class ImplPolygon;
+namespace tools { class Rectangle; }
 struct ImplPolyPolygon;
 
 namespace basegfx

sfx2/source/doc/oleprops.cxx

@@ -27,6 +27,8 @@
 #include <sal/log.hxx>
 #include <utility>
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 
 #define STREAM_BUFFER_SIZE 2048
 

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

@@ -57,6 +57,8 @@
 
 #include <o3tl/cppunittraitshelper.hxx>
 #include <tools/datetimeutils.hxx>
+#include <tools/datetime.hxx>
+#include <tools/time.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <unotools/streamwrap.hxx>

sw/source/uibase/config/modcfg.cxx

@@ -34,6 +34,8 @@
 #include <modcfg.hxx>
 #include <caption.hxx>
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 using namespace com::sun::star::uno;
 
 #define GLOB_NAME_CALC      0

tools/qa/cppunit/test_GenericTypeSerializer.cxx

@@ -23,6 +23,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <tools/GenericTypeSerializer.hxx>
+#include <tools/fract.hxx>
 #include <tools/stream.hxx>
 #include <tools/gen.hxx>
 

tools/qa/cppunit/test_poly.cxx

@@ -11,6 +11,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include <tools/gen.hxx>
 #include <tools/poly.hxx>
 
 namespace

tools/source/datetime/datetimeutils.cxx

@@ -8,6 +8,7 @@
  */
 
 #include <tools/datetimeutils.hxx>
+#include <tools/datetime.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 

tools/source/ref/globname.cxx

@@ -26,6 +26,8 @@
 #include <tools/stream.hxx>
 #include <tools/globname.hxx>
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 // SvGlobalName ----------------------------------------------------------------
 
 SvGlobalName::SvGlobalName( const css::uno::Sequence < sal_Int8 >& aSeq )

tools/source/stream/GenericTypeSerializer.cxx

@@ -20,6 +20,10 @@
 #include <tools/GenericTypeSerializer.hxx>
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <tools/color.hxx>
+#include <tools/fract.hxx>
+#include <tools/gen.hxx>
+#include <tools/stream.hxx>
 #include <vector>
 
 namespace tools

vcl/source/filter/bmp/BmpReader.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <filter/BmpReader.hxx>
+#include <tools/stream.hxx>
 #include <vcl/TypeSerializer.hxx>
 
 bool BmpReader(SvStream& rStream, Graphic& rGraphic)

vcl/source/filter/svm/SvmWriter.cxx

@@ -24,6 +24,7 @@
 #include <vcl/metaactiontypes.hxx>
 #include <rtl/crc.h>
 #include <tools/solar.h>
+#include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 
 #include <osl/thread.h>

vcl/source/gdi/TypeSerializer.cxx

@@ -20,9 +20,11 @@
 #include <vcl/TypeSerializer.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/BinaryDataContainer.hxx>
+#include <tools/color.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <sal/log.hxx>
 #include <comphelper/fileformat.h>
 #include <vcl/filter/SvmReader.hxx>

vcl/source/treelist/imap.cxx

@@ -22,6 +22,7 @@
 #include <tools/fract.hxx>
 #include <tools/GenericTypeSerializer.hxx>
 #include <tools/mapunit.hxx>
+#include <tools/stream.hxx>
 #include <utility>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>

writerperfect/inc/WPXSvInputStream.hxx

@@ -17,6 +17,8 @@
 #include <tools/stream.hxx>
 #include <sot/storage.hxx>
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 namespace com::sun::star::io
 {
 class XInputStream;