diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:46:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:46:14 +0000 |
| commit | 9febce34953f0905b6bc0d492457e63c41bd7550 (patch) | |
| tree | 48bcf6b5fda8a168e0b44510a16d8c111612dfcf /slideshow | |
| parent | 12ce7dc253103ce4ea4dbee80785f0b88c0fb696 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.2.24); FILE MERGED
2007/11/02 13:02:38 pl 1.2.24.2: #i82234# use quicktime service on quartz
2007/10/26 11:41:21 pl 1.2.24.1: #i82621# transport window handle as sal_IntPtr
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f85d0246b22d..8c310543a40a 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewmediashape.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2007-07-17 14:55:30 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:46:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,6 +77,8 @@ #ifdef WNT #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX" +#elif defined QUARTZ +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_QuickTime" #else #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java" #endif @@ -452,7 +454,7 @@ namespace slideshow if( mxPlayer.is() ) { aArgs[ 0 ] = uno::makeAny( - sal::static_int_cast<sal_Int32>( + sal::static_int_cast<sal_IntPtr>( mpMediaWindow->getParentWindowHandleForJava()) ); aAWTRect.X = aAWTRect.Y = 0; |