From d48ceabd7aef42580d70c680ac863f497b146cca Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 11 Jun 2016 19:05:15 +0200 Subject: convert DBG_ASSERT(false, to SAL_WARN( Change-Id: I400d728c5d99228c5ca52e369037395b4da2af5c Reviewed-on: https://gerrit.libreoffice.org/26187 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit ab10f9fc11948ca0f463aa8c0c784a574c89f8f7) --- sd/source/ui/docshell/docshel4.cxx | 2 +- sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 2 +- sd/source/ui/sidebar/MasterPageDescriptor.cxx | 2 +- sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 4 ++-- sd/source/ui/view/ViewShellManager.cxx | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index badc20bc80aa..5ea82c0edf84 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -218,7 +218,7 @@ void DrawDocShell::UpdateRefDevice() // We are confronted with an invalid or un-implemented // layout mode. Use the printer as formatting device // as a fall-back. - DBG_ASSERT(false, "DrawDocShell::UpdateRefDevice(): Unexpected printer layout mode"); + SAL_WARN( "sd", "DrawDocShell::UpdateRefDevice(): Unexpected printer layout mode"); pRefDevice = mpPrinter.get(); break; diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index 3bd897d56614..4255de86efce 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -197,7 +197,7 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume if (pLocalMasterPage == nullptr) { - DBG_ASSERT(false, "can not create master page for slide"); + SAL_WARN( "sd", "can not create master page for slide"); } return pLocalMasterPage; diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 7a1d461b956d..65d102566568 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -200,7 +200,7 @@ int MasterPageDescriptor::UpdatePageObject ( } else { - DBG_ASSERT(false, "UpdatePageObject: master page is NULL"); + SAL_WARN( "sd", "UpdatePageObject: master page is NULL"); return -1; } diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 030d54733e95..0dfe218b8561 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -483,7 +483,7 @@ void Layer::RemovePainter (const SharedILayerPainter& rpPainter) } else { - DBG_ASSERT(false,"LayeredDevice::RemovePainter called for painter that is not registered"); + SAL_WARN("sd", "LayeredDevice::RemovePainter called for painter that is not registered"); } } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index b9540637edfb..7b57e9ec3358 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -918,7 +918,7 @@ OUString ViewShellBase::GetInitialViewShellType() // The page kind is invalid. This is probably an // error by the caller. We use the standard type to // keep things going. - DBG_ASSERT(false, "ViewShellBase::GetInitialViewShellType: invalid page kind"); + SAL_WARN( "sd", "ViewShellBase::GetInitialViewShellType: invalid page kind"); sRequestedView = FrameworkHelper::msImpressViewURL; break; } @@ -1400,7 +1400,7 @@ void CurrentPageSetter::operator() (bool) } catch (const beans::UnknownPropertyException&) { - DBG_ASSERT(false,"CurrentPage property unknown"); + SAL_WARN("sd", "CurrentPage property unknown"); } } } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index ded5aa5d3349..c2432ac34ec4 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -438,7 +438,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) } else { - DBG_ASSERT(false, + SAL_WARN("sd", "ViewShellManager::ActivateViewShell: " "new view shell has no active window"); } @@ -1132,7 +1132,7 @@ void ViewShellManager::Implementation::Shutdown() } else { - DBG_ASSERT(false, + SAL_WARN("sd", "ViewShellManager::Implementation::Shutdown(): empty active shell descriptor"); maActiveViewShells.pop_front(); } -- cgit v1.2.3