diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 18:08:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:05 +0200 |
commit | 7df89ec7a2ccfc9b448ea33d0a9d4412062dee67 (patch) | |
tree | 7a5a54587481bb80458d0593af1695fca49b0f08 /include/filter/msfilter | |
parent | 0241519f323b2b29db747467b8c3d9590c33f0df (diff) |
Remove unnecessary includes of sot/storage.hxx from include/
Change-Id: I242cd126814bbebdb99ea38d9e66513189c313d9
Diffstat (limited to 'include/filter/msfilter')
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 7 | ||||
-rw-r--r-- | include/filter/msfilter/msocximex.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/svxmsbas.hxx | 2 |
4 files changed, 7 insertions, 6 deletions
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 |