diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-12-01 17:41:04 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-12-01 17:41:04 +0000 |
commit | 4a3821a109cb04769de35dee54c10633410015d0 (patch) | |
tree | c05ea750b9c8422e526be308809d6314cec6bc42 /sw/source/ui/shells/mediash.cxx | |
parent | 0eba06e9a0f0585f81f466f4c768bc7043673013 (diff) | |
parent | b60103486b997271ba94c9de92401a91d758e603 (diff) |
chartshapes: merge with DEV300 m55
Diffstat (limited to 'sw/source/ui/shells/mediash.cxx')
-rw-r--r-- | sw/source/ui/shells/mediash.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 933d7254bb8a..ae1ed883cb8b 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -39,9 +39,7 @@ #endif #include <hintids.hxx> #include <tools/urlobj.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/stritem.hxx> #include <svtools/whiter.hxx> #include <svtools/urihelper.hxx> @@ -60,21 +58,15 @@ #include <svx/brshitem.hxx> #include <svx/grfflt.hxx> #include <fmturl.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <viewopt.hxx> #include <swmodule.hxx> #include <frmatr.hxx> #include <swundo.hxx> #include <uitool.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _MEDIASH_HXX #include <mediash.hxx> -#endif #include <frmmgr.hxx> #include <frmdlg.hxx> #include <frmfmt.hxx> @@ -95,7 +87,7 @@ #include <avmedia/mediaitem.hxx> #define SwMediaShell -#include "itemdef.hxx" +#include <sfx2/msg.hxx> #include "swslots.hxx" #include "swabstdlg.hxx" |