sd/source/ui/slideshow/slideshow.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 891db26079e0983f2afb38d32aa57eec9dbefc98
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Sat Apr 27 09:20:28 2019 +0530
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri May 24 14:28:37 2019 +0200
tdf#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Change-Id: Ie4f1362510636006cae8a680b3ad2bbfa93e854b
Reviewed-on: https://gerrit.libreoffice.org/70449
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 93a07f9ed637..f5c387b66404 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -222,7 +222,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell )
void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView,
vcl::Window* pParentWindow )
{
- DBG_ASSERT( !mxController.is(), "sd::SlideShow::CreateController(), clean
up old controller first!" );
+ SAL_INFO_IF( !mxController.is(), "sd.slideshow",
"sd::SlideShow::CreateController(), clean up old controller first!" );
Reference< XPresentation2 > xThis( this );
@@ -648,8 +648,7 @@ void SAL_CALL SlideShow::end()
// The mbIsInStartup flag should have been reset during the start of the
// slide show. Reset it here just in case that something has horribly
// gone wrong.
- OSL_ASSERT(!mbIsInStartup);
- mbIsInStartup = false;
+ assert(!mbIsInStartup);
rtl::Reference< SlideshowImpl > xController( mxController );
if( !xController.is() )
@@ -801,7 +800,7 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence<
PropertyValue >& rAr
// Stop a running show before starting a new one.
if( mxController.is() )
{
- OSL_ASSERT(!mbIsInStartup);
+ assert(!mbIsInStartup);
end();
}
else if (mbIsInStartup)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
