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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/bitset.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/minfitem.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index 9dae69d11728..81eaa9a39a9b 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <sal/log.hxx> #include "bitset.hxx" @@ -303,7 +304,7 @@ sal_uInt16 IndexBitSet::GetFreeIndex() *this|=i; return i; } - DBG_ASSERT(false, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege"); + SAL_WARN( "sfx2", "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege"); return 0; } diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index e734694e5d57..ffc352b5500a 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -19,7 +19,7 @@ #include <sfx2/minfitem.hxx> -SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return nullptr; } +SfxPoolItem* SfxMacroInfoItem::CreateDefault() { SAL_WARN( "sfx2", "No SfxMacroInfItem factory available"); return nullptr; } SfxMacroInfoItem::SfxMacroInfoItem( diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b3ce83aa549f..374766636784 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -258,7 +258,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, // "fix" property? => not a custom property => ignore it! if (!(pProps[i].Attributes & css::beans::PropertyAttribute::REMOVABLE)) { - DBG_ASSERT(false, "non-removable user-defined property?"); + SAL_WARN( "sfx2", "non-removable user-defined property?"); continue; } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6287c347a9ff..d47a2d512495 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -288,7 +288,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, void SfxTabPage::PageCreated( const SfxAllItemSet& /*aSet*/ ) { - DBG_ASSERT(false, "SfxTabPage::PageCreated should not be called"); + SAL_WARN( "sfx2", "SfxTabPage::PageCreated should not be called"); } void SfxTabPage::ChangesApplied() diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index b70221fe2001..552e6ca6f3ab 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -75,7 +75,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; -SfxPoolItem* SfxUsrAnyItem::CreateDefault() { DBG_ASSERT(false, "No SfxUsrAnyItem factory available"); return nullptr; } +SfxPoolItem* SfxUsrAnyItem::CreateDefault() { SAL_WARN( "sfx2", "No SfxUsrAnyItem factory available"); return nullptr; } SfxPoolItem* SfxUnoFrameItem::CreateDefault() { |