summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/source/basmgr/basmgr.cxx2
-rw-r--r--basic/source/sbx/sbxvalue.cxx6
-rw-r--r--basic/source/sbx/sbxvar.cxx2
-rw-r--r--cui/source/dialogs/hyphen.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx3
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--editeng/source/outliner/outliner.cxx2
-rw-r--r--filter/source/flash/swfwriter1.cxx4
-rw-r--r--filter/source/msfilter/svdfppt.cxx3
-rw-r--r--linguistic/source/convdic.cxx4
-rw-r--r--linguistic/source/dicimp.cxx4
-rw-r--r--linguistic/source/dlistimp.cxx2
-rw-r--r--linguistic/source/gciterator.cxx18
-rw-r--r--linguistic/source/hyphdsp.cxx6
-rw-r--r--linguistic/source/lngprophelp.cxx6
-rw-r--r--linguistic/source/misc.cxx6
-rw-r--r--linguistic/source/spelldsp.cxx6
-rw-r--r--linguistic/source/thesdsp.cxx2
-rw-r--r--sd/source/ui/dlg/prltempl.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/tools/SdGlobalResourceContainer.cxx6
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sfx2/source/appl/app.cxx2
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/guisaveas.cxx4
-rw-r--r--sfx2/source/doc/objxtor.cxx8
-rw-r--r--sot/source/sdstor/ucbstorage.cxx4
-rw-r--r--svtools/source/brwbox/brwbox3.cxx2
-rw-r--r--svtools/source/svrtf/svparser.cxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx2
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx4
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshap3.cxx2
-rw-r--r--svx/source/xml/xmleohlp.cxx2
-rw-r--r--tools/source/stream/stream.cxx2
-rw-r--r--unotools/source/config/cmdoptions.cxx2
-rw-r--r--unotools/source/config/compatibility.cxx2
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx2
-rw-r--r--unotools/source/config/lingucfg.cxx11
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/gdi/print.cxx6
-rw-r--r--vcl/source/gdi/virdev.cxx2
-rw-r--r--vcl/source/window/dlgctrl.cxx2
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx2
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx2
-rw-r--r--xmloff/source/style/xmlbahdl.cxx4
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx4
-rw-r--r--xmloff/source/text/txtparae.cxx4
-rw-r--r--xmloff/source/text/txtprhdl.cxx10
53 files changed, 100 insertions, 97 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 12f215003b09..19611d54e887 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -755,7 +755,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
// Plausibility!
if( nLibs & 0xF000 )
{
- DBG_ASSERT( false, "BasicManager-Stream defect!" );
+ SAL_WARN( "basic", "BasicManager-Stream defect!" );
return;
}
const size_t nMinBasicLibSize(8);
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index d4b6c81c50e5..2bd6fc218dd1 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -76,7 +76,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
aData.pDecimal->addRef();
break;
default:
- DBG_ASSERT( false, "Improper pointer argument" );
+ SAL_WARN( "basic", "Improper pointer argument" );
n = SbxNULL;
}
}
@@ -1547,7 +1547,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
memset (&aData,0,sizeof(aData));
ResetFlag(SbxFlagBits::Fixed);
aData.eType = SbxNULL;
- DBG_ASSERT( false, "Loaded a non-supported data type" );
+ SAL_WARN( "basic", "Loaded a non-supported data type" );
return false;
}
@@ -1649,7 +1649,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxWCHAR:
break;
default:
- DBG_ASSERT( false, "Saving a non-supported data type" );
+ SAL_WARN( "basic", "Saving a non-supported data type" );
return false;
}
return true;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 2bbe5081044b..b14ada6cd68f 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -552,7 +552,7 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
break;
default:
aData.eType = SbxNULL;
- DBG_ASSERT( false, "Loaded a non-supported data type" );
+ SAL_WARN( "basic", "Loaded a non-supported data type" );
return false;
}
// putt value
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 0bfd45e5811c..57f756ba9abc 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void
catch (uno::Exception &e)
{
(void) e;
- DBG_ASSERT( false, "Hyphenate All failed" );
+ SAL_WARN( "cui", "Hyphenate All failed" );
}
}
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index cd89c13714ff..658a744676db 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -121,7 +121,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void)
}
catch( const IllegalArgumentException& )
{
- DBG_ASSERT( false, "caught IllegalArgumentException when registering filter\n" );
+ SAL_WARN( "cui", "caught IllegalArgumentException when registering filter\n" );
}
if( xFilePicker->execute() == ExecutableDialogResults::OK )
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4ac3f87ca52d..2bf69b3bb49e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3236,7 +3236,7 @@ void SvxNumPositionTabPage::InitPosAndSpaceMode()
{
if ( pActNum == nullptr )
{
- DBG_ASSERT( false,
+ SAL_WARN( "cui",
"<SvxNumPositionTabPage::InitPosAndSpaceMode()> - misusage of method -> <pAktNum> has to be already set!" );
return;
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 895b86c700db..f9c2ab91276b 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -27,6 +27,7 @@
#include <osl/mutex.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
#include <editeng/flditem.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -2759,7 +2760,7 @@ namespace accessibility
catch (const lang::IndexOutOfBoundsException&)
{
// this is not the exception that should be raised in this function ...
- DBG_ASSERT( false, "unexpected exception" );
+ DBG_UNHANDLED_EXCEPTION();
}
}
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index dc7b382a71b9..8d1cf41ba778 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3335,7 +3335,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
switch( nSlotId )
{
default:
- DBG_ASSERT( false, "wrong SlotId for class SvxScriptSetItem" );
+ SAL_WARN( "editeng", "wrong SlotId for class SvxScriptSetItem" );
SAL_FALLTHROUGH; // default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 2c9a898479a6..fa32e1f149ac 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -321,7 +321,7 @@ sal_Int32 Outliner::GetBulletsNumberingStatus(
if ( nParaStart > nParaEnd
|| nParaEnd >= pParaList->GetParagraphCount() )
{
- DBG_ASSERT( false,"<Outliner::GetBulletsNumberingStatus> - unexpected parameter values" );
+ SAL_WARN("editeng", "<Outliner::GetBulletsNumberingStatus> - unexpected parameter values" );
return 2;
}
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 112173ba0e90..eccb817de1c9 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -795,7 +795,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
#ifdef DBG_UTIL
if(compress2(pCompressed.get(), &compressed_size, pImageData, raw_size, Z_BEST_COMPRESSION) != Z_OK)
{
- DBG_ASSERT( false, "compress2 failed!" ); ((void)0);
+ SAL_WARN( "filter", "compress2 failed!" ); ((void)0);
}
#else
compress2(pCompressed.get(), &compressed_size, pImageData, raw_size, Z_BEST_COMPRESSION);
@@ -813,7 +813,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
#ifdef DBG_UTIL
if(compress2(pAlphaCompressed.get(), &alpha_compressed_size, pAlphaData, width * height, Z_BEST_COMPRESSION) != Z_OK)
{
- DBG_ASSERT( false, "compress2 failed!" ); ((void)0);
+ SAL_WARN( "filter", "compress2 failed!" ); ((void)0);
}
#else
compress2(pAlphaCompressed.get(), &alpha_compressed_size, pAlphaData, width * height, Z_BEST_COMPRESSION);
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 9f8d3ae85def..d9825f5b756a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -20,6 +20,7 @@
#include <osl/endian.h>
#include <vcl/svapp.hxx>
#include <unotools/tempfile.hxx>
+#include <tools/diagnose_ex.h>
#include <math.h>
#include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx>
@@ -7398,7 +7399,7 @@ void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nR
}
catch( const Exception& )
{
- DBG_ASSERT( false, "exception caught!" );
+ DBG_UNHANDLED_EXCEPTION();
}
}
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index a729501a6b7f..0a95534c0ba6 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -85,7 +85,7 @@ void ReadThroughDic( const OUString &rMainURL, ConvDicXMLImport &rImport )
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "failed to get input stream" );
+ SAL_WARN( "linguistic", "failed to get input stream" );
}
if (!xIn.is())
return;
@@ -245,7 +245,7 @@ void ConvDic::Save()
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "failed to get input stream" );
+ SAL_WARN( "linguistic", "failed to get input stream" );
}
if (!xStream.is())
return;
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 0c581d747cc8..0da7e5cbfb96 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -252,7 +252,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "failed to get input stream" );
+ SAL_WARN( "linguistic", "failed to get input stream" );
}
if (!xStream.is())
return static_cast< sal_uLong >(-1);
@@ -416,7 +416,7 @@ struct TmpDictionary
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "failed to overwrite dict" );
+ SAL_WARN( "linguistic", "failed to overwrite dict" );
return static_cast< sal_uLong >(-1);
}
return 0;
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index f356b5a2977a..8decb73c7612 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -857,7 +857,7 @@ static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bN
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "failed to get input stream" );
+ SAL_WARN( "linguistic", "failed to get input stream" );
}
DBG_ASSERT( xStream.is(), "failed to get stream for read" );
if (!xStream.is())
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 92e27b2a36f3..3d4a3e3ca3b5 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -158,7 +158,7 @@ static sal_Int32 lcl_SkipWhiteSpaces( const OUString &rText, sal_Int32 nStartPos
}
if (bIllegalArgument)
{
- DBG_ASSERT( false, "lcl_SkipWhiteSpaces: illegal arguments" );
+ SAL_WARN( "linguistic", "lcl_SkipWhiteSpaces: illegal arguments" );
}
sal_Int32 nRes = nStartPos;
@@ -193,7 +193,7 @@ static sal_Int32 lcl_BacktraceWhiteSpaces( const OUString &rText, sal_Int32 nSta
}
if (bIllegalArgument)
{
- DBG_ASSERT( false, "lcl_BacktraceWhiteSpaces: illegal arguments" );
+ SAL_WARN( "linguistic", "lcl_BacktraceWhiteSpaces: illegal arguments" );
}
sal_Int32 nRes = nStartPos;
@@ -473,12 +473,12 @@ uno::Reference< linguistic2::XProofreader > GrammarCheckingIterator::GetGrammarC
}
else
{
- DBG_ASSERT( false, "grammar checker does not support required locale" );
+ SAL_WARN( "linguistic", "grammar checker does not support required locale" );
}
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "instantiating grammar checker failed" );
+ SAL_WARN( "linguistic", "instantiating grammar checker failed" );
}
}
}
@@ -573,7 +573,7 @@ void GrammarCheckingIterator::DequeueAndCheck()
aRes.nBehindEndOfSentencePosition != nSuggestedEnd
)
{
- DBG_ASSERT( false, "!! Grammarchecker failed to provide end of sentence !!" );
+ SAL_WARN( "linguistic", "!! Grammarchecker failed to provide end of sentence !!" );
aRes.nBehindEndOfSentencePosition = nSuggestedEnd;
}
@@ -728,7 +728,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
//!! failed to properly identify the sentence end
if (aTmpRes.nBehindEndOfSentencePosition <= nStartPos)
{
- DBG_ASSERT( false, "!! Grammarchecker failed to provide end of sentence !!" );
+ SAL_WARN( "linguistic", "!! Grammarchecker failed to provide end of sentence !!" );
aTmpRes.nBehindEndOfSentencePosition = nSuggestedEndOfSentencePos;
}
@@ -749,7 +749,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
// prevent endless loop by forcefully advancing if needs be...
if (nStartPos <= nOldStartOfSentencePos)
{
- DBG_ASSERT( false, "end-of-sentence detection failed?" );
+ SAL_WARN( "linguistic", "end-of-sentence detection failed?" );
nStartPos = nOldStartOfSentencePos + 1;
}
}
@@ -1048,13 +1048,13 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
}
else
{
- DBG_ASSERT( false, "failed to get aImplNames. Wrong type?" );
+ SAL_WARN( "linguistic", "failed to get aImplNames. Wrong type?" );
}
}
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "exception caught. Failed to get configured services" );
+ SAL_WARN( "linguistic", "exception caught. Failed to get configured services" );
}
{
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 5ed22c5fc929..051f006dbf27 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -371,7 +371,7 @@ Reference< XHyphenatedWord > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xHyph;
@@ -503,7 +503,7 @@ Reference< XHyphenatedWord > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xHyph;
@@ -626,7 +626,7 @@ Reference< XPossibleHyphens > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createWithArguments failed" );
+ SAL_WARN( "linguistic", "createWithArguments failed" );
}
pRef [i] = xHyph;
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 831ac4e4bead..8bce43e3d255 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -446,7 +446,7 @@ bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt
break;
}
default:
- DBG_ASSERT( false, "unknown property" );
+ SAL_WARN( "linguistic", "unknown property" );
}
if (pbVal)
rEvt.NewValue >>= *pbVal;
@@ -510,7 +510,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
case UPH_IS_SPELL_WITH_DIGITS : pbResVal = &bResIsSpellWithDigits; break;
case UPH_IS_SPELL_CAPITALIZATION : pbResVal = &bResIsSpellCapitalization; break;
default:
- DBG_ASSERT( false, "unknown property" );
+ SAL_WARN( "linguistic", "unknown property" );
}
if (pbResVal)
pVal[i].Value >>= *pbResVal;
@@ -607,7 +607,7 @@ bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt
case UPH_HYPH_MIN_TRAILING : pnVal = &nHyphMinTrailing; break;
case UPH_HYPH_MIN_WORD_LENGTH : pnVal = &nHyphMinWordLength; break;
default:
- DBG_ASSERT( false, "unknown property" );
+ SAL_WARN( "linguistic", "unknown property" );
}
if (pnVal)
rEvt.NewValue >>= *pnVal;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index ba7bf6230e38..e0fd4ebf2298 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -568,7 +568,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
if (nOrigHyphenPos == -1 || nOrigHyphenationPos == -1)
{
- DBG_ASSERT( false, "failed to get nOrigHyphenPos or nOrigHyphenationPos" );
+ SAL_WARN( "linguistic", "failed to get nOrigHyphenPos or nOrigHyphenationPos" );
}
else
{
@@ -735,7 +735,7 @@ uno::Reference< XSearchableDictionaryList > GetDictionaryList()
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "createInstance failed" );
+ SAL_WARN( "linguistic", "createInstance failed" );
}
return xRef;
@@ -762,7 +762,7 @@ AppExitListener::AppExitListener()
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "createInstance failed" );
+ SAL_WARN( "linguistic", "createInstance failed" );
}
}
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 5c09ae84a3a6..baa7915f13c5 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -377,7 +377,7 @@ bool SpellCheckerDispatcher::isValid_Impl(
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xSpell;
@@ -562,7 +562,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xSpell;
@@ -735,7 +735,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
{
if (xRes.is())
{
- DBG_ASSERT( false, "XSetSpellAlternatives not implemented!" );
+ SAL_WARN( "linguistic", "XSetSpellAlternatives not implemented!" );
}
else if (aProposals.getLength() > 0)
{
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 3e81ed8e9fd8..bfd0875eb44e 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -175,7 +175,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef[i] = xThes;
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 ();
}
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index ab7d4c47b004..9f482bd36f84 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -206,7 +206,7 @@ SfxApplication::SfxApplication()
aStr.append(static_cast<sal_Int32>(GetDdeService()->GetError()));
else
aStr.append('?');
- DBG_ASSERT( false, aStr.getStr() );
+ SAL_WARN( "sfx2.appl", aStr.getStr() );
}
#else
(void)bOk;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 4b3cf63cc882..59edf31e37cf 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -881,12 +881,12 @@ bool SfxDocumentTemplates::CopyFrom
}
else
{
- DBG_ASSERT( false, "CopyFrom(): The content should contain target URL!" );
+ SAL_WARN( "sfx2", "CopyFrom(): The content should contain target URL!" );
}
}
else
{
- DBG_ASSERT( false, "CopyFrom(): The content just was created!" );
+ SAL_WARN( "sfx2", "CopyFrom(): The content just was created!" );
}
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 7899d3a9178b..fae7c8a44b54 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -140,7 +140,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
else if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nResult = SID_SAVEASREMOTE;
else {
- DBG_ASSERT( false, "Unacceptable slot name is provided!\n" );
+ SAL_WARN( "sfx2", "Unacceptable slot name is provided!\n" );
}
return nResult;
@@ -1617,7 +1617,7 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
}
else
{
- DBG_ASSERT( false, "This code must be unreachable!\n" );
+ SAL_WARN( "sfx2", "This code must be unreachable!\n" );
throw task::ErrorCodeIOException(
"SfxStoringHelper::GUIStoreModel: ERRCODE_IO_INVALIDPARAMETER",
uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER);
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index f4fe0db8c0de..9a9de544f0ae 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1131,7 +1131,7 @@ void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew )
bool SfxObjectShell::IsChangeRecording() const
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}
@@ -1139,7 +1139,7 @@ bool SfxObjectShell::IsChangeRecording() const
bool SfxObjectShell::HasChangeRecordProtection() const
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}
@@ -1147,7 +1147,7 @@ bool SfxObjectShell::HasChangeRecordProtection() const
void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
}
@@ -1162,7 +1162,7 @@ bool SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ )
bool SfxObjectShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b98caea63b2f..026b344da843 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1696,8 +1696,8 @@ void UCBStorage_Impl::Init()
}
catch (const Exception&)
{
- DBG_ASSERT( false,
- "getPropertyValue has thrown an exception! Please let developers know the scenario!" );
+ SAL_WARN( "sot",
+ "getPropertyValue has thrown an exception! Please let developers know the scenario!" );
}
}
}
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index ae44b59a3c03..bcd2d75cb7af 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -159,7 +159,7 @@ sal_Int32 BrowseBox::GetAccessibleControlCount() const
Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 )
{
- DBG_ASSERT( false, "BrowseBox::CreateAccessibleControl: to be overwritten!" );
+ SAL_WARN( "svtools", "BrowseBox::CreateAccessibleControl: to be overwritten!" );
return nullptr;
}
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index b5c377b72ea0..d126e186232d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -135,7 +135,7 @@ void SvParser::SetSrcEncoding( rtl_TextEncoding eEnc )
}
else
{
- DBG_ASSERT( false,
+ SAL_WARN( "svtools",
"SvParser::SetSrcEncoding: invalid source encoding" );
eSrcEnc = RTL_TEXTENCODING_DONTKNOW;
}
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 8d997330e6aa..3bfd863484e1 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -290,7 +290,7 @@ namespace svt { namespace table
Reference<XAccessible> TableControl::CreateAccessibleControl( sal_Int32 _nIndex )
{
(void)_nIndex;
- DBG_ASSERT( false, "TableControl::CreateAccessibleControl: to be overwritten!" );
+ SAL_WARN( "svtools", "TableControl::CreateAccessibleControl: to be overwritten!" );
return nullptr;
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 69288d85e542..cee4bd9e5d83 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -520,7 +520,7 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_In
void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception )
{
- DBG_ASSERT( false, "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" );
+ SAL_WARN( "svx", "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" );
}
void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception )
@@ -551,7 +551,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*
{
OUString aMessage( "deselectAccessibleChild is not possible in this context" );
- DBG_ASSERT( false, "SvxRectCtlAccessibleContext::deselectAccessibleChild() is not possible!" );
+ SAL_WARN( "svx", "SvxRectCtlAccessibleContext::deselectAccessibleChild() is not possible!" );
throw lang::IndexOutOfBoundsException( aMessage, *this ); // never possible
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index b4e2fa86bedc..f91daa0cf85e 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1817,7 +1817,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s
}
catch( Exception& )
{
- DBG_ASSERT( false, "sdr::table::SvxTableController::MergeRange(), exception caught!" );
+ SAL_WARN( "svx", "sdr::table::SvxTableController::MergeRange(), exception caught!" );
}
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 531ea531b61c..0a633eeae844 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -279,7 +279,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
}
else
{
- DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
+ SAL_WARN( "svx", "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
}
if( mpModel )
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index b0cde191e6ec..510f9cd00a02 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -183,7 +183,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha
}
else
{
- DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
+ SAL_WARN( "svx", "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
}
}
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index fd63e6f01dfa..b7ab0e05568b 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -271,7 +271,7 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
}
else
{
- DBG_ASSERT( false, "invalid arguments was found in URL!" );
+ SAL_WARN( "svx", "invalid arguments was found in URL!" );
}
}
}
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index b0976ddf89c0..08a555aa470e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -106,7 +106,7 @@ inline static void SwapDouble( double& r )
{
if( sizeof(double) != 8 )
{
- DBG_ASSERT( false, "Can only swap 8-Byte-doubles\n" );
+ SAL_WARN( "tools", "Can only swap 8-Byte-doubles\n" );
}
else
{
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 5bd0e82cb718..e1ab5405fee8 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -249,7 +249,7 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co
return m_aDisabledCommands.Lookup( aCommand );
}
default:
- DBG_ASSERT( false, "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" );
+ SAL_WARN( "unotools", "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" );
}
return false;
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index b7b34fa56e00..8fdaeb4b45f7 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -404,7 +404,7 @@ void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bVal
void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& )
{
- DBG_ASSERT( false, "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
+ SAL_WARN( "unotools", "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
}
// public method
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 51baeca8de48..97b2735d5766 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -362,7 +362,7 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl()
void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
{
- DBG_ASSERT( false, "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
+ SAL_WARN( "unotools", "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
}
// public method
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index aa50fe979b16..b753290381b0 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -29,6 +29,7 @@
#include <rtl/instance.hxx>
#include <sal/log.hxx>
#include <osl/mutex.hxx>
+#include <tools/diagnose_ex.h>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/debug.hxx>
@@ -393,7 +394,7 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const
case UPH_IS_GRAMMAR_AUTO: pbVal = &rOpt.bIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: pbVal = &rOpt.bIsGrammarInteractive; break;
default :
- DBG_ASSERT( false, "unexpected property handle" );
+ SAL_WARN( "unotools", "unexpected property handle" );
}
if (pbVal)
@@ -492,7 +493,7 @@ bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any
case UPH_IS_GRAMMAR_AUTO: pbVal = &rOpt.bIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: pbVal = &rOpt.bIsGrammarInteractive; break;
default :
- DBG_ASSERT( false, "unexpected property handle" );
+ SAL_WARN( "unotools", "unexpected property handle" );
}
if (pbVal)
@@ -654,7 +655,7 @@ bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyN
break;
default:
- DBG_ASSERT( false, "unexpected case" );
+ SAL_WARN( "unotools", "unexpected case" );
}
}
@@ -784,7 +785,7 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
case UPH_IS_GRAMMAR_AUTO: bReadOnly = rOpt.bROIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: bReadOnly = rOpt.bROIsGrammarInteractive; break;
default :
- DBG_ASSERT( false, "unexpected property handle" );
+ SAL_WARN( "unotools", "unexpected property handle" );
}
return bReadOnly;
}
@@ -1119,7 +1120,7 @@ OUString SvtLinguConfig::GetVendorImageUrl_Impl(
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "exception caught. GetVendorImageUrl_Impl failed" );
+ DBG_UNHANDLED_EXCEPTION();
}
return aRes;
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e667cb23ec41..6e736434083f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8225,7 +8225,7 @@ void PDFWriterImpl::sortWidgets()
}
else
{
- DBG_ASSERT( false, "wrong number of sorted annotations" );
+ SAL_WARN( "vcl", "wrong number of sorted annotations" );
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "PDFWriterImpl::sortWidgets(): wrong number of sorted assertions on page nr %ld\n"
" %ld sorted and %ld unsorted\n", (long int)it->first, (long int)it->second.aSortedAnnots.size(), (long int)nAnnots );
@@ -12528,7 +12528,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
if( childType == PDFWriter::Document )
{
m_nCurrentStructElement = nNewCurElement;
- DBG_ASSERT( false, "Structure element inserted to StructTreeRoot that is not a document" );
+ SAL_WARN( "vcl", "Structure element inserted to StructTreeRoot that is not a document" );
}
else {
OSL_FAIL( "document structure in disorder !" );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index dd9e6b38eee8..017acd1670d8 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -327,21 +327,21 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/,
const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ )
{
- DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
+ SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
}
void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/,
const Point& /*rSrcPt*/, const Size& /*rSrcSize*/,
const OutputDevice& /*rOutDev*/ )
{
- DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
+ SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
}
void Printer::CopyArea( const Point& /*rDestPt*/,
const Point& /*rSrcPt*/, const Size& /*rSrcSize*/,
bool /*bWindowInvalidate*/ )
{
- DBG_ASSERT( false, "Don't use OutputDevice::CopyArea(...) with printer devices!" );
+ SAL_WARN( "vcl", "Don't use OutputDevice::CopyArea(...) with printer devices!" );
}
void Printer::SetPrinterOptions( const PrinterOptions& i_rOptions )
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index af9bbbdddc83..7d788de40720 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -467,7 +467,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
{
case REFDEV_NONE:
default:
- DBG_ASSERT( false, "VDev::SetRefDev illegal argument!" );
+ SAL_WARN( "vcl", "VDev::SetRefDev illegal argument!" );
break;
case REFDEV_MODE06:
nDPIX = nDPIY = 600;
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 3895ae2f4b50..2dbda7fdfb32 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -368,7 +368,7 @@ vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow,
if ( nIteration >= 2 )
{
// this is an unexpected scenario
- DBG_ASSERT( false, "It seems to be an endless loop!" );
+ SAL_WARN( "vcl", "It seems to be an endless loop!" );
rFormStart = 0;
break;
}
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index bf1a68a1dc72..89593b5c9eb1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1018,7 +1018,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, bool bVisible )
vcl::Window* pWin = ImplGetWindow();
if ( pWin && pWin->IsVisible() )
{
- DBG_ASSERT( false, "Menu::ShowItem - ignored for visible popups!" );
+ SAL_WARN( "vcl", "Menu::ShowItem - ignored for visible popups!" );
return;
}
pData->bVisible = bVisible;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 71c175b52dfc..1d3eff4a033b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1714,7 +1714,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty )
}
else
{
- DBG_ASSERT( false, "missing a checkbox" );
+ SAL_WARN( "vcl", "missing a checkbox" );
}
}
else if( pValue->Value >>= nVal )
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index a3fc7a829948..17fa381cccb7 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -99,7 +99,7 @@ void XMLChartStyleContext::FillPropertySet(
}
catch( beans::UnknownPropertyException& )
{
- DBG_ASSERT( false, "unknown property exception -> shape style not completely imported for chart style" );
+ SAL_WARN( "xmloff", "unknown property exception -> shape style not completely imported for chart style" );
}
lcl_NumberFormatStyleToProperty( msDataStyleName, "NumberFormat", mrStyles, rPropSet );
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index c7ead92ee288..2b79d99d3b92 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -799,13 +799,13 @@ XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl()
bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "importXML called for compare-only-property" );
+ SAL_WARN( "xmloff", "importXML called for compare-only-property" );
return false;
}
bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "exportXML called for compare-only-property" );
+ SAL_WARN( "xmloff", "exportXML called for compare-only-property" );
return false;
}
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 571c59d181ed..b026c41c8094 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -95,7 +95,7 @@ void XMLTextNumRuleInfo::Set(
// Assertion saving writer document (#i97312#)
if ( mxNumRules.is() && mxNumRules->getCount() < 1 )
{
- DBG_ASSERT( false,
+ SAL_WARN("xmloff",
"<XMLTextNumRuleInfo::Set(..)> - numbering rules instance does not contain any numbering rule" );
Reset();
return;
@@ -103,7 +103,7 @@ void XMLTextNumRuleInfo::Set(
if ( mnListLevel < 0 )
{
- DBG_ASSERT( false,
+ SAL_WARN("xmloff",
"<XMLTextNumRuleInfo::Set(..)> - unexpected numbering level" );
Reset();
return;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index bbcd6f0081b2..d52a5ed0fea2 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3165,14 +3165,14 @@ void XMLTextParagraphExport::_exportTextGraphic(
void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(const Reference < XPropertySet > & )
{
- DBG_ASSERT( false, "no API implementation avialable" );
+ SAL_WARN( "xmloff", "no API implementation avialable" );
}
void XMLTextParagraphExport::_exportTextEmbedded(
const Reference < XPropertySet > &,
const Reference < XPropertySetInfo > & )
{
- DBG_ASSERT( false, "no API implementation avialable" );
+ SAL_WARN( "xmloff", "no API implementation avialable" );
}
void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rPropSet )
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index e3430fe6721d..42bea91726a5 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -300,7 +300,7 @@ bool XMLDropCapPropHdl_Impl::importXML(
Any&,
const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "drop caps are an element import property" );
+ SAL_WARN( "xmloff", "drop caps are an element import property" );
return false;
}
@@ -309,7 +309,7 @@ bool XMLDropCapPropHdl_Impl::exportXML(
const Any&,
const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "drop caps are an element export property" );
+ SAL_WARN( "xmloff", "drop caps are an element export property" );
return false;
}
@@ -707,7 +707,7 @@ bool XMLTextColumnsPropertyHandler::importXML(
Any&,
const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "columns are an element import property" );
+ SAL_WARN( "xmloff", "columns are an element import property" );
return false;
}
@@ -716,7 +716,7 @@ bool XMLTextColumnsPropertyHandler::exportXML(
const Any&,
const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "columns are an element export property" );
+ SAL_WARN( "xmloff", "columns are an element export property" );
return false;
}
@@ -758,7 +758,7 @@ bool XMLHoriMirrorPropHdl_Impl::exportXML(
const Any&,
const SvXMLUnitConverter& ) const
{
- DBG_ASSERT( false, "HorMirror properyt shouldn't be exported" );
+ SAL_WARN( "xmloff", "HorMirror properyt shouldn't be exported" );
return false;
}