summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 12:57:04 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 12:57:04 +0000
commit10e47a1c2cb987de342ab98be78f2dd4d797fe26 (patch)
treee20dca525270622a24aad002f7d55fa1ba094684 /avmedia
parentde6ac4a03059a6503cb39a1c1c0121d3f6c7c0eb (diff)
INTEGRATION: CWS sb91 (1.11.6); FILE MERGED
2008/07/11 09:05:55 sb 1.11.6.1: #i91042# #include <cXXX> vs. <XXX.h> and using identifiers without std:: prefix (which is necessary for old MSVC versions)
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/mediacontrol.cxx4
-rw-r--r--avmedia/source/viewer/mediawindow.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index db73fa9b6513..9ed28adc7067 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mediacontrol.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -39,7 +39,7 @@
#include <vcl/lstbox.hxx>
#include <svtools/syslocale.hxx>
#include <sfx2/viewfrm.hxx>
-#include <cmath>
+#include <math.h>
#include <algorithm>
#define AVMEDIA_TIMEOUT 100
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 5e0adc2c1909..5a3376c0ce65 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mediawindow.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <cstdio>
+#include <stdio.h>
#include <avmedia/mediawindow.hxx>
#include "mediawindow_impl.hxx"