diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 14:42:51 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:08 -0400 |
| commit | e873661f6c20389d50ee2d4661b00d111e46f3e5 (patch) | |
| tree | 724646bac031fa8984ff3f3a6a02a0ab6756045b /sd | |
| parent | d48ceabd7aef42580d70c680ac863f497b146cca (diff) | |
convert more DBG_ASSERT(false to SAL_WARN
Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 272a8afa60fe9a6b497c69a58b0054ad5b880690)
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/prltempl.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/tools/SdGlobalResourceContainer.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index c341a2c0868e..ba9df75991c4 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -314,7 +314,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 3eb1e7498529..ebcf569f54a6 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -278,7 +278,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 4eb35b221d73..4d67e989ab34 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<XInterface>& 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 fb5810415cd9..40e34a0752e4 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2920,7 +2920,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) default: { - DBG_ASSERT( false, "Slot without function" ); + SAL_WARN( "sd", "Slot without function" ); Cancel(); rReq.Ignore (); } |