diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-12 19:40:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-12 21:53:46 +0100 |
| commit | 5924454a867bd500fdc696bb9939c84425c5e025 (patch) | |
| tree | ab99a45ad189265259385d68a089a5de62004b7c /svx/source/unodraw/unoshap4.cxx | |
| parent | 41927a4f2fe824dd1588c4ed0e14de0f2220c039 (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.
Diffstat (limited to 'svx/source/unodraw/unoshap4.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index c4c7e687df2c..ad517c25a17e 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -955,7 +955,8 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) - || (pProperty->nWID == OWN_ATTR_GRAPHIC_STREAM)) + || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) + || (pProperty->nWID == OWN_ATTR_MEDIA_TEMPFILEURL)) { SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( mpObj.get() ); const ::avmedia::MediaItem aItem( pMedia->getMediaProperties() ); @@ -982,10 +983,14 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf rValue <<= aItem.getZoom(); break; - case OWN_ATTR_GRAPHIC_STREAM: + case OWN_ATTR_MEDIA_STREAM: rValue <<= pMedia->GetInputStream(); break; + case OWN_ATTR_MEDIA_TEMPFILEURL: + rValue <<= aItem.getTempURL(); + break; + default: OSL_FAIL("SvxMediaShape::getPropertyValueImpl(), unknown property!"); } |