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

@@ -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 <avmedia/mediaitem.hxx>
 
 #include <vcl/timer.hxx>
 #include <vcl/slider.hxx>

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 <avmedia/mediaplayer.hxx>
+#include <avmedia/mediawindow.hxx>
+#include <avmedia/mediaitem.hxx>
 #include "mediamisc.hxx"
 #include "mediacontrol.hrc"
 #include "helpids.hrc"

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 <avmedia/mediatoolbox.hxx>
+#include <avmedia/mediaitem.hxx>
 #include "mediacontrol.hxx"
 
 #include <sfx2/app.hxx>