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

[Zolnai Tamás]

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

New commits:
commit ddb73c61377ad44baaa83ea92b4445e31b6f58bb
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun May 25 15:36:21 2014 +0200

    avmedia: call resize before player window is created
    
    Since b5529c8c457f442bfc43305becc0c02d6a09ee80
    MediaChildWindow is depend on the media URL so
    it is constructed later and so one resizing is
    missed before creating the player window which
    causes to display nothing in the media player
    (Tools -> Media Player)
    
    Change-Id: I548e6bb73193fccd1735e8343e9c06428ee686bc

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index a361843..114ab9b 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -514,6 +514,7 @@ void MediaWindowImpl::onURLChanged()
 
     if( mxPlayer.is() )
     {
+        Resize();
         uno::Sequence< uno::Any >              aArgs( 3 );
         uno::Reference< media::XPlayerWindow > xPlayerWindow;
         const Point                            aPoint;
commit 25db60d2e4f1097cdd6a9944e96461fe57658628
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun May 25 15:38:03 2014 +0200

    Partly revert 4ec3554a80f065c2d9c957d6ce7f577fb195be02
    
    mpEvents is freed by other object so using
    scoped_ptr lead to crash.
    
    Change-Id: I28c9d322b5ee5da6edf5022da18b42f59b608dec

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 1310832..a361843 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -510,8 +510,7 @@ void MediaWindowImpl::onURLChanged()
     if( !mpChildWindow )
         return;
     mpChildWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
-    mpEvents.reset(new MediaEventListenersImpl( *mpChildWindow.get() ) );
-    mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents.get() ) );
+    mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( *mpChildWindow.get() ) ) );
 
     if( mxPlayer.is() )
     {
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index d608430..7bf7f36 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -171,7 +171,7 @@ namespace avmedia
             MediaWindow*                                                                mpMediaWindow;
 
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxEventsIf;
-            boost::scoped_ptr<MediaEventListenersImpl>                             mpEvents;
+            MediaEventListenersImpl*                                                mpEvents;
             bool                                                                    mbEventTransparent;
             boost::scoped_ptr<MediaChildWindow>                                     mpChildWindow;
             MediaWindowControl*                                                     mpMediaWindowControl;