summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slideshowimpl.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 11:16:44 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 11:16:44 +1000
commit6ffc3cf9e54ab92f2e7811f5e0ff0c9609c65f3a (patch)
tree8b885a493397fb8217e674e6aaff1d6b4344afac /slideshow/source/engine/slideshowimpl.cxx
parentff76c90fb40c4246a835686ca0b4db8fe6b7dbd1 (diff)
tdf#43157: convert slideshow module away from OSL_ASSERT to assert
Change-Id: I6a067922bd701387172d94713ec05fc3313de19c
Diffstat (limited to 'slideshow/source/engine/slideshowimpl.cxx')
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 8e8023e0146f..571725304e4b 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -923,7 +923,7 @@ SlideSharedPtr SlideShowImpl::makeSlide(
void SlideShowImpl::requestWaitSymbol()
{
++mnWaitSymbolRequestCount;
- OSL_ASSERT(mnWaitSymbolRequestCount>0);
+ assert(mnWaitSymbolRequestCount>0);
if (mnWaitSymbolRequestCount == 1)
{
@@ -940,7 +940,7 @@ void SlideShowImpl::requestWaitSymbol()
void SlideShowImpl::releaseWaitSymbol()
{
--mnWaitSymbolRequestCount;
- OSL_ASSERT(mnWaitSymbolRequestCount>=0);
+ assert(mnWaitSymbolRequestCount>=0);
if (mnWaitSymbolRequestCount == 0)
{
@@ -1099,7 +1099,7 @@ void SlideShowImpl::displaySlide(
else
mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode );
- OSL_ASSERT( mpCurrentSlide );
+ assert( mpCurrentSlide );
if (mpCurrentSlide)
{
basegfx::B2DSize oldSlideSize;
@@ -2279,7 +2279,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse)
// save time at current drawpage:
uno::Reference<beans::XPropertySet> xPropSet(
mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY );
- OSL_ASSERT( xPropSet.is() );
+ assert( xPropSet.is() );
if (xPropSet.is())
{
xPropSet->setPropertyValue(