[Libreoffice-commits] core.git: basic/source cui/source editeng/source filter/source linguistic/source sd/source sfx2/source sot/source svtools/source svx/source tools/source unotools/source vcl/source vcl/unx xmloff/source
Noel Grandin
noelgrandin at gmail.com
Sun Jun 12 18:11:12 UTC 2016
basic/source/basmgr/basmgr.cxx | 2 -
basic/source/sbx/sbxobj.cxx | 8 ++---
basic/source/sbx/sbxvalue.cxx | 6 ++--
basic/source/sbx/sbxvar.cxx | 2 -
cui/source/dialogs/hyphen.cxx | 2 -
cui/source/dialogs/insdlg.cxx | 2 -
cui/source/tabpages/numpages.cxx | 2 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 3 +-
editeng/source/items/textitem.cxx | 2 -
editeng/source/outliner/outliner.cxx | 2 -
filter/source/flash/swfwriter1.cxx | 4 +-
filter/source/msfilter/svdfppt.cxx | 3 +-
linguistic/source/convdic.cxx | 4 +-
linguistic/source/dicimp.cxx | 4 +-
linguistic/source/dlistimp.cxx | 2 -
linguistic/source/gciterator.cxx | 18 ++++++------
linguistic/source/hyphdsp.cxx | 6 ++--
linguistic/source/lngprophelp.cxx | 6 ++--
linguistic/source/misc.cxx | 6 ++--
linguistic/source/spelldsp.cxx | 6 ++--
linguistic/source/thesdsp.cxx | 2 -
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 -
sfx2/source/appl/app.cxx | 2 -
sfx2/source/doc/doctempl.cxx | 4 +-
sfx2/source/doc/guisaveas.cxx | 4 +-
sfx2/source/doc/objxtor.cxx | 10 +++---
sot/source/sdstor/ucbstorage.cxx | 4 +-
svtools/source/brwbox/brwbox3.cxx | 2 -
svtools/source/svrtf/svparser.cxx | 2 -
svtools/source/table/tablecontrol.cxx | 2 -
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 4 +-
svx/source/table/tablecontroller.cxx | 2 -
svx/source/unodraw/unoshap2.cxx | 2 -
svx/source/unodraw/unoshap3.cxx | 2 -
svx/source/xml/xmleohlp.cxx | 2 -
tools/source/stream/stream.cxx | 2 -
unotools/source/config/cmdoptions.cxx | 2 -
unotools/source/config/compatibility.cxx | 2 -
unotools/source/config/dynamicmenuoptions.cxx | 2 -
unotools/source/config/lingucfg.cxx | 11 ++++---
vcl/source/gdi/pdfwriter_impl.cxx | 4 +-
vcl/source/gdi/print.cxx | 6 ++--
vcl/source/gdi/virdev.cxx | 2 -
vcl/source/window/dlgctrl.cxx | 2 -
vcl/source/window/menu.cxx | 2 -
vcl/source/window/printdlg.cxx | 2 -
vcl/unx/generic/print/genpspgraphics.cxx | 6 ++--
xmloff/source/chart/XMLChartStyleContext.cxx | 2 -
xmloff/source/style/xmlbahdl.cxx | 4 +-
xmloff/source/text/XMLTextNumRuleInfo.cxx | 4 +-
xmloff/source/text/txtparae.cxx | 4 +-
xmloff/source/text/txtprhdl.cxx | 10 +++---
55 files changed, 108 insertions(+), 105 deletions(-)
New commits:
commit 272a8afa60fe9a6b497c69a58b0054ad5b880690
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sun Jun 12 14:42:51 2016 +0200
convert more DBG_ASSERT(false to SAL_WARN
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55
Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3443016..9b8cf68 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -749,7 +749,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/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 12b0927..9cdd777 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -242,7 +242,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
case SbxClassType::Property: pArray = pProps; break;
case SbxClassType::Method: pArray = pMethods; break;
case SbxClassType::Object: pArray = pObjs; break;
- default: DBG_ASSERT( false, "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
}
if( pArray )
{
@@ -338,7 +338,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
case SbxClassType::Property: pArray = pProps; break;
case SbxClassType::Method: pArray = pMethods; break;
case SbxClassType::Object: pArray = pObjs; break;
- default: DBG_ASSERT( false, "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
}
if( pArray )
{
@@ -374,7 +374,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp
case SbxClassType::Property: pArray = pProps; break;
case SbxClassType::Method: pArray = pMethods; break;
case SbxClassType::Object: pArray = pObjs; break;
- default: DBG_ASSERT( false, "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
}
if( !pArray )
{
@@ -487,7 +487,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
case SbxClassType::Property: pArray = pProps; break;
case SbxClassType::Method: pArray = pMethods; break;
case SbxClassType::Object: pArray = pObjs; break;
- default: DBG_ASSERT( false, "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
}
}
if( pArray )
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 7bf87723..5e6195d 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;
}
}
@@ -1551,7 +1551,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;
}
@@ -1653,7 +1653,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 1b52c46..23d7bfe 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -544,7 +544,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 06ed08c..efcfd92 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 c9207f9..bc88e0c 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -120,7 +120,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 2463ef3..36efe21 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 56669b5..6813187 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>
@@ -2752,7 +2753,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 72172a6..c6ab046 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3331,7 +3331,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 5ed9ff5..1f3fe94 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 64c234b..2097bcb 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -794,7 +794,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);
@@ -812,7 +812,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 f33c088..2cb1cc5 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>
@@ -7408,7 +7409,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 9b25979..d955c4c 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 272de85..a6d3127 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 bba17f9..d077bf0 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -848,7 +848,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 3133cd7..b15fa85 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 d9990d3..6018af0 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -369,7 +369,7 @@ Reference< XHyphenatedWord > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xHyph;
@@ -501,7 +501,7 @@ Reference< XHyphenatedWord > SAL_CALL
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xHyph;
@@ -624,7 +624,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 8dccc52..0528f5d 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -440,7 +440,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;
@@ -504,7 +504,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;
@@ -601,7 +601,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 6a1a96c..160af548 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
{
@@ -732,7 +732,7 @@ uno::Reference< XSearchableDictionaryList > GetDictionaryList()
}
catch (const uno::Exception &)
{
- DBG_ASSERT( false, "createInstance failed" );
+ SAL_WARN( "linguistic", "createInstance failed" );
}
return xRef;
@@ -759,7 +759,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 4c8b230..cdcd95e 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;
@@ -560,7 +560,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
}
catch (uno::Exception &)
{
- DBG_ASSERT( false, "createInstanceWithArguments failed" );
+ SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
}
pRef [i] = xSpell;
@@ -733,7 +733,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
{
if (xRes.is())
{
- DBG_ASSERT( false, "XSetSpellAlternatives not implemented!" );
+ SAL_WARN( "linguistic", "XSetSpellAlternatives not implemented!" );
}
else if (!aProposals.empty())
{
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 3e81ed8..bfd0875 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 1a2043c..8c42ee3 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 c547dc3..862de39 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 358266c..dadc8db 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 36f954d..b603583 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 ();
}
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 8619727..3657c45 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -185,7 +185,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 c3d9d34..458b4ec 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -867,12 +867,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 6f4ac53..4a8e6d0 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -140,7 +140,7 @@ 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;
@@ -1597,7 +1597,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
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 1a76d62..02aff11 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1124,7 +1124,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;
}
@@ -1132,7 +1132,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;
}
@@ -1140,21 +1140,21 @@ 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" );
}
void SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
}
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 d2badfe..dcaa36f 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1683,8 +1683,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 b98291c..faaf3a3 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 7f350d3..b01e9c1 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -134,7 +134,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 643778c..8edd4b1 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 422c0af..de5775b 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 5119b88..dcdfe92 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1816,7 +1816,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 0d3eccb..aa2a737 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -280,7 +280,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 a969b65..3a8f4a7 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 c8c7bbe..82e5ad5 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -270,7 +270,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 369ded5..befd934 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 5bd0e82..e1ab540 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 8dd58e2..0e7ee77 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -403,7 +403,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 507d4b6..f841fd3 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -361,7 +361,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 9293544..3f7da46 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>
@@ -390,7 +391,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)
@@ -489,7 +490,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)
@@ -651,7 +652,7 @@ void SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyN
break;
default:
- DBG_ASSERT( false, "unexpected case" );
+ SAL_WARN( "unotools", "unexpected case" );
}
}
@@ -776,7 +777,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;
}
@@ -1111,7 +1112,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 1132b95..ff0bc1a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8176,7 +8176,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 );
@@ -12464,7 +12464,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 3349da5..6b57e48 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -313,21 +313,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 0f25ecc..3dac7a8 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -458,7 +458,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 3895ae2f..2dbda7f 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 c128f54..ae832f2 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1009,7 +1009,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 9f16bf4..e8cda0c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1723,7 +1723,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/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 2d8461ad..0d92c3b 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -379,12 +379,12 @@ void GenPspGraphics::SetFillColor( SalColor nSalColor )
void GenPspGraphics::SetROPLineColor( SalROPColor )
{
- DBG_ASSERT( false, "Error: PrinterGfx::SetROPLineColor() not implemented" );
+ SAL_WARN( "vcl", "Error: PrinterGfx::SetROPLineColor() not implemented" );
}
void GenPspGraphics::SetROPFillColor( SalROPColor )
{
- DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" );
+ SAL_WARN( "vcl", "Error: PrinterGfx::SetROPFillColor() not implemented" );
}
void GenPspGraphics::SetXORMode( bool bSet )
@@ -478,7 +478,7 @@ void GenPspGraphics::invert( sal_uInt32,
const SalPoint*,
SalInvert )
{
- DBG_ASSERT( false, "Error: PrinterGfx::Invert() not implemented" );
+ SAL_WARN( "vcl", "Error: PrinterGfx::Invert() not implemented" );
}
bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index a3fc7a8..17fa381 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 7516bff..6ae285f 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -800,13 +800,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 a31f13d..1f4e60f 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -94,7 +94,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;
@@ -102,7 +102,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 340c06d..4c3aa29 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3148,14 +3148,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 3003892..f03edd6 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -303,7 +303,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;
}
@@ -312,7 +312,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;
}
@@ -710,7 +710,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;
}
@@ -719,7 +719,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;
}
@@ -760,7 +760,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;
}
More information about the Libreoffice-commits
mailing list