diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-11 19:05:15 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:08 -0400 |
| commit | d48ceabd7aef42580d70c680ac863f497b146cca (patch) | |
| tree | 9d4febf66436e428baae359dbf9e1da2a2301acc /svx | |
| parent | 0b7e86ac50139747432bd0f15a363a4f71e6a322 (diff) | |
convert DBG_ASSERT(false, to SAL_WARN(
Change-Id: I400d728c5d99228c5ca52e369037395b4da2af5c
Reviewed-on: https://gerrit.libreoffice.org/26187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit ab10f9fc11948ca0f463aa8c0c784a574c89f8f7)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/rulritem.cxx | 2 | ||||
| -rw-r--r-- | svx/source/items/SmartTagItem.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdopath.cxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index c5f8987dce60..2a0ee5cb0681 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -29,7 +29,7 @@ SfxPoolItem* SvxPagePosSizeItem::CreateDefault() { return new SvxPagePosSizeItem SfxPoolItem* SvxLongLRSpaceItem::CreateDefault() { return new SvxLongLRSpaceItem; } SfxPoolItem* SvxLongULSpaceItem::CreateDefault() { return new SvxLongULSpaceItem; } SfxPoolItem* SvxColumnItem::CreateDefault() { return new SvxColumnItem; } -SfxPoolItem* SvxObjectItem::CreateDefault() { DBG_ASSERT(false, "No SvxObjectItem factory available"); return nullptr; } +SfxPoolItem* SvxObjectItem::CreateDefault() { SAL_WARN( "svx", "No SvxObjectItem factory available"); return nullptr; } /* SvxLongLRSpaceItem */ diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 312b616bc6e4..e3ee43923b74 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; -SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return nullptr; } +SfxPoolItem* SvxSmartTagItem::CreateDefault() { SAL_WARN( "svx", "No SvxSmartTagItem factory available"); return nullptr; } SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 1def8fffa55f..8ea9245c496d 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -25,6 +25,7 @@ #include <osl/endian.h> #include <rtl/strbuf.hxx> +#include <sal/log.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> @@ -1817,7 +1818,7 @@ void SdrModel::SetStarDrawPreviewMode(bool bPreview) if (!bPreview && bStarDrawPreviewMode && GetPageCount()) { // Resetting is not allowed, because the Model might not be loaded completely - DBG_ASSERT(false,"SdrModel::SetStarDrawPreviewMode(): Resetting not allowed, because Model might not be complete."); + SAL_WARN("svx", "SdrModel::SetStarDrawPreviewMode(): Resetting not allowed, because Model might not be complete."); } else { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index e51f318f557c..8a6ca0ea8e8d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2471,7 +2471,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const sal_uInt32 nPoly,nPnt; if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt)) { - DBG_ASSERT(false,"SdrPathObj::GetSnapPoint: Point nSnapPnt does not exist."); + SAL_WARN("svx", "SdrPathObj::GetSnapPoint: Point nSnapPnt does not exist."); } const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt)); |