Reduce scope of #include <tools/stream.hxx>

Change-Id: I0752cbb0cb2e0f89607d81d9eda7ce7091449fd6

8 files changed, 11 insertions, 4 deletions

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>