From 75f4b71de5dbdcb54c07557da345c12a3c11b14c Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 27 Jun 2007 21:23:42 +0000 Subject: INTEGRATION: CWS vgbugs07 (1.4.42); FILE MERGED 2007/06/04 13:32:37 vg 1.4.42.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01 --- avmedia/inc/mediacontrol.hxx | 6 +++--- avmedia/source/framework/mediaplayer.cxx | 10 +++++----- avmedia/source/framework/mediatoolbox.cxx | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 1cd06a2a40d3..4a8cf7854eb8 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -4,9 +4,9 @@ * * $RCSfile: mediacontrol.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-19 13:57:28 $ + * last change: $Author: hr $ $Date: 2007-06-27 22:22:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,7 @@ #ifndef _AVMEDIA_MEDIACONTROL_HXX #define _AVMEDIA_MEDIACONTROL_HXX -#include "mediaitem.hxx" +#include #include #include diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 1990cca5a944..10233d228320 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediaplayer.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-19 13:58:18 $ + * last change: $Author: hr $ $Date: 2007-06-27 22:23:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,9 +33,9 @@ * ************************************************************************/ -#include "mediaplayer.hxx" -#include "mediawindow.hxx" -#include "mediaitem.hxx" +#include +#include +#include #include "mediamisc.hxx" #include "mediacontrol.hrc" #include "helpids.hrc" diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index b0d23a16bcdb..51e2f6dee775 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediatoolbox.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-19 13:58:29 $ + * last change: $Author: hr $ $Date: 2007-06-27 22:23:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,8 +33,8 @@ * ************************************************************************/ -#include "mediatoolbox.hxx" -#include "mediaitem.hxx" +#include +#include #include "mediacontrol.hxx" #include -- cgit