more removed include guards using fixguard.py

19 files changed, 0 insertions, 56 deletions

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index fdd27582a5f4..b83915e4775b 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -29,9 +29,7 @@
 #define _AVMEDIA_MEDIAITEM_HXX
 
 #include <tools/rtti.hxx>
-#ifndef _POOLITEM_HXX
 #include <svl/poolitem.hxx>
-#endif
 #include <com/sun/star/media/ZoomLevel.hpp>
 
 #define AVMEDIA_SETMASK_NONE        ((sal_uInt32)(0x00000000))
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index d3e1f2419b53..b64acf22b2ba 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -30,33 +30,15 @@
 
 #include <gst/gst.h>
 
-#ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
-#endif
-#ifndef _DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef _STREAM_HXX
 #include <tools/stream.hxx>
-#endif
-#ifndef _STRING_HXX
 #include <tools/string.hxx>
-#endif
-#ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
-#endif
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 11f6b6f8b217..b940e1170d5a 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -30,9 +30,7 @@
 
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 namespace avmedia { namespace gstreamer {
 
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index eebf4edd73fa..3ba0315fb34e 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -30,9 +30,7 @@
 
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 778c877edf46..69b55ab34adf 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -31,9 +31,7 @@
 #include <osl/conditn.h>
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 typedef struct _GstXOverlay GstXOverlay;
 
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 4a7b84e4bb59..a17ee1f35135 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -31,9 +31,7 @@
 #include "gstcommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace gstreamer {
 
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index a5b004e0383e..56e3f5efb13f 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -30,9 +30,7 @@
 
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 07740a1a9259..c888eb1d2030 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -30,9 +30,7 @@
 
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index e85bbc5035db..52f15f545a31 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -31,9 +31,7 @@
 #include <osl/conditn.h>
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 4ca2e76ddc52..33baf7d19e88 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -31,9 +31,7 @@
 #include "quicktimecommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index ff077f034e43..17607d817ff8 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -40,12 +40,8 @@
 #include <vcl/sysdata.hxx>
 #endif
 
-#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
 #include <com/sun/star/awt/SystemPointer.hdl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
 #include <com/sun/star/lang/XComponent.hdl>
-#endif
 
 #define AVMEDIA_TOOLBOXITEM_PREV    0x0001
 #define AVMEDIA_TOOLBOXITEM_PLAY    0x0002
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index ea28121e3609..3d249b1c2046 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -33,9 +33,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/media/XManager.hpp>
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
 #include <com/sun/star/lang/XComponent.hdl>
-#endif
 
 #define MEDIA_TIMER_TIMEOUT 100
 
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 17085571feea..83bc7ff68da1 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 struct IMediaDet;
 
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 1bb3e530c016..ff07f778f88f 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 34a567750b74..e3dc64f3eb32 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 struct IGraphBuilder;
 struct IBaseFilter;
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 36cff49a742a..b923f4f73290 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -31,9 +31,7 @@
 #include "wincommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 struct IVideoWindow;
 
diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
index b8faf2774f73..791f93282bd4 100644
--- a/avmedia/source/xine/manager.hxx
+++ b/avmedia/source/xine/manager.hxx
@@ -30,9 +30,7 @@
 
 #include "xinecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -
diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
index b1e18613fbeb..b6e10c98799c 100644
--- a/avmedia/source/xine/player.hxx
+++ b/avmedia/source/xine/player.hxx
@@ -30,9 +30,7 @@
 
 #include "xinecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 namespace avmedia { namespace xine {
 
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
index 014d349acfac..4c154971cfc9 100644
--- a/avmedia/source/xine/window.hxx
+++ b/avmedia/source/xine/window.hxx
@@ -31,9 +31,7 @@
 #include "xinecommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace xine {