From 272a8afa60fe9a6b497c69a58b0054ad5b880690 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 12 Jun 2016 14:42:51 +0200 Subject: convert more DBG_ASSERT(false to SAL_WARN Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55 Reviewed-on: https://gerrit.libreoffice.org/26195 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/ui/dlg/prltempl.cxx | 2 +- sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 +- sd/source/ui/tools/SdGlobalResourceContainer.cxx | 6 +++--- sd/source/ui/view/drviews2.cxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 1a2043c39683..8c42ee3635e8 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -309,7 +309,7 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const case PO_OUTLINE_8: return 7; case PO_OUTLINE_9: return 8; default: - DBG_ASSERT( false, "Wrong Po! [CL]"); + SAL_WARN( "sd", "Wrong Po! [CL]"); } return 0; } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index c547dc3f659b..862de3972414 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -277,7 +277,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) break; case SID_TP_USE_FOR_NEW_PRESENTATIONS: - DBG_ASSERT (false, + SAL_WARN ( "sd", "Using slides as default for new presentations" " is not yet implemented"); break; diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 358266c75ad2..dadc8db91480 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -80,7 +80,7 @@ void SdGlobalResourceContainer::AddResource ( { // Because the given resource is a unique_ptr it is highly unlikely // that we come here. But who knows? - DBG_ASSERT (false, + SAL_WARN ( "sd", "SdGlobalResourceContainer:AddResource(): Resource added twice."); } // We can not put the unique_ptr into the vector so we release the @@ -102,7 +102,7 @@ void SdGlobalResourceContainer::AddResource ( mpImpl->maSharedResources.push_back(pResource); else { - DBG_ASSERT (false, + SAL_WARN ("sd", "SdGlobalResourceContainer:AddResource(): Resource added twice."); } } @@ -120,7 +120,7 @@ void SdGlobalResourceContainer::AddResource (const Reference& rxReso mpImpl->maXInterfaceResources.push_back(rxResource); else { - DBG_ASSERT (false, + SAL_WARN ("sd", "SdGlobalResourceContainer:AddResource(): Resource added twice."); } } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 36f954df48cc..b603583845fc 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2893,7 +2893,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) default: { - DBG_ASSERT( false, "Slot without function" ); + SAL_WARN( "sd", "Slot without function" ); Cancel(); rReq.Ignore (); } -- cgit