[Libreoffice-commits] core.git: avmedia/source

Stephan Bergmann sbergman at redhat.com
Wed Nov 20 08:54:59 PST 2013


 avmedia/source/viewer/mediawindow_impl.cxx |    3 ++-
 avmedia/source/viewer/mediawindow_impl.hxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 55b489ccbaf8bb17082d75a27e48b158008446ac
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 20 17:54:15 2013 +0100

    Transport Referer from MediaWindowImpl::setURL to ...::updateMediaItem
    
    Change-Id: I9cc6ae4fc5fc67837fcfc5fdea92baadd032996e

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 2c22396..73b4bf4 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -253,6 +253,7 @@ uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( const OUString&
 void MediaWindowImpl::setURL( const OUString& rURL,
         OUString const& rTempURL, OUString const& rReferer)
 {
+    maReferer = rReferer;
     if( rURL != getURL() )
     {
         if( mxPlayer.is() )
@@ -331,7 +332,7 @@ void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const
     rItem.setMute( isMute() );
     rItem.setVolumeDB( getVolumeDB() );
     rItem.setZoom( getZoom() );
-    rItem.setURL( getURL(), mTempFileURL, ""/*TODO?*/ );
+    rItem.setURL( getURL(), mTempFileURL, maReferer );
 }
 
 void MediaWindowImpl::executeMediaItem( const MediaItem& rItem )
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 42d9510..87c4167 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -160,6 +160,7 @@ namespace avmedia
 
             OUString                                                                    maFileURL;
             OUString                                                                    mTempFileURL;
+            OUString                                                                    maReferer;
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >        mxPlayer;
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >  mxPlayerWindow;
             MediaWindow*                                                                mpMediaWindow;


More information about the Libreoffice-commits mailing list