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

[Michael Stahl]

 avmedia/source/framework/mediaplayer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f4f6b3146eb56c757b36eda43dcaf63c690ffb9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Mar 30 13:22:03 2016 +0200

    avmedia: fix varargs call for WNT 64-bit
    
    SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
        const SfxPoolItem*  pArg1, ...)
    assigns the varargs to a "const SfxPoolItem *", so passing in
    "0L" is only correct if long is 64-bit, but on WNT 64-bit long is
    32-bit, so use "nullptr" already.
    
    Change-Id: Iaf41efa795fd4439daab7ed7ec334d8ad8c476f3

diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 489ff5e..5edfd67 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -136,7 +136,7 @@ void MediaFloater::dispatchCurrentURL()
             url = mpMediaWindow->getURL();
         }
         const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, url );
-        pDispatcher->Execute( SID_INSERT_AVMEDIA, SfxCallMode::RECORD, &aMediaURLItem, 0L );
+        pDispatcher->Execute(SID_INSERT_AVMEDIA, SfxCallMode::RECORD, &aMediaURLItem, nullptr);
     }
 }