diff options
83 files changed, 105 insertions, 58 deletions
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index edbbf5c11524..da6703227d97 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -22,6 +22,7 @@ #include <osl/thread.h> #include "dbase/DIndex.hxx" #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <algorithm> #include <memory> diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index e4bc122de453..17e713eed117 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -23,12 +23,13 @@ #include "file/FTable.hxx" #include <connectivity/FValue.hxx> #include <rtl/ref.hxx> -#include <tools/stream.hxx> #include <vector> #define NODE_NOTFOUND 0xFFFF #define DINDEX_PAGE_SIZE 512 +class SvStream; + namespace connectivity { namespace dbase diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 78368ceecb32..9c5ca32e82ee 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -22,10 +22,11 @@ #include "DExport.hxx" #include <svtools/parhtml.hxx> #include <editeng/svxenum.hxx> -#include <tools/stream.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +class SvStream; + namespace dbaui { class OHTMLReader : public HTMLParser, public ODatabaseExport diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index f0da7197d161..fe8a02e53ace 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -22,7 +22,8 @@ #include <vector> #include <svtools/parrtf.hxx> #include "DExport.hxx" -#include <tools/stream.hxx> + +class SvStream; namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 9d18818459ea..fa57cf0dc376 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX -#include <tools/stream.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include "TypeInfo.hxx" +class SvStream; namespace dbaui { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 91fc0c82ea1f..da97dfa25e11 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <tools/stream.hxx> #include <svx/dataaccessdescriptor.hxx> namespace com { namespace sun { namespace star { @@ -44,6 +43,8 @@ namespace com { namespace sun { namespace star { } }}} +class SvStream; + namespace dbaui { // ODatabaseImportExport base class for import/export diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 4cc93a23c445..7d11395f351b 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -21,6 +21,7 @@ #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/stream.hxx> #include <tools/tenccvt.hxx> #include <comphelper/extract.hxx> #include <comphelper/string.hxx> diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 963fd617ac1f..9dde360c0a8a 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -19,6 +19,7 @@ #include "RtfReader.hxx" #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a7fda1c9ebc6..c90f206c2149 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -20,6 +20,7 @@ #include "TokenWriter.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <tools/stream.hxx> #include <osl/diagnose.h> #include "RtfReader.hxx" #include "HtmlReader.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 3f7d2e103c3f..4a85ffe77676 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -19,6 +19,7 @@ #include "TableRow.hxx" #include <tools/debug.hxx> +#include <tools/stream.hxx> #include "FieldDescriptions.hxx" #include <algorithm> #include <comphelper/types.hxx> diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 2603193533ff..10b17bb04b6b 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX #define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX -#include <tools/stream.hxx> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index de7e1c7a11ad..822820859acc 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX +#include <rtl/string.hxx> #include <sal/types.h> +#include <tools/solar.h> -#include <tools/stream.hxx> - +class SvStream; class DXFGroupReader { diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 44522ad68e64..b7f455eeb674 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -19,6 +19,7 @@ #include "ccidecom.hxx" +#include <tools/stream.hxx> //=============================== Huffman tables ======================== diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx index 34636868df74..c92769df6576 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.hxx +++ b/filter/source/graphicfilter/itiff/ccidecom.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX -#include <tools/stream.hxx> - +#include <sal/types.h> +#include <tools/solar.h> #define CCI_OPTION_2D 1 // 2D compression (instead of 1D) #define CCI_OPTION_EOL 2 // There are EOL-Codes at the end of each line. @@ -43,6 +43,7 @@ struct CCILookUpTableEntry { sal_uInt16 nCodeBits; }; +class SvStream; class CCIDecompressor { diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index dc437e27e678..f07fb22aec47 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -19,6 +19,7 @@ #include "lzwdecom.hxx" +#include <tools/stream.hxx> #include <algorithm> #include <set> diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx index bce76b59cc13..85d6f06f677f 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.hxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX -#include <tools/stream.hxx> +#include <sal/types.h> +#include <tools/solar.h> struct LZWTableEntry { sal_uInt16 nPrevCode; @@ -28,6 +29,8 @@ struct LZWTableEntry { sal_uInt8 nData; }; +class SvStream; + class LZWDecompressor { public: diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index 14cf0180c87f..a3517330829a 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -20,6 +20,7 @@ #include <algorithm> #include <filter/msfilter/dffpropset.hxx> #include <rtl/ustrbuf.hxx> +#include <tools/stream.hxx> static const DffPropSetEntry mso_PropSetDefaults[] = { diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index 0e44b23d0fa1..40dc36b7089e 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -20,10 +20,11 @@ #define INCLUDED_FILTER_SOURCE_MSFILTER_VISCACHE_HXX #include <sfx2/objsh.hxx> -#include <tools/stream.hxx> #include <vcl/gdimtf.hxx> #include <vcl/bitmap.hxx> +class SvStream; + class Impl_OlePres { SotClipboardFormatId nFormat; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index a9938f2b494f..3509871e7833 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -22,7 +22,6 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> -#include <tools/stream.hxx> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> #include <vcl/metric.hxx> diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index f5866c4278c0..bcaedb3ed6cc 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_XML_IMAGESCONFIGURATION_HXX #include <framework/fwedllapi.h> -#include <tools/stream.hxx> #include <tools/color.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 36b957e46e5d..04335fd0e42c 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -23,10 +23,10 @@ #include <sal/types.h> #include <tools/globname.hxx> -#include <tools/stream.hxx> class SvStringHashEntry; class SvIdlDataBase; +class SvStream; class SvTokenStream; class Svint diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 1d3d07032ad2..2f7adacef928 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -26,6 +26,7 @@ #include <hash.hxx> #include <database.hxx> #include <osl/diagnose.h> +#include <tools/stream.hxx> static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue ) diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index 8c82eabd1fc5..be36b0173829 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_EDITENG_EDITOBJ_HXX #define INCLUDED_EDITENG_EDITOBJ_HXX -#include <tools/stream.hxx> #include <rsc/rscsfx.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> @@ -38,6 +37,7 @@ class SfxItemPool; class SfxStyleSheetPool; class SvxFieldItem; class SvxFieldData; +class SvStream; namespace editeng { diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 7e64a175da73..ff2173c013fd 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.hxx @@ -21,9 +21,10 @@ #include <filter/msfilter/msfilterdllapi.h> #include <filter/msfilter/dffrecordheader.hxx> -#include <tools/stream.hxx> #include <vector> +class SvStream; + struct DffPropFlags { bool bSet : 1; diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index d173f7ba9525..852202b5817d 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -24,7 +24,6 @@ #include <vector> #include <tools/solar.h> #include <tools/gen.hxx> -#include <tools/stream.hxx> #include <com/sun/star/uno/Reference.h> #include <svtools/grfmgr.hxx> #include <com/sun/star/awt/Size.hpp> @@ -556,7 +555,8 @@ enum MSOPATHTYPE const sal_uInt32 DFF_DGG_CLUSTER_SIZE = 0x00000400; /// Shape IDs per cluster in DGG atom. - +class SvStream; +class SvMemoryStream; namespace com { namespace sun { namespace star { namespace awt { diff --git a/include/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx index 45e8b2d5357f..1d807f405819 100644 --- a/include/framework/eventsconfiguration.hxx +++ b/include/framework/eventsconfiguration.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX #include <framework/fwedllapi.h> -#include <tools/stream.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx index 7abcc145d7d9..39b45c25fffe 100644 --- a/include/framework/statusbarconfiguration.hxx +++ b/include/framework/statusbarconfiguration.hxx @@ -20,7 +20,6 @@ #define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX #include <framework/fwedllapi.h> -#include <tools/stream.hxx> #include <vcl/status.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx index db63ce3d96f4..ddc911d7782e 100644 --- a/include/oox/ole/vbaexport.hxx +++ b/include/oox/ole/vbaexport.hxx @@ -12,11 +12,11 @@ #include <com/sun/star/uno/XInterface.hpp> -#include <tools/stream.hxx> - #include <oox/dllapi.h> class SotStorage; +class SvStream; +class SvMemoryStream; namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx index e8de3ce05cd4..6e8161b1d9a1 100644 --- a/include/sfx2/frmhtmlw.hxx +++ b/include/sfx2/frmhtmlw.hxx @@ -26,12 +26,12 @@ #include <sfx2/frmdescr.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/XPropertySet.hpp> -#include <tools/stream.hxx> #include <svtools/parhtml.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmlkywd.hxx> class SfxFrame; +class SvStream; namespace com { namespace sun { namespace star { namespace document { diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 57dc874ab781..2adb619d9f28 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <tools/stream.hxx> #include <tools/resid.hxx> #include <sfx2/sfx.hrc> diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx index 3c065ffd6259..ca5139cb91d1 100644 --- a/include/svtools/HtmlWriter.hxx +++ b/include/svtools/HtmlWriter.hxx @@ -13,10 +13,11 @@ #include <rtl/string.hxx> #include <rtl/ustring.hxx> -#include <tools/stream.hxx> #include <vector> #include <svtools/svtdllapi.h> +class SvStream; + class SVT_DLLPUBLIC HtmlWriter { private: diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index ef39190b3506..9c50899ec687 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -23,8 +23,8 @@ #include <svx/xtable.hxx> #include <rtl/ustring.hxx> #include <tools/color.hxx> -#include <tools/stream.hxx> +class SvFileStream; typedef std::pair<Color, OUString> NamedColor; typedef std::vector< NamedColor > ColorList; diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 60f9fab57a0e..7d4323be5618 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SVX_MSDFFDEF_HXX #define INCLUDED_SVX_MSDFFDEF_HXX +#include <limits.h> #include <sal/types.h> #include <svx/svxdllapi.h> -#include <tools/stream.hxx> #define DFF_COMMON_RECORD_HEADER_SIZE 8 diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index a5184edef51f..d6f8c3aa5fe3 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SVDLAYER_HXX #define INCLUDED_SVX_SVDLAYER_HXX -#include <tools/stream.hxx> #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 96128017b2ef..976165b09da1 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SVDSOB_HXX #include <com/sun/star/uno/Any.hxx> -#include <tools/stream.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx index 800348e886ed..ccee761decba 100644 --- a/include/svx/xexch.hxx +++ b/include/svx/xexch.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_XEXCH_HXX -#include <tools/stream.hxx> #include <svx/svxdllapi.h> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -30,7 +29,7 @@ class XFillAttrSetItem; class SfxItemPool; - +class SvStream; class SVX_DLLPUBLIC XFillExchangeData diff --git a/include/test/xmlwriter.hxx b/include/test/xmlwriter.hxx index 243b7fc0b869..836a12384795 100644 --- a/include/test/xmlwriter.hxx +++ b/include/test/xmlwriter.hxx @@ -16,7 +16,7 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> -#include <tools/stream.hxx> +class SvStream; class OOO_DLLPUBLIC_TEST XmlWriter { diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 8c36ae340f8b..eaf211d62e1e 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -21,12 +21,13 @@ #define INCLUDED_VCL_GFXLINK_HXX #include <rtl/ustring.hxx> -#include <tools/stream.hxx> #include <tools/gen.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> +class SvStream; + // - ImpBuffer - diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index df5bd78051bf..80f3cdcc6d04 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_GRAPHICFILTER_HXX #include <tools/gen.hxx> -#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <vcl/dllapi.h> #include <vcl/field.hxx> @@ -32,6 +31,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> class FilterConfigCache; +class SvStream; struct WMF_EXTERNALHEADER; struct ConvertData; diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index 8bcb6710560a..b3da2733469a 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -25,12 +25,13 @@ #include <rtl/string.hxx> #include <tools/color.hxx> #include <tools/poly.hxx> -#include <tools/stream.hxx> #include <vcl/graph.hxx> #include <memory> #include <vector> +class SvStream; + /** Encapsulates geometry and associated attributes of a graphical 'pen stroke' @attention Widespread use is deprecated. See declarations above diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 3f8f9c719bcb..37cd2989375a 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -23,9 +23,9 @@ #include <unordered_map> #include <vector> -#include <tools/stream.hxx> #include <rtl/string.hxx> #include <rtl/ustring.hxx> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <com/sun/star/lang/Locale.hpp> diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 6246335b2aff..4ee1b94399db 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -29,7 +29,6 @@ #include <vcl/prntypes.hxx> #include <vcl/jobset.hxx> #include <vcl/gdimtf.hxx> -#include <tools/stream.hxx> #include <tools/multisel.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 9f594e4bed0d..e443d901273a 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -26,7 +26,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> -#include <tools/stream.hxx> +#include <tools/solar.h> #include "defs.hxx" #include "linguistic/misc.hxx" diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx index 1ae4248d4495..14a066383c02 100644 --- a/lotuswordpro/source/filter/explode.cxx +++ b/lotuswordpro/source/filter/explode.cxx @@ -53,9 +53,12 @@ * * ************************************************************************/ -#include <assert.h> + #include "explode.hxx" +#include <tools/stream.hxx> +#include <assert.h> #include <math.h> + const static char Tree1String[][32] = { "101", "11", diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx index 5cb560182f67..d5b0f51c899b 100644 --- a/lotuswordpro/source/filter/explode.hxx +++ b/lotuswordpro/source/filter/explode.hxx @@ -56,7 +56,9 @@ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX -#include <tools/stream.hxx> +#include <sal/types.h> + +class SvStream; class HuffmanTreeNode { diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index f84f700b79fd..79aa69b81b9b 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -67,6 +67,7 @@ #include <osl/file.h> #include <osl/file.hxx> +#include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <xmloff/attrlist.hxx> #include <com/sun/star/io/IOException.hpp> diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 8bba057a3291..d976f3d6f9eb 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -57,7 +57,8 @@ #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <tools/stream.hxx> + +class SvStream; //test code int ReadWordproFile(SvStream &rStream, css::uno::Reference<css::xml::sax::XDocumentHandler>& XDoc); diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 7344124c8f81..1c4c6c631ba9 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -56,6 +56,9 @@ #include "lwpobjstrm.hxx" #include "lwptools.hxx" + +#include <sal/types.h> +#include <tools/solar.h> #include <memory> /** diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx index 26518682588f..b30097a96d97 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx @@ -54,6 +54,8 @@ * ************************************************************************/ +#include <tools/stream.hxx> + #include "lwpsdwfileloader.hxx" #include "lwpsdwgrouploaderv0102.hxx" diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx index df6ea55df8e6..a8edc629ddbf 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx @@ -62,11 +62,11 @@ #include <vector> #include <rtl/ref.hxx> -#include <tools/stream.hxx> #include "lwpheader.hxx" #include "xfilter/ixfstream.hxx" +class SvStream; class XFFrame; class LwpGraphicObject; class LwpSdwFileLoader diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index 58725c92326b..d660cc5587e1 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -54,6 +54,8 @@ * ************************************************************************/ +#include <tools/stream.hxx> + #include "lwpsdwgrouploaderv0102.hxx" #include "lwpdrawobj.hxx" #include "lwptools.hxx" diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx index c3a42e4b55c0..718e0f29e511 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx @@ -60,11 +60,11 @@ #include <sal/config.h> #include <rtl/ref.hxx> -#include <tools/stream.hxx> #include "lwpheader.hxx" #include "lwpsdwdrawheader.hxx" +class SvStream; class XFFrame; class XFDrawGroup; class LwpGraphicObject; diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx b/lotuswordpro/source/filter/lwpsvstream.cxx index e49b8b1cc425..6c3b2856c726 100644 --- a/lotuswordpro/source/filter/lwpsvstream.cxx +++ b/lotuswordpro/source/filter/lwpsvstream.cxx @@ -54,6 +54,7 @@ * ************************************************************************/ #include "lwpsvstream.hxx" +#include <tools/stream.hxx> const sal_uInt32 LwpSvStream::LWP_STREAM_BASE = 0x0010; diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/source/filter/lwpsvstream.hxx index 40cb435029f7..d7ccb525291f 100644 --- a/lotuswordpro/source/filter/lwpsvstream.hxx +++ b/lotuswordpro/source/filter/lwpsvstream.hxx @@ -58,7 +58,8 @@ #include "lwpheader.hxx" #include "xfilter/xfglobal.hxx" -#include <tools/stream.hxx> + +class SvStream; /** * @brief encapsulate XInputStream to provide SvStream like interfaces diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx index ff50f07fc019..e5d8ccea386d 100644 --- a/oox/qa/unit/vba_compression.cxx +++ b/oox/qa/unit/vba_compression.cxx @@ -14,6 +14,7 @@ #include <cppunit/TestFixture.h> #include <oox/ole/vbaexport.hxx> +#include <tools/stream.hxx> #include <algorithm> class TestVbaCompression : public test::BootstrapFixtureBase diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 460ca2cc552e..bacbbd5a8be1 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_ADDRESS_HXX #define INCLUDED_SC_INC_ADDRESS_HXX -#include <tools/stream.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <osl/endian.h> diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx index 99ade314a3ca..5c6fee903696 100644 --- a/sc/inc/grouparealistener.hxx +++ b/sc/inc/grouparealistener.hxx @@ -16,6 +16,8 @@ #include <svl/listener.hxx> #include <vector> +#include <vector> + class ScFormulaCell; class ScDocument; class ScColumn; diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index d47e795a0bb1..f174b362fcb1 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_USERLIST_HXX #define INCLUDED_SC_INC_USERLIST_HXX -#include <tools/stream.hxx> #include "scdllapi.h" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index 9d280833e0c8..cbc72f2186f4 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.hxx @@ -22,6 +22,7 @@ #include <formula/token.hxx> #include <formula/errorcodes.hxx> +#include <limits.h> #include <vector> #include "types.hxx" #include "address.hxx" diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index 27ee00b4c39c..0f63f3251afe 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_INC_XLSTREAM_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_XLSTREAM_HXX -#include <tools/stream.hxx> #include <svx/svxerr.hxx> #include "ftools.hxx" diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index cad138eab137..1f406029e861 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_INC_CUSSHOW_HXX #include <vector> -#include <tools/stream.hxx> #include <cppuhelper/weakref.hxx> #include "sddllapi.h" diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 0e8958589891..9f96da455a5e 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -19,6 +19,7 @@ #include <pptexsoundcollection.hxx> #include "epptdef.hxx" +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 693e17540c8b..2d9b20b53cda 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -26,7 +26,8 @@ #include <stdio.h> #endif #include <rtl/ustring.hxx> -#include <tools/stream.hxx> + +class SvStream; namespace ppt { diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index e216cbf5e310..7422ee935b47 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -22,6 +22,7 @@ #include <svx/svdobj.hxx> #include "sdpage.hxx" #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <svx/unoapi.hxx> #include "EffectMigration.hxx" #include <CustomAnimationPreset.hxx> diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 34118da9a2f3..1668ffcd2ad8 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -20,10 +20,12 @@ #ifndef INCLUDED_SD_SOURCE_FILTER_PPT_PPT97ANIMATIONS_HXX #define INCLUDED_SD_SOURCE_FILTER_PPT_PPT97ANIMATIONS_HXX -#include <tools/stream.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> class SdrObject; class Ppt97Animation; +class SvStream; /// helper class for reading PPT AnimationInfoAtom class Ppt97AnimationInfoAtom diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 568c380fcf71..323574084e5b 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -24,6 +24,7 @@ #include <unotools/configmgr.hxx> #include <svl/urihelper.hxx> #include <tools/datetime.hxx> +#include <tools/stream.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/evntconf.hxx> diff --git a/svl/source/inc/strmadpt.hxx b/svl/source/inc/strmadpt.hxx index c91d61cd06cc..ef1771f9c529 100644 --- a/svl/source/inc/strmadpt.hxx +++ b/svl/source/inc/strmadpt.hxx @@ -23,7 +23,6 @@ #include <sal/config.h> #include <com/sun/star/io/XOutputStream.hpp> -#include <tools/stream.hxx> class SvOutputStreamOpenLockBytes: public SvOpenLockBytes diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 169219f416d4..faeeae6745eb 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -19,6 +19,7 @@ #include <svl/lckbitem.hxx> #include <svl/poolitem.hxx> +#include <tools/stream.hxx> #include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx index f075d40f7804..3435b60546f7 100644 --- a/svtools/source/svhtml/HtmlWriter.cxx +++ b/svtools/source/svhtml/HtmlWriter.cxx @@ -9,6 +9,7 @@ */ #include <svtools/HtmlWriter.hxx> +#include <tools/stream.hxx> HtmlWriter::HtmlWriter(SvStream& rStream) : mrStream(rStream), diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index a333678fb5af..4fc1f3b7a953 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/svx/source/tbxctrls/Palette.cxx @@ -18,6 +18,7 @@ */ #include <svx/Palette.hxx> +#include <tools/stream.hxx> Palette::~Palette() diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 69c0016f9883..7e618275d83f 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -18,6 +18,7 @@ */ #include <sot/formats.hxx> +#include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index b1dc3974cc60..960f5bdcf78c 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -21,7 +21,6 @@ #include <i18nlangtag/lang.h> #include <tools/color.hxx> -#include <tools/stream.hxx> #include <tools/gen.hxx> #include <editeng/svxfont.hxx> #include <swtypes.hxx> diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 2f8fe1bedee9..cb77d85a1c5d 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/form/XForm.hpp> #include <vcl/field.hxx> #include <i18nlangtag/lang.h> -#include <tools/stream.hxx> #include <comphelper/stl_types.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index abb57bb82c40..8d985ccfd0af 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -24,6 +24,7 @@ #include <cstdio> #include <osl/endian.h> #include <rtl/ustrbuf.hxx> +#include <tools/stream.hxx> namespace ww8 { diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 8c50744be0fc..744e4d9d085f 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -25,9 +25,10 @@ #include <boost/shared_array.hpp> #include <tools/solar.h> #include <rtl/ustring.hxx> -#include <tools/stream.hxx> #include <IDocumentExternalData.hxx> +class SvStream; + namespace ww8 { diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 5df35f9e71f4..8f9cc49fbbc5 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -40,6 +40,8 @@ #include <i18nlangtag/lang.h> #include <editeng/unolingu.hxx> +#include <tools/stream.hxx> + #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index c4ca1d6f3d5b..c74624ab2103 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -32,7 +32,6 @@ #include <vector> #include <tools/solar.h> -#include <tools/stream.hxx> #include <rtl/ustring.hxx> #include "sortedarray.hxx" @@ -41,6 +40,8 @@ #include <unomid.h> +class SvStream; + //--Line below which the code has meaningful comments //Commonly used string literals for stream and storage names in word docs diff --git a/test/source/xmlwriter.cxx b/test/source/xmlwriter.cxx index de3b901902ec..80f63993c145 100644 --- a/test/source/xmlwriter.cxx +++ b/test/source/xmlwriter.cxx @@ -18,6 +18,7 @@ */ #include <libxml/xmlstring.h> +#include <tools/stream.hxx> #include <test/xmlwriter.hxx> namespace diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 7b763996890c..fc735b5ca3e1 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -24,9 +24,10 @@ #include <comphelper/string.hxx> #include <ucbhelper/content.hxx> #include <cppuhelper/implbase.hxx> +#include <tools/fract.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <tools/zcodec.hxx> -#include <tools/fract.hxx> #include <vcl/dibtools.hxx> #include <vcl/salctype.hxx> #include <vcl/pngread.hxx> diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 62aa6bf6dc07..26a69d260493 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -18,6 +18,7 @@ */ #include <osl/file.h> +#include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <tools/debug.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index bc60fa093bf8..a9987929ec1c 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <vcl/graphictools.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 7b2adef4d57e..d5421cd7e603 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -33,7 +33,6 @@ #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/stream.hxx> #include <vcl/bitmapex.hxx> #include <vcl/gradient.hxx> #include <vcl/hatch.hxx> @@ -53,6 +52,8 @@ class ZCodec; class EncHashTransporter; struct BitStreamState; class PhysicalFontFace; +class SvStream; +class SvMemoryStream; // the maximum password length #define ENCRYPTED_PWD_SIZE 32 diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 836c5d4a20c1..f7c3d2759d54 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -31,6 +31,7 @@ #include "unotools/streamwrap.hxx" #include <tools/fract.hxx> +#include <tools/stream.hxx> #include "comphelper/processfactory.hxx" |