From ff76c90fb40c4246a835686ca0b4db8fe6b7dbd1 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 7 May 2017 10:29:59 +1000 Subject: tdf#43157: convert avmedia module away from OSL_ASSERT to assert Change-Id: Ie484788019f11299c4e4796268507b9b16b7fd4a --- avmedia/source/gstreamer/gstplayer.cxx | 2 +- avmedia/source/quicktime/player.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 26b712441692..8383d3f3cae6 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -910,7 +910,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co rArguments[ 2 ] >>= pIntPtr; SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr ); const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr; - OSL_ASSERT(pEnvData); + assert(pEnvData); if (pEnvData) { #if defined(ENABLE_GTKSINK) diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index d1c44306834f..b5fe12db1a39 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -56,7 +56,7 @@ Player::~Player() QTMovie* Player::getMovie() { - OSL_ASSERT( mpMovie ); + assert( mpMovie ); return mpMovie; } -- cgit