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

Change-Id: I242cd126814bbebdb99ea38d9e66513189c313d9
2015-05-06 18:08:16 +02:00 · 2015-05-06 18:08:16 +02:00 · 7df89ec7a2
commit 7df89ec7a2
parent 0241519f32
39 changed files with 63 additions and 20 deletions
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@ -41,6 +41,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <sot/exchange.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/visitem.hxx>
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@ -19,6 +19,8 @@

 #include "ChartTransferable.hxx"

+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
 #include <svl/itempool.hxx>
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@ -54,6 +54,7 @@

 #include <editeng/frmdiritem.hxx>
 #include <rtl/uuid.h>
+#include <tools/globname.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@ -20,6 +20,7 @@
 #include "sbagrid.hrc"
 #include "uiservices.hxx"

+#include <sot/exchange.hxx>
 #include <svx/svxids.hrc>

 #include <svx/numinf.hxx>
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@ -59,6 +59,7 @@

 #include <comphelper/processfactory.hxx>

+#include <sot/exchange.hxx>
 #include <sot/formats.hxx>

 #include <unicode/ubidi.h>
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@ -36,6 +36,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sot/formats.hxx>
+#include <sot/storage.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@ -21,6 +21,7 @@

 #include <basic/basmgr.hxx>
 #include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
 #include <svx/svxerr.hxx>
 #include <filter/msfilter/svxmsbas.hxx>

--- 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; }
--- 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;
--- 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{
--- 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>

--- 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
--- 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 {
--- 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>
--- 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
--- 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>
--- 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
 {
--- 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:

--- 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;
--- 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>
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@ -20,6 +20,7 @@
 #include "oox/ole/olehelper.hxx"

 #include <rtl/ustrbuf.hxx>
+#include <sot/storage.hxx>
 #include <osl/diagnose.h>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/graphichelper.hxx"
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@ -18,6 +18,7 @@
 */
 #include "GroupsSorting.hxx"
 #include <connectivity/dbtools.hxx>
+#include <sot/exchange.hxx>
 #include <svtools/editbrowsebox.hxx>
 #include <svtools/imgdef.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@ -19,6 +19,7 @@
 #include "dlgedclip.hxx"
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
+#include <sot/exchange.hxx>
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>

--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@ -20,6 +20,7 @@
 #include <rsc/rscsfx.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@ -21,6 +21,7 @@

 #include <memory>
 #include <editeng/adjustitem.hxx>
+#include <sot/storage.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@ -29,6 +29,7 @@
 #include <svl/urlbmk.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/formats.hxx>
+#include <sot/storage.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/msgbox.hxx>
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@ -24,6 +24,7 @@
 #include <editeng/editstat.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/flditem.hxx>
+#include <sot/storage.hxx>
 #include <svx/hlnkitem.hxx>
 #include <editeng/langitem.hxx>
 #include <svx/svxerr.hxx>
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@ -37,6 +37,7 @@
 #include <comphelper/classids.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
+#include <sot/storage.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/stritem.hxx>
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@ -101,6 +101,7 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/interactionrequest.hxx>
 #include <sot/stg.hxx>
+#include <sot/storage.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/documentlockfile.hxx>
 #include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@ -23,6 +23,7 @@

 #include <string>
 #include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@ -87,6 +87,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/docinfohelper.hxx>
 #include <ucbhelper/content.hxx>
+#include <sot/storage.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@ -24,7 +24,7 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-
+#include <sot/exchange.hxx>
 #include <svtools/embedtransfer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@ -17,6 +17,9 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <sal/config.h>
+
+#include <sot/exchange.hxx>
 #include <svtools/stringtransfer.hxx>


--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@ -17,7 +17,9 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <sal/config.h>

+#include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@ -1533,6 +1533,12 @@ bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromReso
 bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
 bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
 bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
+
+tools::SvRef<SotStorage> GalleryTheme::GetSvDrawStorage() const
+{
+    return aSvDrawStorageRef;
+}
+
 const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }

 void GalleryTheme::InsertAllThemes( ListBox& rListBox )
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@ -23,6 +23,7 @@

 #include <set>

+#include <sot/exchange.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@ -17,7 +17,10 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <sal/config.h>

+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <svx/dialogs.hrc>

 #include <sfx2/viewsh.hxx>
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@ -31,6 +31,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <sot/storage.hxx>
 #include <tools/debug.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@ -21,6 +21,7 @@

 #include <FrameControlsManager.hxx>

+#include <sot/exchange.hxx>
 #include <svx/svdobj.hxx>
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>