diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-12 23:13:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-13 11:54:54 +0100 |
| commit | 10ed09bf281e7b97ff5389a5aad3ab78379b93ae (patch) | |
| tree | e1c48d3c1a0ea446554d769739dcec50f73cea94 /slideshow/source/engine/shapes/viewmediashape.cxx | |
| parent | c0b56386d0274a6dc010877c1d845dffcdb4232a (diff) | |
slideshow: play back embedded media:
The slideshow uses the UNO API to access the drawing objects,
so add a property to get the temp file URL from the media object.
(cherry picked from commit 5924454a867bd500fdc696bb9939c84425c5e025)
Diffstat (limited to 'slideshow/source/engine/shapes/viewmediashape.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index ebd4343d4ed9..5957cf6bf097 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -286,11 +286,21 @@ namespace slideshow xPropSet.set( mxShape, uno::UNO_QUERY ); // create Player - if( xPropSet.is() && - ( xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ) ) >>=aURL ) ) + if (xPropSet.is()) { - implInitializeMediaPlayer( aURL ); + if ((xPropSet->getPropertyValue( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "PrivateTempFileURL"))) >>= aURL) + && aURL.getLength()) + { + implInitializeMediaPlayer( aURL ); + } + else if (xPropSet->getPropertyValue( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "MediaURL"))) >>= aURL) + { + implInitializeMediaPlayer( aURL ); + } } // create visible object |