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

[Miklos Vajna]

 avmedia/source/framework/mediatoolbox.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 686ee0aaca664ebb276724832830ecb038f07978
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 10 11:53:23 2015 +0100

    avmedia: avoid passing an empty any to InitPropertySequence()
    
    Regression from b1534edf523a405b91ad04c5351735e745ceb7ee (tdf#89592
    Using initializer_lists to populate Sequence<PropertyValue>,
    2015-03-07).
    
    Additionally, avoid makeAny() on the Any, the original code didn't do
    that.
    
    Thanks to lgodard/sberg for noticing these.
    
    Change-Id: Icb3a6039885c582ba9f789c5c4768b865b593aee

diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index d33cd93..280cdb5 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -149,12 +149,12 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
 {
     MediaItem                               aExecItem( SID_AVMEDIA_TOOLBOX );
     uno::Any                                aAny;
-    auto aArgs(::comphelper::InitPropertySequence({
-        { "AVMediaToolBox", makeAny(aAny) }
-    }));
 
     aExecItem.merge( rItem );
     aExecItem.QueryValue( aAny );
+    auto aArgs(::comphelper::InitPropertySequence({
+        { "AVMediaToolBox", aAny }
+    }));
 
     Dispatch( ".uno:AVMediaToolBox" , aArgs );
 }