Remove unnecessary includes of sot/storage.hxx from include/

Change-Id: I242cd126814bbebdb99ea38d9e66513189c313d9

13 files changed, 26 insertions, 19 deletions

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 91c515762629..d4438d42d835 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 
 #include <o3tl/sorted_vector.hxx>
-#include <sot/storage.hxx>
+#include <tools/ref.hxx>
 #include <tools/rtti.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/time.hxx>
@@ -36,6 +36,7 @@
 
 class CharClass;
 class SfxPoolItem;
+class SotStorage;
 class SvxAutoCorrect;
 class SfxObjectShell;
 namespace vcl { class Window; }
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 34834adcdf5e..fc54adeaba6b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -38,8 +38,6 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 
-#include <sot/storage.hxx>
-
 #include <vcl/graph.hxx>
 
 #include <svx/msdffdef.hxx>
@@ -49,6 +47,7 @@
 #include <filter/msfilter/msfilterdllapi.h>
 
 class Graphic;
+class SotStorage;
 class SvStream;
 class SdrObject;
 class SdrOle2Obj;
@@ -68,6 +67,10 @@ class SdrObject;
 class SdrTextObj;
 struct DffObjData;
 
+namespace com { namespace sun { namespace star { namespace embed {
+    class XStorage;
+} } } }
+
 class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
 {
     const SvxMSDffManager&  rManager;
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index caa91f748893..f0dd8510ae1d 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 #define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 
-#include <sot/storage.hxx>
-
 #include <filter/msfilter/msfilterdllapi.h>
 
 namespace com{namespace sun{namespace star{
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 227f97ca6b8d..14ddff3dc627 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -9,7 +9,6 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #include <filter/msfilter/msfilterdllapi.h>
-#include <sot/storage.hxx>
 #include <ostream>
 #include <memory>
 #include <vector>
@@ -19,6 +18,7 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index d379750e3d8e..312e18c87b11 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -23,11 +23,11 @@
 #include <tools/solar.h>
 #include <filter/msfilter/msfilterdllapi.h>
 
-#include <sot/storage.hxx>
 #include <map>
 #include <unordered_map>
 
 class SfxObjectShell;
+class SotStorage;
 
 /* Construct with the root storage of the MS document, with bImportCode
  * set the visual basic code will be imported into the stardocument when Import
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 17e76e254a86..f82cd2b681e3 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_OLE_OLEHELPER_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
 #include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/storagebase.hxx>
 #include <oox/helper/graphichelper.hxx>
@@ -37,8 +38,9 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/msocximex.hxx>
 #include <oox/dllapi.h>
-#include <sot/storage.hxx>
 
+class SotStorage;
+class SotStorageStream;
 class SvGlobalName;
 
 namespace oox {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index b9d20fe2d6a1..ce8ab3018f6f 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -23,6 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/signaturestate.hxx>
 #include <sal/types.h>
+#include <tools/errcode.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -40,7 +41,8 @@
 #include <vcl/vclptr.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/bitmap.hxx>
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
+#include <sot/object.hxx>
 #include <rsc/rscsfx.hxx>
 
 #include <sfx2/XmlIdRegistry.hxx>
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index c292b13d07ff..c58e6b3674c6 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -24,8 +24,8 @@
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
+#include <tools/ref.hxx>
 #include <sot/formats.hxx>
-#include <sot/storage.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/frame/XTerminateListener.hpp>
@@ -49,6 +49,8 @@ class ImageMap;
 class INetBookmark;
 class INetImage;
 class FileList;
+class SotStorageStream;
+struct DataFlavorExVector;
 namespace vcl { class Window; }
 
 // Drag&Drop defines
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index fccf29d097b8..ebe4e78255dc 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SVX_DBAEXCHANGE_HXX
 #define INCLUDED_SVX_DBAEXCHANGE_HXX
 
+#include <sal/config.h>
+
+#include <o3tl/typed_flags_set.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index c0604ea80067..729bdd20fd24 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_GALMISC_HXX
 #define INCLUDED_SVX_GALMISC_HXX
 
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/imap.hxx>
 #include <svl/hint.hxx>
@@ -33,6 +33,7 @@
 #include <tools/time.hxx>
 
 class GalleryTheme;
+class SotStorageStream;
 
 struct ExchangeData
 {
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 21ec91ffb67e..371d4a065570 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -28,14 +28,12 @@
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/transfer.hxx>
-#include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/galmisc.hxx>
 #include <vector>
 
-
-// - GalleryObject -
-
+class SotStorage;
+class SotStorageStream;
 
 // - SgaObjKind -
 
@@ -182,7 +180,7 @@ public:
     SAL_DLLPRIVATE void         AbortActualize() { bAbortActualize = true; }
 
     SAL_DLLPRIVATE Gallery*     GetParent() const { return pParent; }
-    SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const { return aSvDrawStorageRef; }
+    SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const;
 
 public:
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 2248d4bebb7a..4d56a4413801 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/weakref.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
 #include <rtl/ustring.hxx>
-#include <sot/storage.hxx>
 #include <tools/link.hxx>
 #include <tools/weakbase.hxx>
 #include <vcl/mapmod.hxx>
@@ -74,7 +73,6 @@ class XHatchList;
 class XLineEndList;
 class SvxForbiddenCharactersTable;
 class SvNumberFormatter;
-class SotStorage;
 class SdrOutlinerCache;
 class SdrUndoFactory;
 class ImageMap;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 61ed78d6cba3..f5680edb74af 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
-#include <sot/storage.hxx>
 #include <map>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>