diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-11 18:21:11 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-27 13:59:10 +0100 |
commit | 20635ed90b2f684757c480b3cff70547a0e06363 (patch) | |
tree | 74c9ce05217df1d7839a3013aa832137b8775a95 /include | |
parent | 7e89e2827489d0b3bbd488f6c9e5a9e7e404d732 (diff) |
Reduce scope of #include <tools/stream.hxx>
Change-Id: I0752cbb0cb2e0f89607d81d9eda7ce7091449fd6
Diffstat (limited to 'include')
-rw-r--r-- | include/editeng/editobj.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/dffpropset.hxx | 3 | ||||
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 | ||||
-rw-r--r-- | include/framework/eventsconfiguration.hxx | 1 | ||||
-rw-r--r-- | include/framework/statusbarconfiguration.hxx | 1 | ||||
-rw-r--r-- | include/oox/ole/vbaexport.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/frmhtmlw.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/mnumgr.hxx | 1 | ||||
-rw-r--r-- | include/svtools/HtmlWriter.hxx | 3 | ||||
-rw-r--r-- | include/svx/Palette.hxx | 2 | ||||
-rw-r--r-- | include/svx/msdffdef.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdlayer.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdsob.hxx | 1 | ||||
-rw-r--r-- | include/svx/xexch.hxx | 3 | ||||
-rw-r--r-- | include/test/xmlwriter.hxx | 2 | ||||
-rw-r--r-- | include/vcl/gfxlink.hxx | 3 | ||||
-rw-r--r-- | include/vcl/graphicfilter.hxx | 2 | ||||
-rw-r--r-- | include/vcl/graphictools.hxx | 3 | ||||
-rw-r--r-- | include/vcl/ppdparser.hxx | 2 | ||||
-rw-r--r-- | include/vcl/print.hxx | 1 |
20 files changed, 20 insertions, 23 deletions
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> |