diff options
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 1 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 | ||||
| -rw-r--r-- | include/svx/svdoole2.hxx | 24 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/documen5.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/charthelper.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/starcalc/scfobj.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/chartuno.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/viewfun7.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdetc.cxx | 8 |
16 files changed, 31 insertions, 16 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 350d4d593e0a..66e49fd338e0 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -135,6 +135,7 @@ #include <svx/xbitmap.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> +#include <svtools/embedhlp.hxx> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 17d4e71a8658..3fba7dad3348 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -115,6 +115,8 @@ #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <vcl/virdev.hxx> +#include <svtools/embedhlp.hxx> + #include <algorithm> #include <set> #include <rtl/strbuf.hxx> diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 7384662f42c0..ad60e5620f73 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -20,28 +20,26 @@ #ifndef INCLUDED_SVX_SVDOOLE2_HXX #define INCLUDED_SVX_SVDOOLE2_HXX -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <svx/svdorect.hxx> -#include <vcl/graph.hxx> -#include <vcl/gdimtf.hxx> -#include <sot/storage.hxx> #include <svx/svxdllapi.h> -namespace com { namespace sun { namespace star { namespace embed { +#include <com/sun/star/uno/Reference.h> + +namespace com { namespace sun { namespace star { + +namespace awt { class XWindow; } -class XEmbeddedObject; +namespace datatransfer { class XTransferable; } -}}}} +namespace embed { class XEmbeddedObject; } -namespace svt { +namespace frame { class XModel; } -class EmbeddedObjectRef; +}}} -} +namespace svt { class EmbeddedObjectRef; } +class Graphic; class SvxUnoShapeModifyListener; class SdrOle2ObjImpl; diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 45ade69b10e7..0d76ae25bf80 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -39,6 +39,7 @@ #include <svx/sderitm.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlntrit.hxx> +#include <svtools/embedhlp.hxx> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/awt/XUnoControlContainer.hpp> diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 85fa41378ffe..b90297909a72 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -29,6 +29,7 @@ #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> +#include <svtools/embedhlp.hxx> #include "document.hxx" #include "table.hxx" diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index c0031483c1a3..012eb872dae5 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -27,6 +27,7 @@ #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> +#include <svtools/embedhlp.hxx> #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/util/XModifiable.hpp> diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 51f8781364be..3b6a2f8d02b0 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -44,6 +44,7 @@ #include <editeng/editobj.hxx> #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <svtools/embedhlp.hxx> #include "editutil.hxx" #include "unonames.hxx" diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index ad655952fe44..86f14a106ca3 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -81,6 +81,7 @@ #include <svx/xlntrit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xbitmap.hxx> +#include <svtools/embedhlp.hxx> #include "document.hxx" #include "drwlayer.hxx" diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 08e7416f7f6f..b9f231b2c39c 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -27,6 +27,7 @@ using namespace com::sun::star; #include <svx/charthelper.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> +#include <svtools/embedhlp.hxx> #include <sfx2/objsh.hxx> #include <sot/storage.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 306500176f09..fa9dbfdfd6f5 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -37,6 +37,7 @@ #include <unotools/moduleoptions.hxx> #include <svtools/insdlg.hxx> #include <svtools/soerr.hxx> +#include <svtools/embedhlp.hxx> #include <svx/svxdlg.hxx> #include <comphelper/classids.hxx> #include <svx/svdpagv.hxx> diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index e5d73213f71d..155f14641775 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -34,6 +34,7 @@ #include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svx/charthelper.hxx> +#include <svtools/embedhlp.hxx> #include "chartuno.hxx" #include "miscuno.hxx" diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 68bf8097556c..47004061ec3d 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -28,6 +28,7 @@ #include <svx/svdundo.hxx> #include <svx/xbtmpit.hxx> #include <svx/xoutbmp.hxx> +#include <svtools/embedhlp.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 05b80fd2a3e8..bef599196be0 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -41,6 +41,7 @@ #include <svl/globalnameitem.hxx> #include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> +#include <svtools/embedhlp.hxx> #include <svx/pfiledlg.hxx> #include <svx/dialogs.hrc> #include <sfx2/linkmgr.hxx> diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 335b58af287a..47f962c50557 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -53,6 +53,7 @@ #include <vcl/metaact.hxx> #include <svx/svxids.hrc> #include <toolkit/helper/vclunohelper.hxx> +#include <svtools/embedhlp.hxx> #include "DrawDocShell.hxx" #include "fupoor.hxx" #include "tablefunction.hxx" diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index a437669a0ca8..b15b44fa111f 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -38,6 +38,7 @@ #include <avmedia/modeltools.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> +#include <svtools/embedhlp.hxx> #include <vcl/graphicfilter.hxx> #include "app.hrc" #include "Window.hxx" diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index fbf9801e80cf..fad9bf8f01a1 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -20,8 +20,6 @@ #include "sal/config.h" #include "editeng/forbiddencharacterstable.hxx" -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/embed/EmbedStates.hpp> #include "officecfg/Office/Common.hxx" #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> @@ -48,7 +46,6 @@ #include <svx/svdoole2.hxx> #include <svl/itempool.hxx> #include <unotools/localedatawrapper.hxx> -#include <com/sun/star/lang/Locale.hpp> #include <i18nlangtag/lang.h> #include <unotools/syslocale.hxx> #include <svx/xflbckit.hxx> @@ -61,6 +58,11 @@ #include <svx/svdotable.hxx> #include <svx/sdrhittesthelper.hxx> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> +#include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/lang/Locale.hpp> + using namespace ::com::sun::star; /****************************************************************************** |