[Libreoffice-commits] .: 6 commits - starmath/source sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:54:46 PDT 2011
starmath/source/dialog.cxx | 2
starmath/source/mathmlexport.cxx | 6 -
starmath/source/mathtype.cxx | 2
starmath/source/node.cxx | 4 -
starmath/source/parse.cxx | 8 +-
starmath/source/rect.cxx | 8 +-
starmath/source/symbol.cxx | 2
starmath/source/types.cxx | 2
starmath/source/view.cxx | 2
sw/source/core/SwNumberTree/SwNodeNum.cxx | 8 --
sw/source/core/SwNumberTree/SwNumberTree.cxx | 33 ++++------
sw/source/core/access/acccontext.cxx | 6 -
sw/source/core/access/accmap.cxx | 2
sw/source/core/access/parachangetrackinginfo.cxx | 9 --
sw/source/core/access/textmarkuphelper.cxx | 3
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 8 +-
sw/source/core/bastyp/swcache.cxx | 2
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/crsr/trvltbl.cxx | 4 -
sw/source/core/doc/dbgoutsw.cxx | 2
sw/source/core/doc/doc.cxx | 4 -
sw/source/core/doc/docbm.cxx | 3
sw/source/core/doc/docdraw.cxx | 19 ++---
sw/source/core/doc/docfmt.cxx | 3
sw/source/core/doc/doclay.cxx | 6 -
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/docnum.cxx | 23 ++----
sw/source/core/doc/fmtcol.cxx | 3
sw/source/core/doc/number.cxx | 3
sw/source/core/doc/swserv.cxx | 3
sw/source/core/doc/swstylemanager.cxx | 2
sw/source/core/docnode/finalthreadmanager.cxx | 8 +-
sw/source/core/docnode/ndcopy.cxx | 8 --
sw/source/core/docnode/ndnum.cxx | 3
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/section.cxx | 6 -
sw/source/core/docnode/threadmanager.cxx | 4 -
sw/source/core/draw/dcontact.cxx | 31 +++------
sw/source/core/draw/drawdoc.cxx | 3
sw/source/core/draw/dview.cxx | 5 -
sw/source/core/fields/expfld.cxx | 3
sw/source/core/frmedt/fefly1.cxx | 9 --
sw/source/core/frmedt/feshview.cxx | 3
sw/source/core/frmedt/fews.cxx | 9 --
sw/source/core/frmedt/tblsel.cxx | 6 -
sw/source/core/graphic/ndgrf.cxx | 16 ++--
sw/source/core/layout/anchoreddrawobject.cxx | 8 --
sw/source/core/layout/anchoredobject.cxx | 3
sw/source/core/layout/atrfrm.cxx | 3
sw/source/core/layout/calcmove.cxx | 6 -
sw/source/core/layout/flowfrm.cxx | 3
sw/source/core/layout/fly.cxx | 10 +--
sw/source/core/layout/flycnt.cxx | 3
sw/source/core/layout/flylay.cxx | 11 +--
sw/source/core/layout/frmtool.cxx | 5 -
sw/source/core/layout/layact.cxx | 8 +-
sw/source/core/layout/layouter.cxx | 2
sw/source/core/layout/objectformatter.cxx | 5 -
sw/source/core/layout/objectformatterlayfrm.cxx | 6 -
sw/source/core/layout/objectformattertxtfrm.cxx | 15 +---
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/layout/sortedobjsimpl.cxx | 11 +--
sw/source/core/layout/tabfrm.cxx | 7 --
sw/source/core/layout/unusedf.cxx | 2
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 15 +---
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 11 +--
sw/source/core/table/swnewtable.cxx | 6 -
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/txtfrm.cxx | 5 -
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 21 ++----
sw/source/core/txtnode/thints.cxx | 28 +++-----
sw/source/core/unocore/unobkm.cxx | 15 +---
sw/source/core/unocore/unodraw.cxx | 9 --
sw/source/core/unocore/unoftn.cxx | 12 +--
sw/source/core/unocore/unoidx.cxx | 26 ++-----
sw/source/core/unocore/unoobj.cxx | 14 +---
sw/source/core/unocore/unoobj2.cxx | 12 +--
sw/source/core/unocore/unoparagraph.cxx | 21 ++----
sw/source/core/unocore/unoportenum.cxx | 8 +-
sw/source/core/unocore/unorefmk.cxx | 32 +++------
sw/source/core/unocore/unosect.cxx | 21 ++----
sw/source/core/unocore/unostyle.cxx | 18 ++---
sw/source/core/unocore/unotbl.cxx | 2
sw/source/core/unocore/unotext.cxx | 12 +--
sw/source/core/unocore/unotextmarkup.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/core/view/viewpg.cxx | 2
sw/source/filter/html/htmlnum.cxx | 3
sw/source/filter/writer/writer.cxx | 4 -
sw/source/filter/writer/wrt_fn.cxx | 2
sw/source/filter/ww8/hash_wrap.hxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 4 -
sw/source/filter/ww8/sortedarray.hxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 6 -
sw/source/filter/ww8/wrtw8num.cxx | 3
sw/source/filter/ww8/ww8atr.cxx | 6 -
sw/source/filter/ww8/ww8graf.cxx | 3
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 8 +-
sw/source/filter/xml/swxml.cxx | 10 +--
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/filter/xml/xmltble.cxx | 2
sw/source/filter/xml/xmltbli.cxx | 4 -
sw/source/ui/app/apphdl.cxx | 4 -
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 4 -
sw/source/ui/app/docshini.cxx | 2
sw/source/ui/app/docst.cxx | 8 +-
sw/source/ui/app/swmodul1.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/modcfg.cxx | 6 -
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 4 -
sw/source/ui/config/uinums.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 4 -
sw/source/ui/dbui/dbinsdlg.cxx | 4 -
sw/source/ui/dbui/dbmgr.cxx | 30 ++++-----
sw/source/ui/dbui/mailmergechildwindow.cxx | 4 -
sw/source/ui/dbui/mailmergehelper.cxx | 4 -
sw/source/ui/dbui/mailmergewizard.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dbui/mmconfigitem.cxx | 8 +-
sw/source/ui/dbui/mmgreetingspage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 4 -
sw/source/ui/docvw/AnnotationWin.cxx | 2
sw/source/ui/docvw/PostItMgr.cxx | 16 ++--
sw/source/ui/docvw/SidebarWin.cxx | 3
sw/source/ui/docvw/srcedtw.cxx | 4 -
sw/source/ui/envelp/envimg.cxx | 4 -
sw/source/ui/envelp/labelcfg.cxx | 2
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fldui/xfldui.cxx | 2
sw/source/ui/index/cntex.cxx | 4 -
sw/source/ui/index/cnttab.cxx | 4 -
sw/source/ui/lingu/hhcwrp.cxx | 2
sw/source/ui/misc/docfnote.cxx | 2
sw/source/ui/misc/num.cxx | 3
sw/source/ui/misc/numberingtypelistbox.cxx | 2
sw/source/ui/ribbar/tbxanchr.cxx | 2
sw/source/ui/shells/basesh.cxx | 16 ++--
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/langhelper.cxx | 2
sw/source/ui/shells/tabsh.cxx | 2
sw/source/ui/shells/textfld.cxx | 4 -
sw/source/ui/shells/textglos.cxx | 2
sw/source/ui/shells/txtattr.cxx | 8 +-
sw/source/ui/shells/txtcrsr.cxx | 12 +--
sw/source/ui/shells/txtnum.cxx | 2
sw/source/ui/table/chartins.cxx | 2
sw/source/ui/table/tablemgr.cxx | 2
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/view2.cxx | 7 --
sw/source/ui/uiview/viewcoll.cxx | 2
sw/source/ui/uiview/viewling.cxx | 2
sw/source/ui/uiview/viewsrch.cxx | 2
sw/source/ui/uno/dlelstnr.cxx | 2
sw/source/ui/uno/unomailmerge.cxx | 26 +++----
sw/source/ui/uno/unomod.cxx | 8 +-
sw/source/ui/uno/unotxdoc.cxx | 14 ++--
sw/source/ui/uno/unotxvw.cxx | 16 ++--
sw/source/ui/utlui/numfmtlb.cxx | 2
sw/source/ui/utlui/swrenamexnameddlg.cxx | 2
sw/source/ui/utlui/uitool.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 4 -
172 files changed, 467 insertions(+), 621 deletions(-)
New commits:
commit baade6c60b9bd0f708f5c8d81a333f1070a72d65
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:11:06 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 39d8259..bed36ae 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1789,7 +1789,7 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox )
else
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE(0, "Sm : wrong combobox argument");
+ OSL_FAIL("Sm : wrong combobox argument");
#endif
}
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index db08bfe..38943b0 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1179,7 +1179,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
case TSERIF : nSansSerifFixed = 1; break;
case TFIXED : nSansSerifFixed = 2; break;
default:
- OSL_ENSURE( 0, "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
// According to the parser every node that is to be evaluated heres
// has a single non-zero subnode at index 1!! Thus we only need to check
@@ -1313,7 +1313,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
pText = "monospace"; // no modifiers allowed for monospace ...
else
{
- OSL_ENSURE( 0, "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, A2OU(pText));
}
@@ -1485,7 +1485,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
ExportBlank(pNode, nLevel);
break;
default:
- OSL_ENSURE( 0, "Warning: failed to export a node?" );
+ OSL_FAIL( "Warning: failed to export a node?" );
break;
}
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9f3094e..7dfa824 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1675,7 +1675,7 @@ void SmParser::Oper()
break;
default :
- OSL_ENSURE(0, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
NodeStack.Push(pNode);
@@ -1836,7 +1836,7 @@ void SmParser::FontAttribut()
break;
default :
- OSL_ENSURE(0, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
}
@@ -2040,7 +2040,7 @@ void SmParser::Brace()
case TLFLOOR : eExpectedType = TRFLOOR; break;
case TLCEIL : eExpectedType = TRCEIL; break;
default :
- OSL_ENSURE(0, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
if (CurToken.eType == eExpectedType)
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index cd3147b..9847fde 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -208,7 +208,7 @@ bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChang
else if (pFound && !bForceChange && bSymbolConflict)
{
// TODO: but what ...
- OSL_ENSURE( 0, "symbol conflict, different symbol with same name found!" );
+ OSL_FAIL( "symbol conflict, different symbol with same name found!" );
}
}
diff --git a/starmath/source/types.cxx b/starmath/source/types.cxx
index c1ba0f1..060c149 100644
--- a/starmath/source/types.cxx
+++ b/starmath/source/types.cxx
@@ -39,7 +39,7 @@ sal_Unicode ConvertMathPrivateUseAreaToUnicode( sal_Unicode cChar )
sal_Unicode cRes = cChar;
if (IsInPrivateUseArea( cChar ))
{
- OSL_ENSURE( 0, "Error: private use area characters should no longer be in use!" );
+ OSL_FAIL( "Error: private use area characters should no longer be in use!" );
cRes = (sal_Unicode) '@'; // just some character that should easily be notice as odd in the context
}
return cRes;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 0c2cd04..a981b68 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1339,7 +1339,7 @@ void SmViewShell::Impl_Print(
USHORT SmViewShell::Print(SfxProgress & /*rProgress*/, BOOL /*bIsAPI*/, PrintDialog * /*pPrintDialog*/)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Print" );
- OSL_ENSURE( 0, "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" );
+ OSL_FAIL( "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" );
return 0;
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index adf88d5..b25b7ef 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1148,11 +1148,11 @@ void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWh
rNewSet.Put( *pOldItem );
}
else {
- OSL_ENSURE(0, "What am I doing here?");
+ OSL_FAIL("What am I doing here?");
}
}
else {
- OSL_ENSURE(0, "What am I doing here?");
+ OSL_FAIL("What am I doing here?");
}
}
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 6b162c0..dbdd18a 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -964,13 +964,13 @@ void SwXStyleFamily::removeByName(const OUString& rName) throw( container::NoSuc
uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXStyleFamily::getPropertySetInfo( ) throw (uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
return uno::Reference< beans::XPropertySetInfo >();
}
void SAL_CALL SwXStyleFamily::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -994,7 +994,7 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp
case SFX_STYLE_FAMILY_PSEUDO:
nResId = STR_STYLE_FAMILY_NUMBERING; break;
default:
- OSL_ENSURE( 0, "SwXStyleFamily::getPropertyValue(): invalid family" );
+ OSL_FAIL( "SwXStyleFamily::getPropertyValue(): invalid family" );
}
if ( nResId > 0 )
{
@@ -1012,22 +1012,22 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp
void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SwXStyleFamily::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index ecffc0c..8eaa899 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -85,7 +85,7 @@ SwLinguServiceEventListener::SwLinguServiceEventListener()
}
catch (uno::Exception &)
{
- OSL_ENSURE(0, "exception caught in SwLinguServiceEventListener c-tor" );
+ OSL_FAIL("exception caught in SwLinguServiceEventListener c-tor" );
}
}
}
commit 6b758e3af56c848227d584f50f1f7b728d3dc054
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:53:13 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 79690b2..26f20de 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2525,7 +2525,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
}
break;
- default:OSL_ENSURE(false, "wrong Dispatcher (basesh.cxx)");
+ default:OSL_FAIL("wrong Dispatcher (basesh.cxx)");
}
if(!bDone)
rReq.Done();
commit 711d287e9ea99e3cddadd44b6238148c5daec2e7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:51:35 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index f50ea4e..c8cbfef 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1748,7 +1748,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
*pS >> nTabType;
*pS >> nTabOffset;
}
- OSL_ENSURE(false,"Not seen in the wild Equation Ruler Field");
+ OSL_FAIL("Not seen in the wild Equation Ruler Field");
break;
case FONT:
{
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 00e3e3e..926e308 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1562,7 +1562,7 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aPos.Y() -= nDist;
break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
break;
}
@@ -2172,7 +2172,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
case TYELLOW : SetColor(Color(COL_YELLOW)); break;
default:
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
pNode->Arrange(rDev, rFormat);
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 6a649d0..9f3094e 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1296,7 +1296,7 @@ void SmParser::SubSup(ULONG nActiveGroup)
case TLSUB : nIndex = (int) LSUB; break;
case TLSUP : nIndex = (int) LSUP; break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
nIndex++;
OSL_ENSURE(1 <= nIndex && nIndex <= 1 + SUBSUP_NUM_ENTRIES,
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 473ea36..90d805d 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -349,7 +349,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
+ GetItalicLeftSpace();
break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
// check if horizontal position is already set
@@ -386,7 +386,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
aPos.Y() += rRect.GetLoAttrFence() - GetTop();
break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
// check if vertical position is already set
@@ -403,7 +403,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
aPos.X() += rRect.GetItalicRight() - GetItalicRight();
break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
return aPos;
@@ -494,7 +494,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode)
CopyMBL(rRect);
break;
default :
- OSL_ENSURE(false, "Sm: unknown case");
+ OSL_FAIL("Sm: unknown case");
}
}
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index d65cacd..8c94ed3 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -182,7 +182,7 @@ bool SwNodeNum::IsContinuous() const
}
else
{
- OSL_ENSURE( false, "<SwNodeNum::IsContinuous()> - OD debug" );
+ OSL_FAIL( "<SwNodeNum::IsContinuous()> - OD debug" );
}
// <--
@@ -294,8 +294,7 @@ bool SwNodeNum::IsCountPhantoms() const
mpNumRule->IsCountPhantoms();
else
{
- OSL_ENSURE( false,
- "<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" );
+ OSL_FAIL( "<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" );
}
// <--
@@ -358,8 +357,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
SwNodeNum* pChildNode( dynamic_cast<SwNodeNum*>((*rNodeNum.mChildren.begin())) );
if ( !pChildNode )
{
- OSL_ENSURE( false,
- "<SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" );
+ OSL_FAIL( "<SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" );
++nAllowedChildCount;
continue;
}
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index c19d969..03ccf0e 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -69,7 +69,7 @@ SwNumberTreeNode::~SwNumberTreeNode()
}
else
{
- OSL_ENSURE(false, "lost children!");
+ OSL_FAIL("lost children!");
}
}
@@ -91,7 +91,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! mChildren.empty() &&
(*mChildren.begin())->IsPhantom())
{
- OSL_ENSURE(false, "phantom already present");
+ OSL_FAIL("phantom already present");
}
else
{
@@ -104,7 +104,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! aInsert.second)
{
- OSL_ENSURE(false, "insert of phantom failed!");
+ OSL_FAIL("insert of phantom failed!");
delete pNew;
pNew = NULL;
@@ -503,14 +503,13 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
if ( nDepth < 0 )
{
- OSL_ENSURE( false,
- "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
return;
}
if ( pChild->GetParent() != NULL || pChild->GetChildCount() > 0 )
{
- OSL_ENSURE(false, "only orphans allowed.");
+ OSL_FAIL("only orphans allowed.");
return;
}
@@ -644,7 +643,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
if (pChild->IsPhantom())
{
- OSL_ENSURE(false, "not applicable to phantoms!");
+ OSL_FAIL("not applicable to phantoms!");
return;
}
@@ -697,7 +696,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
}
else
{
- OSL_ENSURE(false, "RemoveChild: failed!");
+ OSL_FAIL("RemoveChild: failed!");
}
pChild->PostRemove();
@@ -878,8 +877,7 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
{
if ( nLevel < 0 )
{
- OSL_ENSURE( false,
- "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
return;
}
@@ -931,14 +929,14 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (find(rParents.begin(), rParents.end(), this) != rParents.end())
{
- OSL_ENSURE(false, " I'm my own ancestor!");
+ OSL_FAIL(" I'm my own ancestor!");
bResult = false;
}
if (! rParents.empty() && rParents.back() != mpParent)
{
- OSL_ENSURE(false, " I'm a bastard!");
+ OSL_FAIL(" I'm a bastard!");
bResult = false;
}
@@ -959,7 +957,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (! bFirst)
{
- OSL_ENSURE(false, " found phantom not at first position.");
+ OSL_FAIL(" found phantom not at first position.");
bResult = false;
}
@@ -967,7 +965,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if ((*aIt)->mpParent != (SwNumberTreeNode *) this)
{
- OSL_ENSURE(false, "found a bastard");
+ OSL_FAIL("found a bastard");
bResult = false;
}
@@ -976,7 +974,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
{
if (!(*aIt)->IsPhantom() && (*aIt)->LessThan(*this))
{
- OSL_ENSURE(false, " found child less than me");
+ OSL_FAIL(" found child less than me");
bResult = false;
}
@@ -984,7 +982,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
}
else
{
- OSL_ENSURE(false, "found child that is NULL");
+ OSL_FAIL("found child that is NULL");
bResult = false;
}
@@ -1289,8 +1287,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
{
if ( nListLevel < 0 )
{
- OSL_ENSURE( false,
- "<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
+ OSL_FAIL( "<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
return;
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index ba9b81b..78f18fa 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1253,8 +1253,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else
{
- OSL_ENSURE( false ,
- "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
+ OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
}
// <--
}
@@ -1294,8 +1293,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else if ( rChildFrmOrObj.GetWindow() )
{
- OSL_ENSURE( false,
- "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
+ OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
}
}
}
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index 3d0b5c4..68902b5 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -53,8 +53,7 @@ namespace {
if ( !rTxtFrm.GetTxtNode() )
{
- OSL_ENSURE( false,
- "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
+ OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
return;
}
const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) );
@@ -62,8 +61,7 @@ namespace {
const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
if ( !pIDocChangeTrack )
{
- OSL_ENSURE( false,
- "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
+ OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
return;
}
@@ -219,8 +217,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
break;
default:
{
- OSL_ENSURE( false,
- "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." );
+ OSL_FAIL( "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." );
}
}
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 5f66917..c7b1bc2 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -161,8 +161,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
}
else
{
- OSL_ENSURE( false,
- "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
+ OSL_FAIL( "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
}
}
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 4ec81eb..fa49050 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -88,7 +88,7 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
}
break;
default:
- OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+ OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
bRet = false;
}
@@ -116,13 +116,13 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
}
else
{
- OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+ OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
bRet = false;
}
}
break;
default:
- OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+ OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
bRet = false;
}
@@ -141,7 +141,7 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
}
else
{
- OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+ OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
}
}
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 4896237..f95e83d 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -161,7 +161,7 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
}
break;
default:
- OSL_ENSURE( false, "unknown case in lcl_CleanStr" );
+ OSL_FAIL( "unknown case in lcl_CleanStr" );
break;
}
}
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index fc6266e..5daf0a7 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -364,7 +364,7 @@ bool lcl_FindNextCell( SwNodeIndex& rIdx, BOOL bInReadOnly )
if ( !pTblNd )
{
- OSL_ENSURE( false, "lcl_FindNextCell not celled with table start node!" );
+ OSL_FAIL( "lcl_FindNextCell not celled with table start node!" );
return false;
}
@@ -442,7 +442,7 @@ bool lcl_FindPrevCell( SwNodeIndex& rIdx, BOOL bInReadOnly )
if ( !pTblNd )
{
- OSL_ENSURE( false, "lcl_FindPrevCell not celled with table start node!" );
+ OSL_FAIL( "lcl_FindPrevCell not celled with table start node!" );
return false;
}
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 3b99a31..3faf555 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -1043,7 +1043,7 @@ String lcl_TokenType2Str(FormTokenType nType)
return String("??", RTL_TEXTENCODING_ASCII_US);
}
- OSL_ENSURE(false, "should not be reached");
+ OSL_FAIL("should not be reached");
return String("??", RTL_TEXTENCODING_ASCII_US);
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4eaed8b..d6a3e8e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -200,7 +200,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case KERN_ASIAN_PUNCTUATION: return mbKernAsianPunctuation;
case DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: return mbDoNotResetParaAttrsForNumFont;
default:
- OSL_ENSURE(false, "Invalid setting id");
+ OSL_FAIL("Invalid setting id");
}
return false;
}
@@ -354,7 +354,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
break;
default:
- OSL_ENSURE(false, "Invalid setting id");
+ OSL_FAIL("Invalid setting id");
}
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 10120c0..fbf413e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -293,8 +293,7 @@ IDocumentMarkAccess::MarkType IDocumentMarkAccess::GetType(const IMark& rBkmk)
return NAVIGATOR_REMINDER;
else
{
- OSL_ENSURE(false,
- "IDocumentMarkAccess::GetType(..)"
+ OSL_FAIL("IDocumentMarkAccess::GetType(..)"
" - unknown MarkType. This needs to be fixed!");
return UNO_BOOKMARK;
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f2c903e..d1a75a3 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -131,8 +131,7 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
// vertical from left-to-right - not supported yet
bVert = true;
bR2L = true;
- OSL_ENSURE( false,
- "<lcl_AdjustPositioningAttr(..)> - vertical from left-to-right not supported." );
+ OSL_FAIL( "<lcl_AdjustPositioningAttr(..)> - vertical from left-to-right not supported." );
}
break;
case FRMDIR_VERT_TOP_RIGHT:
@@ -460,8 +459,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView )
// <SwDrawVirt>-object is found in the mark list.
if ( pObj->ISA(SwDrawVirtObj) )
{
- OSL_ENSURE( false,
- "<SwDrawVirtObj> is still marked for delete. application will crash!" );
+ OSL_FAIL( "<SwDrawVirtObj> is still marked for delete. application will crash!" );
}
//loescht sich selbst!
pContact->Changed(*pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
@@ -670,7 +668,7 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId ) const
}
else
{
- OSL_ENSURE( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
+ OSL_FAIL( "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
bRetVal = false;
}
@@ -702,12 +700,12 @@ SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisible
_nInvisibleLayerId == GetHellId() ||
_nInvisibleLayerId == GetControlsId() )
{
- OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
nVisibleLayerId = _nInvisibleLayerId;
}
else
{
- OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
+ OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
nVisibleLayerId = _nInvisibleLayerId;
}
@@ -739,12 +737,12 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
_nVisibleLayerId == GetInvisibleHellId() ||
_nVisibleLayerId == GetInvisibleControlsId() )
{
- OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_FAIL( "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
nInvisibleLayerId = _nVisibleLayerId;
}
else
{
- OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
+ OSL_FAIL( "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
nInvisibleLayerId = _nVisibleLayerId;
}
@@ -973,8 +971,7 @@ namespace docfunc
{
if ( !pAnchoredDrawObj )
{
- OSL_ENSURE( false,
- "<docfunc::AllDrawObjsOnPage() - missing anchored draw object" );
+ OSL_FAIL( "<docfunc::AllDrawObjsOnPage() - missing anchored draw object" );
bAllDrawObjsOnPage = false;
break;
}
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index dd5670f..b40e529 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -653,8 +653,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
// make code robust:
if ( !pNumRule )
{
- OSL_ENSURE( false,
- "<InsAttr(..)> - PaM in front of label, but text node has no numbering rule set. This is a serious defect, please inform OD." );
+ OSL_FAIL( "<InsAttr(..)> - PaM in front of label, but text node has no numbering rule set. This is a serious defect, please inform OD." );
DELETECHARSETS
return false;
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index caaa2d3..adf88d5 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -203,7 +203,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
case FLY_AT_FLY:
case FLY_AT_PARA:
case FLY_AS_CHAR:
- OSL_ENSURE( false, "use new interface instead: SwDoc::MakeFlySection!" );
+ OSL_FAIL( "use new interface instead: SwDoc::MakeFlySection!" );
break;
#endif
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index fc360fa..7e6c009 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -688,7 +688,7 @@ SfxPrinter& SwDoc::CreatePrinter_() const
OSL_ENSURE( ! pPrt, "Do not call CreatePrinter_(), call getPrinter() instead" );
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "Printer will be created!" );
+ OSL_FAIL( "Printer will be created!" );
#endif
// wir erzeugen einen default SfxPrinter.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 3e78772..0f39f56 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -452,7 +452,7 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
nAktPos = nTmpPos;
if( aEndRg == aSttRg )
{
- OSL_ENSURE( false, "Moving outlines: Surprising selection" );
+ OSL_FAIL( "Moving outlines: Surprising selection" );
aEndRg++;
}
@@ -998,8 +998,7 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
if ( (*pNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
{
- OSL_ENSURE( false,
- "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
+ OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
return FALSE;
}
@@ -2355,8 +2354,7 @@ void SwDoc::removeListItem( const SwNodeNum& rNodeNum )
const tImplSortedNodeNumList::size_type nDeleted = mpListItemsList->erase( &rNodeNum );
if ( nDeleted > 1 )
{
- OSL_ENSURE( false,
- "<SwDoc::RemoveListItem(..)> - <SwNodeNum> was registered more than once as numbered item!" );
+ OSL_FAIL( "<SwDoc::RemoveListItem(..)> - <SwNodeNum> was registered more than once as numbered item!" );
}
}
@@ -2452,16 +2450,14 @@ SwList* SwDoc::createList( String sListId,
if ( getListByName( sListId ) )
{
- OSL_ENSURE( false,
- "<SwDoc::createList(..)> - provided list id already used. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwDoc::createList(..)> - provided list id already used. Serious defect -> please inform OD." );
return 0;
}
SwNumRule* pDefaultNumRuleForNewList = FindNumRulePtr( sDefaultListStyleName );
if ( !pDefaultNumRuleForNewList )
{
- OSL_ENSURE( false,
- "<SwDoc::createList(..)> - for provided default list style name no list style is found. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwDoc::createList(..)> - for provided default list style name no list style is found. Serious defect -> please inform OD." );
return 0;
}
@@ -2499,23 +2495,20 @@ SwList* SwDoc::createListForListStyle( const String sListStyleName )
{
if ( sListStyleName.Len() == 0 )
{
- OSL_ENSURE( false,
- "<SwDoc::createListForListStyle(..)> - no list style name provided. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwDoc::createListForListStyle(..)> - no list style name provided. Serious defect -> please inform OD." );
return 0;
}
if ( getListForListStyle( sListStyleName ) )
{
- OSL_ENSURE( false,
- "<SwDoc::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwDoc::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect -> please inform OD." );
return 0;
}
SwNumRule* pNumRule = FindNumRulePtr( sListStyleName );
if ( !pNumRule )
{
- OSL_ENSURE( false,
- "<SwDoc::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwDoc::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect -> please inform OD." );
return 0;
}
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 9a587b4..b3eee92 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -66,8 +66,7 @@ namespace TxtFmtCollFunc
if ( !pTxtFmtColl )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false,
- "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" );
+ OSL_FAIL( "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" );
#endif
return;
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 0fa5f11..a509a1b 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1406,8 +1406,7 @@ namespace numfunc
break;
default:
{
- OSL_ENSURE( false,
- "<SwNumberingUIBehaviorConfig::LoadConfig()> - unknown configuration property");
+ OSL_FAIL( "<SwNumberingUIBehaviorConfig::LoadConfig()> - unknown configuration property");
}
}
}
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index b4a4f7e..a6d46a9 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -301,8 +301,7 @@ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
pDdeBookmark->SetRefObject(this);
}
else
- OSL_ENSURE(false,
- "SwServerObject::SetNoServer(..)"
+ OSL_FAIL("SwServerObject::SetNoServer(..)"
" - setting an bookmark that is not DDE-capable");
}
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index cfb5b9d..1539f64 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -146,7 +146,7 @@ StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const rtl::OUString&
{
// Ok, ok, it's allowed to ask for uncached styles (from UNO) but it should not be done
// during loading a document
- OSL_ENSURE( false, "Don't ask for uncached styles" );
+ OSL_FAIL( "Don't ask for uncached styles" );
rpCache->addCompletePool( rAutoPool );
pStyle = rpCache->getByName( rName );
}
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 2267857..41ff9d2 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -224,14 +224,14 @@ void TerminateOfficeThread::PerformOfficeTermination()
css::uno::UNO_QUERY );
if ( !xTasksSupplier.is() )
{
- OSL_ENSURE( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XFramesSupplier!" );
+ OSL_FAIL( "<TerminateOfficeThread::PerformOfficeTermination()> - no XFramesSupplier!" );
return;
}
css::uno::Reference< css::container::XElementAccess > xList( xTasksSupplier->getFrames(), css::uno::UNO_QUERY );
if ( !xList.is() )
{
- OSL_ENSURE( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XElementAccess!" );
+ OSL_FAIL( "<TerminateOfficeThread::PerformOfficeTermination()> - no XElementAccess!" );
return;
}
@@ -294,14 +294,14 @@ FinalThreadManager::~FinalThreadManager()
if ( !maThreads.empty() )
{
- OSL_ENSURE( false, "<FinalThreadManager::~FinalThreadManager()> - still registered jobs are existing -> perform cancellation" );
+ OSL_FAIL( "<FinalThreadManager::~FinalThreadManager()> - still registered jobs are existing -> perform cancellation" );
cancelAllJobs();
}
if ( mpCancelJobsThread != 0 )
{
if ( !mpCancelJobsThread->allJobsCancelled() )
- OSL_ENSURE( false, "<FinalThreadManager::~FinalThreadManager()> - cancellation of registered jobs not yet finished -> wait for its finish" );
+ OSL_FAIL( "<FinalThreadManager::~FinalThreadManager()> - cancellation of registered jobs not yet finished -> wait for its finish" );
mpCancelJobsThread->stopWhenAllJobsCancelled();
mpCancelJobsThread->join();
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 1ef6a19..623f674 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -718,7 +718,7 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
else
{
OSL_ENSURE( this == pDoc, " falscher Copy-Zweig!" );
- OSL_ENSURE(false, "mst: i thought this could be dead code;"
+ OSL_FAIL("mst: i thought this could be dead code;"
"please tell me what you did to get here!");
pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
@@ -1508,8 +1508,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
{
// This case can *not* happen, but to be robust take the first
// text node in the destination document.
- OSL_ENSURE( false,
- "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
+ OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
nAnchorTxtNdNumInRange = 1;
}
// Second, search corresponding text node in destination document
@@ -1534,8 +1533,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
{
// This case can *not* happen, but to be robust take the first
// text node in the destination document.
- OSL_ENSURE( false,
- "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
+ OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
aAnchorNdIdx = rStartIdx;
while ( !aAnchorNdIdx.GetNode().IsTxtNode() )
{
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 12c6bac..afe19e0 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -105,8 +105,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
}
else
{
- OSL_ENSURE( false,
- "<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect -> inform OD" );
+ OSL_FAIL( "<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect -> inform OD" );
}
}
}
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index d903fce..8a9f0d3 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -93,7 +93,7 @@ bool lcl_IsInSameTblBox( SwNodes& _rNds,
? !_rNds.GoPrevSection( &aChkIdx, FALSE, FALSE )
: !_rNds.GoNextSection( &aChkIdx, FALSE, FALSE ) )
{
- OSL_ENSURE( false, "<lcl_IsInSameTblBox(..)> - no previous/next!" );
+ OSL_FAIL( "<lcl_IsInSameTblBox(..)> - no previous/next!" );
return false;
}
else
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 00c0571..9c4da0d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2556,7 +2556,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
// Make code robust:
if ( aDelCheck.HasBeenDeleted() )
{
- OSL_ENSURE( false, "Current box has been deleted during GetTabRows()" );
+ OSL_FAIL( "Current box has been deleted during GetTabRows()" );
return;
}
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 645f99d..9cfb3bb 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1205,15 +1205,13 @@ void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
{
if ( !rSectNd.GetDoc() )
{
- OSL_ENSURE( false,
- "method <lcl_RemoveSectionLinksInSect(..)> - no Doc at SectionNode" );
+ OSL_FAIL( "method <lcl_RemoveSectionLinksInSect(..)> - no Doc at SectionNode" );
return;
}
if ( !rSectNd.GetSection().IsConnected() )
{
- OSL_ENSURE( false,
- "method <lcl_RemoveSectionLinksInSect(..)> - no Link at Section of SectionNode" );
+ OSL_FAIL( "method <lcl_RemoveSectionLinksInSect(..)> - no Link at Section of SectionNode" );
return;
}
const ::sfx2::SvBaseLink* pOwnLink( &(rSectNd.GetSection().GetBaseLink() ) );
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index c991698..0219e32 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -147,7 +147,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID,
}
else
{
- OSL_ENSURE( false, "<ThreadManager::RemoveThread(..)> - ThreadJoiner already gone!" );
+ OSL_FAIL( "<ThreadManager::RemoveThread(..)> - ThreadJoiner already gone!" );
}
}
@@ -200,7 +200,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData )
}
else
{
- OSL_ENSURE( false, "<ThreadManager::StartThread(..)> - ThreadJoiner already gone!" );
+ OSL_FAIL( "<ThreadManager::StartThread(..)> - ThreadJoiner already gone!" );
}
}
else
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3117685..f8205e3 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -291,20 +291,20 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
{
if ( !_pDrawObj )
{
- OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing object!" );
+ OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no drawing object!" );
return;
}
if ( !pRegisteredIn )
{
- OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing frame format!" );
+ OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no drawing frame format!" );
return;
}
const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(pRegisteredIn)->getIDocumentDrawModelAccess();
if ( !pIDDMA )
{
- OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
+ OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
return;
}
@@ -874,7 +874,7 @@ void SwDrawContact::SetMaster( SdrObject* _pNewMaster )
if ( _pNewMaster )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "debug notification - master replaced!" );
+ OSL_FAIL( "debug notification - master replaced!" );
#endif
maAnchoredDrawObj.SetDrawObj( *_pNewMaster );
}
@@ -900,8 +900,7 @@ const SwFrm* SwDrawContact::GetAnchorFrm( const SdrObject* _pDrawObj ) const
}
else
{
- OSL_ENSURE( false,
- "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." );
+ OSL_FAIL( "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." );
}
return pAnchorFrm;
@@ -1269,8 +1268,7 @@ class NestedUserCallHdl
if ( bTmpAssert )
{
- OSL_ENSURE( false,
- "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious, please inform OD." );
+ OSL_FAIL( "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious, please inform OD." );
}
}
}
@@ -1325,8 +1323,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
{
if ( mbDisconnectInProgress )
{
- OSL_ENSURE( false,
- "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." );
+ OSL_FAIL( "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." );
}
else
{
@@ -1462,8 +1459,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
break;
default:
{
- OSL_ENSURE( false,
- "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
+ OSL_FAIL( "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
}
}
SfxItemSet aSet( GetFmt()->GetDoc()->GetAttrPool(),
@@ -1663,8 +1659,7 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
#if OSL_DEBUG_LEVEL > 1
else
{
- OSL_ENSURE( false,
- "<SwDrawContact::Modify(..)> - unhandled attribute? - please inform od at openoffice.org" );
+ OSL_FAIL( "<SwDrawContact::Modify(..)> - unhandled attribute? - please inform od at openoffice.org" );
}
#endif
}
@@ -1851,8 +1846,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
// *no* connect to layout during disconnection from layout.
if ( mbDisconnectInProgress )
{
- OSL_ENSURE( false,
- "<SwDrawContact::ConnectToLayout(..)> called during disconnection.");
+ OSL_FAIL( "<SwDrawContact::ConnectToLayout(..)> called during disconnection.");
return;
}
@@ -1860,7 +1854,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
// object isn't inserted in the drawing page
if ( !GetMaster()->IsInserted() )
{
- OSL_ENSURE( false, "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted -> no connect to layout. Please inform od at openoffice.org" );
+ OSL_FAIL( "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted -> no connect to layout. Please inform od at openoffice.org" );
return;
}
// <--
@@ -2063,8 +2057,7 @@ void SwDrawContact::ChkPage()
{
if ( mbDisconnectInProgress )
{
- OSL_ENSURE( false,
- "<SwDrawContact::ChkPage()> called during disconnection." );
+ OSL_FAIL( "<SwDrawContact::ChkPage()> called during disconnection." );
return;
}
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index c1c568c..d7c9764 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -224,8 +224,7 @@ uno::Reference< uno::XInterface > SwDrawDocument::createUnoModel()
}
catch( uno::RuntimeException& )
{
- OSL_ENSURE( false,
- "<SwDrawDocument::createUnoModel()> - could *not* retrieve model at <SwDocShell>" );
+ OSL_FAIL( "<SwDrawDocument::createUnoModel()> - could *not* retrieve model at <SwDocShell>" );
}
return xModel;
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index f00b136..2930360 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -239,7 +239,7 @@ void SwDrawView::AddCustomHdl()
SwFrmFmt* pFrmFmt( ::FindFrmFmt( pObj ) );
if ( !pFrmFmt )
{
- OSL_ENSURE( false, "<SwDrawView::AddCustomHdl()> - missing frame format!" );
+ OSL_FAIL( "<SwDrawView::AddCustomHdl()> - missing frame format!" );
return;
}
const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
@@ -967,8 +967,7 @@ void SwDrawView::CheckPossibilities()
SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
if ( !pFrmFmt )
{
- OSL_ENSURE( false,
- "<SwDrawView::CheckPossibilities()> - missing frame format" );
+ OSL_FAIL( "<SwDrawView::CheckPossibilities()> - missing frame format" );
bProtect = TRUE;
}
else if ((FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId()) &&
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index bc14b82..4fee604 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -641,8 +641,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
}
else
{
- OSL_ENSURE( false,
- "<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
+ OSL_FAIL( "<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
}
}
}
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index bf43219..70785dd 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1014,8 +1014,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
SwFrm* pCurrFrm( GetCurrFrm() );
if ( !pCurrFrm )
{
- OSL_ENSURE( false,
- "<SwFEShell::GetFlyFrmAttr(..)> - missing current frame. This is a serious defect, please inform OD." );
+ OSL_FAIL( "<SwFEShell::GetFlyFrmAttr(..)> - missing current frame. This is a serious defect, please inform OD." );
return sal_False;
}
pFly = GetCurrFrm()->FindFlyFrm();
@@ -1739,8 +1738,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(GetUserCall( pInvestigatedObj ) ) );
if ( !pDrawContact )
{
- OSL_ENSURE( false,
- "<SwFEShell::GetObjCntType(..)> - missing draw contact object" );
+ OSL_FAIL( "<SwFEShell::GetObjCntType(..)> - missing draw contact object" );
eType = OBJCNT_NONE;
}
else
@@ -1748,8 +1746,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
SwFrmFmt* pFrmFmt( pDrawContact->GetFmt() );
if ( !pFrmFmt )
{
- OSL_ENSURE( false,
- "<SwFEShell::GetObjCntType(..)> - missing frame format" );
+ OSL_FAIL( "<SwFEShell::GetObjCntType(..)> - missing frame format" );
eType = OBJCNT_NONE;
}
else if ( FLY_AS_CHAR != pFrmFmt->GetAnchor().GetAnchorId() )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 2237dc9..5fd397b 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2248,8 +2248,7 @@ bool SwFEShell::IsGroupAllowed() const
SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
if ( !pFrmFmt )
{
- OSL_ENSURE( false,
- "<SwFEShell::IsGroupAllowed()> - missing frame format" );
+ OSL_FAIL( "<SwFEShell::IsGroupAllowed()> - missing frame format" );
bIsGroupAllowed = false;
}
else if ( FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index f8a580d..3b13b8f 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -1220,23 +1220,20 @@ BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
if ( !pObj )
{
- OSL_ENSURE( false,
- "<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation, please inform OD" );
+ OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation, please inform OD" );
return bVert;
}
// #i26791#
SwContact* pContact = static_cast<SwContact*>(GetUserCall( pObj ));
if ( !pContact )
{
- OSL_ENSURE( false,
- "<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation, please inform OD" );
+ OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation, please inform OD" );
return bVert;
}
const SwFrm* pRef = pContact->GetAnchoredObj( pObj )->GetAnchorFrm();
if ( !pRef )
{
- OSL_ENSURE( false,
- "<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation, please inform OD" );
+ OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation, please inform OD" );
return bVert;
}
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index e9ebd08..b0f5ca4 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -306,7 +306,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
const SwTabFrm* pStartTab = pStart->FindTabFrm();
if ( !pStartTab )
{
- OSL_ENSURE( false, "GetTblSel without start table" );
+ OSL_FAIL( "GetTblSel without start table" );
return;
}
@@ -466,7 +466,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
// been deleted due to the formatting of the table:
if ( aDelCheck.HasBeenDeleted() )
{
- OSL_ENSURE( false, "Current box has been deleted during GetTblSel()" );
+ OSL_FAIL( "Current box has been deleted during GetTblSel()" );
break;
}
// <--
@@ -1841,7 +1841,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
if ( !pStart || !pEnd )
{
- OSL_ENSURE( false, "MakeSelUnions with pStart or pEnd not in CellFrm" );
+ OSL_FAIL( "MakeSelUnions with pStart or pEnd not in CellFrm" );
return;
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 8a10db3..1335d51 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -472,7 +472,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
catch ( uno::Exception& )
{
// --> OD 2005-04-25 #i48434#
- OSL_ENSURE( false, "<SwGrfNode::SwapIn(..)> - unhandled exception!" );
+ OSL_FAIL( "<SwGrfNode::SwapIn(..)> - unhandled exception!" );
// <--
}
// <--
@@ -745,7 +745,7 @@ void SwGrfNode::DelStreamName()
catch ( uno::Exception& )
{
// --> OD 2005-04-25 #i48434#
- OSL_ENSURE( false, "<SwGrfNode::DelStreamName()> - unhandled exception!" );
+ OSL_FAIL( "<SwGrfNode::DelStreamName()> - unhandled exception!" );
// <--
}
}
@@ -824,7 +824,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
}
else
{
- OSL_ENSURE( false, "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" );
+ OSL_FAIL( "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" );
}
}
@@ -868,8 +868,7 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
}
else
{
- OSL_ENSURE( false,
- "<SwGrfNode::_GetStreamStorageNames(..)> - unknown graphic URL type. Code for handling 3.1 - 5.2 storages has been deleted by issue i53025." );
+ OSL_FAIL( "<SwGrfNode::_GetStreamStorageNames(..)> - unknown graphic URL type. Code for handling 3.1 - 5.2 storages has been deleted by issue i53025." );
}
OSL_ENSURE( STRING_NOTFOUND == rStrmName.Search( '/' ),
"invalid graphic stream name" );
@@ -903,7 +902,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
catch ( uno::Exception& )
{
// --> OD 2005-04-25 #i48434#
- OSL_ENSURE( false, "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
+ OSL_FAIL( "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
// <--
}
// <--
@@ -995,7 +994,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
catch ( uno::Exception& )
{
// --> OD 2005-04-25 #i48434#
- OSL_ENSURE( false, "<SwapGraphic> - unhandled exception!" );
+ OSL_FAIL( "<SwapGraphic> - unhandled exception!" );
// <--
}
// <--
@@ -1127,8 +1126,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
{
if ( !IsLinkedFile() )
{
- OSL_ENSURE( false,
- "<SwGrfNode::TriggerAsyncLoad()> - Method is misused. Method call is only valid for graphic nodes, which refer a linked graphic file" );
+ OSL_FAIL( "<SwGrfNode::TriggerAsyncLoad()> - Method is misused. Method call is only valid for graphic nodes, which refer a linked graphic file" );
return;
}
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 0b56b12..8b479b7 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -304,8 +304,7 @@ void SwAnchoredDrawObject::MakeObjPos()
// to anchor frame
if ( mbNotYetAttachedToAnchorFrame )
{
- OSL_ENSURE( false,
- "<SwAnchoredDrawObject::MakeObjPos() - drawing object not yet attached to anchor frame -> no positioning" );
+ OSL_FAIL( "<SwAnchoredDrawObject::MakeObjPos() - drawing object not yet attached to anchor frame -> no positioning" );
return;
}
@@ -376,7 +375,7 @@ void SwAnchoredDrawObject::MakeObjPos()
break;
default:
{
- OSL_ENSURE( false, "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type - please inform OD." );
+ OSL_FAIL( "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type - please inform OD." );
}
}
@@ -837,8 +836,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
break;
default:
{
- OSL_ENSURE( false,
- "<SwAnchoredDrawObject::_SetPositioningAttr()> - unsupported layout direction" );
+ OSL_FAIL( "<SwAnchoredDrawObject::_SetPositioningAttr()> - unsupported layout direction" );
}
}
}
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index 034e780..e01dc40 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -689,8 +689,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
if ( mbObjRectWithSpacesValid &&
maLastObjRect != GetObjRect() )
{
- OSL_ENSURE( false,
- "<SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD." );
+ OSL_FAIL( "<SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD." );
InvalidateObjRectWithSpaces();
}
if ( !mbObjRectWithSpacesValid )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c0867ff..fee0821 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3166,8 +3166,7 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir )
break;
default:
{
- OSL_ENSURE( false,
- "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." );
+ OSL_FAIL( "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." );
}
}
}
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index d52ff18..0e2f0e3 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1447,7 +1447,7 @@ void SwCntntFrm::MakeAll()
#if OSL_DEBUG_LEVEL > 1
else
{
- OSL_ENSURE( false, "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
+ OSL_FAIL( "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
}
#endif
// <--
@@ -1751,7 +1751,7 @@ void SwCntntFrm::MakeAll()
}
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl in SwCntntFrm::MakeAll" );
+ OSL_FAIL( "LoopControl in SwCntntFrm::MakeAll" );
#endif
}
if ( bMovedBwd && GetUpper() )
@@ -2055,7 +2055,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace,
// doesn't makes sense. Thus, return TRUE.
if ( IsAnFollow( pFrm ) && !pFrm->IsValid() )
{
- OSL_ENSURE( false, "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
+ OSL_FAIL( "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
return TRUE;
}
}
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index dfa0d3b..85832fa 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2526,8 +2526,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
{
pNewUpper = 0L;
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false,
- "<SwFlowFrm::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied!" );
+ OSL_FAIL( "<SwFlowFrm::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied!" );
#endif
}
}
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 6dde45b..03e661d 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1598,8 +1598,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
bAgain = true;
if ( pAgainObj2 == pAnchoredObj )
{
- OSL_ENSURE( false,
- "::CalcCntnt(..) - loop detected, perform attribute changes to avoid the loop" );
+ OSL_FAIL( "::CalcCntnt(..) - loop detected, perform attribute changes to avoid the loop" );
//Oszillation unterbinden.
SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
SwFmtSurround aAttr( rFmt.GetSurround() );
@@ -1683,7 +1682,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
continue;
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl in CalcCntnt" );
+ OSL_FAIL( "LoopControl in CalcCntnt" );
#endif
}
}
@@ -2174,8 +2173,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
{
if ( !_rNewObj.ISA(SwAnchoredDrawObject) )
{
- OSL_ENSURE( false,
- "SwFrm::AppendDrawObj(..) - anchored object of unexcepted type -> object not appended" );
+ OSL_FAIL( "SwFrm::AppendDrawObj(..) - anchored object of unexcepted type -> object not appended" );
return;
}
@@ -2601,7 +2599,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour,
// during paint. Thus, return (value of <bRet> should be <FALSE>).
if ( pGrfNd && _bForPaint )
{
- OSL_ENSURE( false, "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." );
+ OSL_FAIL( "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." );
return bRet;
}
pNd->CreateContour();
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index fcea1f6..d557b77 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -497,8 +497,7 @@ void SwFlyAtCntFrm::MakeAll()
pFmt->UnlockModify();
bOsz = false;
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false,
- "<SwFlyAtCntFrm::MakeAll()> - special loop prevention for dedicated document of b6403541 applied" );
+ OSL_FAIL( "<SwFlyAtCntFrm::MakeAll()> - special loop prevention for dedicated document of b6403541 applied" );
#endif
}
}
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 1c9f80e..a0fc150 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -869,8 +869,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
{
if ( !_rNewObj.ISA(SwAnchoredDrawObject) )
{
- OSL_ENSURE( false,
- "SwPageFrm::AppendDrawObjToPage(..) - anchored object of unexcepted type -> object not appended" );
+ OSL_FAIL( "SwPageFrm::AppendDrawObjToPage(..) - anchored object of unexcepted type -> object not appended" );
return;
}
@@ -921,8 +920,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
{
if ( !_rToRemoveObj.ISA(SwAnchoredDrawObject) )
{
- OSL_ENSURE( false,
- "SwPageFrm::RemoveDrawObjFromPage(..) - anchored object of unexcepted type -> object not removed" );
+ OSL_FAIL( "SwPageFrm::RemoveDrawObjFromPage(..) - anchored object of unexcepted type -> object not removed" );
return;
}
@@ -1046,8 +1044,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
const SwFrm* pVertPosOrientFrm = pFly->GetVertPosOrientFrm();
if ( !pVertPosOrientFrm )
{
- OSL_ENSURE( false,
- "::CalcClipRect(..) - frame, vertical position is oriented at, is missing .");
+ OSL_FAIL( "::CalcClipRect(..) - frame, vertical position is oriented at, is missing .");
pVertPosOrientFrm = pFly->GetAnchorFrm();
}
@@ -1264,7 +1261,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
const SwFrm* pAnchorFrm = pC->GetAnchorFrm( pSdrObj );
if( !pAnchorFrm )
{
- OSL_ENSURE( false, "<::CalcClipRect(..)> - missing anchor frame." );
+ OSL_FAIL( "<::CalcClipRect(..)> - missing anchor frame." );
((SwDrawContact*)pC)->ConnectToLayout();
pAnchorFrm = pC->GetAnchorFrm();
}
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index bf6280e..57241d5 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -396,8 +396,7 @@ SwFrmNotify::~SwFrmNotify()
}
else
{
- OSL_ENSURE( false,
- "<SwCntntNotify::~SwCntntNotify()> - unknown anchored object type. Please inform OD." );
+ OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - unknown anchored object type. Please inform OD." );
}
}
}
@@ -1023,7 +1022,7 @@ SwCntntNotify::~SwCntntNotify()
{
if (FLY_AT_PAGE == rAnch.GetAnchorId())
{
- OSL_ENSURE( false, "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." );
+ OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." );
SwFmtAnchor aAnch( rAnch );
aAnch.SetAnchor( 0 );
aAnch.SetPageNum( pPage->GetPhyPageNum() );
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index c4989b8..5457bbb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -693,7 +693,7 @@ void SwLayAction::InternalAction()
if ( ++nLoopControlRuns_1 > nLoopControlMax )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl_1 in SwLayAction::InternalAction" );
+ OSL_FAIL( "LoopControl_1 in SwLayAction::InternalAction" );
#endif
break;
@@ -888,7 +888,7 @@ void SwLayAction::InternalAction()
if ( ++nLoopControlRuns_3 > nLoopControlMax )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl_3 in Interrupt formatting in SwLayAction::InternalAction" );
+ OSL_FAIL( "LoopControl_3 in Interrupt formatting in SwLayAction::InternalAction" );
#endif
break;
}
@@ -913,7 +913,7 @@ void SwLayAction::InternalAction()
if ( ++nLoopControlRuns_2 > nLoopControlMax )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl_2 in Interrupt formatting in SwLayAction::InternalAction" );
+ OSL_FAIL( "LoopControl_2 in Interrupt formatting in SwLayAction::InternalAction" );
#endif
break;
}
@@ -2232,7 +2232,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
!SwSmartTagMgr::Get().IsSmartTagsEnabled() )
return FALSE;
break;
- default: OSL_ENSURE( false, "Unknown idle job type" );
+ default: OSL_FAIL( "Unknown idle job type" );
}
SwPageFrm *pPage;
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 9f5f860..e34f9e3 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -286,7 +286,7 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
if ( pLooping && pLooping->IsLoopingLouieLight() )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "Looping Louie (Light): Fixating fractious frame" );
+ OSL_FAIL( "Looping Louie (Light): Fixating fractious frame" );
#endif
SwLayouter::InsertMovedFwdFrm( rDoc, rFrm, rFrm.FindPageFrm()->GetPhyPageNum() );
}
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 47b0d19..5b005b2 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -191,8 +191,7 @@ SwObjectFormatter* SwObjectFormatter::CreateObjFormatter(
}
else
{
- OSL_ENSURE( false,
- "<SwObjectFormatter::CreateObjFormatter(..)> - unexcepted type of anchor frame" );
+ OSL_FAIL( "<SwObjectFormatter::CreateObjFormatter(..)> - unexcepted type of anchor frame" );
}
return pObjFormatter;
@@ -409,7 +408,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
if ( ++nLoopControlRuns >= nLoopControlMax )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl in SwObjectFormatter::_FormatObj: Stage 3!!!" );
+ OSL_FAIL( "LoopControl in SwObjectFormatter::_FormatObj: Stage 3!!!" );
#endif
rFlyFrm.ValidateThisAndAllLowers( 2 );
nLoopControlRuns = 0;
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx
index f147fb2..77643a7 100644
--- a/sw/source/core/layout/objectformatterlayfrm.cxx
+++ b/sw/source/core/layout/objectformatterlayfrm.cxx
@@ -61,8 +61,7 @@ SwObjectFormatterLayFrm* SwObjectFormatterLayFrm::CreateObjFormatter(
if ( !_rAnchorLayFrm.IsPageFrm() &&
!_rAnchorLayFrm.IsFlyFrm() )
{
- OSL_ENSURE( false,
- "<SwObjectFormatterLayFrm::CreateObjFormatter(..)> - unexcepted type of anchor frame " );
+ OSL_FAIL( "<SwObjectFormatterLayFrm::CreateObjFormatter(..)> - unexcepted type of anchor frame " );
return 0L;
}
@@ -130,8 +129,7 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()
{
if ( !GetAnchorFrm().IsPageFrm() )
{
- OSL_ENSURE( false,
- "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" );
+ OSL_FAIL( "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" );
return true;
}
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index c1c5247..cbe49c9 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -232,8 +232,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
}
else
{
- OSL_ENSURE( false,
- "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
+ OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
}
}
}
@@ -289,8 +288,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
}
else
{
- OSL_ENSURE( false,
- "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
+ OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
}
}
}
@@ -327,8 +325,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
else
{
// the anchor text frame has to be valid, thus assert.
- OSL_ENSURE( false,
- "<SwObjectFormatterTxtFrm::DoFormatObjs()> called for invalidate anchor text frame." );
+ OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs()> called for invalidate anchor text frame." );
}
return false;
@@ -422,8 +419,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
}
else
{
- OSL_ENSURE( false,
- "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
+ OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
}
}
}
@@ -464,8 +460,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
}
else
{
- OSL_ENSURE( false,
- "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
+ OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
}
}
// #i40155# - mark anchor frame not to wrap around
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d409fb9..001cdd1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3412,7 +3412,7 @@ BOOL SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh )
// OD 02.07.2003 #108784# - debug assert
if ( !pObj->ISA(SdrObjGroup) )
{
- OSL_ENSURE( false, "<SwFlyFrm::IsPaint(..)> - paint of drawing object without anchor frame!?" );
+ OSL_FAIL( "<SwFlyFrm::IsPaint(..)> - paint of drawing object without anchor frame!?" );
}
}
}
diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx
index 25b1968..fee4d3a 100644
--- a/sw/source/core/layout/sortedobjsimpl.cxx
+++ b/sw/source/core/layout/sortedobjsimpl.cxx
@@ -67,7 +67,7 @@ SwAnchoredObject* SwSortedObjsImpl::operator[]( sal_uInt32 _nIndex )
if ( _nIndex >= Count() )
{
- OSL_ENSURE( false, "<SwSortedObjsImpl::operator[]> - index out of range" );
+ OSL_FAIL( "<SwSortedObjsImpl::operator[]> - index out of range" );
}
else
{
@@ -220,8 +220,7 @@ bool SwSortedObjsImpl::Insert( SwAnchoredObject& _rAnchoredObj )
{
// list already contains object
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false,
- "<SwSortedObjsImpl::Insert()> - already contains object" );
+ OSL_FAIL( "<SwSortedObjsImpl::Insert()> - already contains object" );
#endif
return true;
}
@@ -250,8 +249,7 @@ bool SwSortedObjsImpl::Remove( SwAnchoredObject& _rAnchoredObj )
// object not found.
bRet = false;
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false,
- "<SwSortedObjsImpl::Remove()> - object not found" );
+ OSL_FAIL( "<SwSortedObjsImpl::Remove()> - object not found" );
#endif
}
else
@@ -275,8 +273,7 @@ bool SwSortedObjsImpl::Update( SwAnchoredObject& _rAnchoredObj )
if ( !Contains( _rAnchoredObj ) )
{
// given anchored object not found in list
- OSL_ENSURE( false,
- "<SwSortedObjsImpl::Update(..) - sorted list doesn't contain given anchored object" );
+ OSL_FAIL( "<SwSortedObjsImpl::Update(..) - sorted list doesn't contain given anchored object" );
return false;
}
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 724fbe7..354f928 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1576,7 +1576,7 @@ bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeav
}
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "LoopControl in lcl_CalcLowers" );
+ OSL_FAIL( "LoopControl in lcl_CalcLowers" );
#endif
}
}
@@ -2665,7 +2665,7 @@ void SwTabFrm::MakeAll()
#if OSL_DEBUG_LEVEL > 1
else
{
- OSL_ENSURE( false, "debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910" );
+ OSL_FAIL( "debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910" );
}
#endif
// <--
@@ -4997,8 +4997,7 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva )
}
else
{
- OSL_ENSURE( false,
- "<lcl_ArrangeLowers(..)> - unknown type of anchored object!" );
+ OSL_FAIL( "<lcl_ArrangeLowers(..)> - unknown type of anchored object!" );
}
}
}
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index e4c93b3..ed2d301 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -54,7 +54,7 @@ sal_Bool SwCntntFrm::WouldFit( SwTwips &, sal_Bool&, sal_Bool )
bool SwFrm::FillSelection( SwSelectionList& , const SwRect& ) const
{
- OSL_ENSURE( false, "Don't call this function at the base class!" );
+ OSL_FAIL( "Don't call this function at the base class!" );
return false;
}
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 8abd3a4..0bdcdaa 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -300,8 +300,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
}
else
{
- OSL_ENSURE( false,
- "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
+ OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
break;
@@ -315,16 +314,14 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
}
else
{
- OSL_ENSURE( false,
- "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
+ OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
break;
// no break here, because text::RelOrientation::CHAR is invalid, if !mbAnchorToChar
default:
{
- OSL_ENSURE( false,
- "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
+ OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
@@ -381,8 +378,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos(
break;
default:
{
- OSL_ENSURE( false,
- "<SwAnchoredObjectPosition::_GetVertRelPos(..) - invalid vertical positioning" );
+ OSL_FAIL( "<SwAnchoredObjectPosition::_GetVertRelPos(..) - invalid vertical positioning" );
}
}
@@ -869,8 +865,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
if ( !GetAnchorFrm().ISA(SwTxtFrm) ||
!GetAnchoredObj().ISA(SwFlyAtCntFrm) )
{
- OSL_ENSURE( false,
- "<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" );
+ OSL_FAIL( "<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" );
return _nProposedRelPosX;
}
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index d9c67d4..3b5f1b5 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -305,8 +305,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
}
else
{
- OSL_ENSURE( false,
- "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+ OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
}
}
break;
@@ -325,8 +324,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
}
else
{
- OSL_ENSURE( false,
- "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+ OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
}
}
break;
@@ -366,8 +364,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
}
else
{
- OSL_ENSURE( false,
- "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+ OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
}
}
break;
@@ -686,7 +683,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
else
{
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( false, "<SwToCntntAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
+ OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
#endif
nRelDiff = nRelPosY;
nRelPosY = 0;
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 3a194ce..32a35fa 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -130,7 +130,7 @@ void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, USHORT n
++nCheck;
if( rLine.GetTabBoxes().Count() < nCheck )
{ // robust
- OSL_ENSURE( false, "Box out of table line" );
+ OSL_FAIL( "Box out of table line" );
nCheck = rLine.GetTabBoxes().Count();
}
@@ -178,7 +178,7 @@ long lcl_Box2LeftBorder( const SwTableBox& rBox )
return nLeft;
nLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
}
- OSL_ENSURE( false, "Box not found in own upper?" );
+ OSL_FAIL( "Box not found in own upper?" );
return nLeft;
}
@@ -215,7 +215,7 @@ SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine )
}
nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
}
- OSL_ENSURE( false, "Didn't found wished box" );
+ OSL_FAIL( "Didn't found wished box" );
return 0;
}
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index d7ba0e2..f93586e 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -395,7 +395,7 @@ void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
}
}
else {
- OSL_ENSURE( false, "Rounding error" );
+ OSL_FAIL( "Rounding error" );
}
nSum += nBox;
}
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index f382337..8cfd8a4 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -365,7 +365,7 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
pSdrObj = GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm );
if ( !pSdrObj )
{
- OSL_ENSURE( false, "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
+ OSL_FAIL( "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
pSdrObj = GetDrawContact()->GetMaster();
}
// --> OD 2007-11-29 #i65798#
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 629454b..cee0fac 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -389,7 +389,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
if( !Frm().Width() && IsValid() && GetUpper()->IsValid() )
//bei Stackueberlauf (StackHack) invalid!
{
-// OSL_ENSURE( false, "SwTxtFrm::IsHiddenNow: thin frame" );
+// OSL_FAIL( "SwTxtFrm::IsHiddenNow: thin frame" );
return sal_True;
}
@@ -601,8 +601,7 @@ void SwTxtFrm::HideAndShowObjects()
}
else
{
- OSL_ENSURE( false,
- "<SwTxtFrm::HideAndShowObjects()> - object not anchored at/inside paragraph!?" );
+ OSL_FAIL( "<SwTxtFrm::HideAndShowObjects()> - object not anchored at/inside paragraph!?" );
}
}
}
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 9966579..b1256ee 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -812,7 +812,7 @@ void MetaField::GetPrefixAndSuffix(
getPrefixAndSuffix(xModel, xMetaField, o_pPrefix, o_pSuffix);
}
} catch (uno::Exception) {
- OSL_ENSURE(false, "exception?");
+ OSL_FAIL("exception?");
}
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e7df488..0d16895 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1840,8 +1840,7 @@ void SwTxtNode::CutText( SwTxtNode * const pDest,
}
else
{
- OSL_ENSURE(false,
- "mst: entering dead and bitrotted code; fasten your seatbelts!");
+ OSL_FAIL("mst: entering dead and bitrotted code; fasten your seatbelts!");
EraseText( rStart, nLen );
}
}
@@ -1852,8 +1851,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
{
if(!pDest)
{
- OSL_ENSURE(false,
- "mst: entering dead and bitrotted code; fasten your seatbelts!");
+ OSL_FAIL("mst: entering dead and bitrotted code; fasten your seatbelts!");
EraseText( rStart, nLen );
return;
}
@@ -1861,8 +1859,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
// nicht im Dokument verschieben ?
if( GetDoc() != pDest->GetDoc() )
{
- OSL_ENSURE(false,
- "mst: entering dead and bitrotted code; fasten your seatbelts!");
+ OSL_FAIL("mst: entering dead and bitrotted code; fasten your seatbelts!");
CopyText( pDest, rDestStart, rStart, nLen);
EraseText(rStart, nLen);
return;
@@ -1883,8 +1880,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
// wird in sich selbst verschoben, muss es gesondert behandelt werden !!
if( pDest == this )
{
- OSL_ENSURE(false,
- "mst: entering dead and bitrotted code; fasten your seatbelts!");
+ OSL_FAIL("mst: entering dead and bitrotted code; fasten your seatbelts!");
m_Text.Insert( m_Text, nTxtStartIdx, nLen, nDestStart );
m_Text.Erase( nTxtStartIdx + (nDestStart<nTxtStartIdx ? nLen : 0), nLen );
@@ -3642,8 +3638,7 @@ void SwTxtNode::SetAttrListLevel( int nLevel )
{
if ( nLevel < 0 || nLevel >= MAXLEVEL )
{
- OSL_ENSURE( false,
- "<SwTxtNode::SetAttrListLevel()> - value of parameter <nLevel> is out of valid range" );
+ OSL_FAIL( "<SwTxtNode::SetAttrListLevel()> - value of parameter <nLevel> is out of valid range" );
return;
}
@@ -3832,8 +3827,7 @@ void SwTxtNode::AddToList()
{
if ( IsInList() )
{
- OSL_ENSURE( false,
- "<SwTxtNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" );
+ OSL_FAIL( "<SwTxtNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" );
return;
}
@@ -4079,8 +4073,7 @@ XubString SwTxtNode::GetLabelFollowedBy() const
break;
default:
{
- OSL_ENSURE( false,
- "<SwTxtNode::GetLabelFollowedBy()> - unknown SvxNumberFormat::GetLabelFollowedBy() return value" );
+ OSL_FAIL( "<SwTxtNode::GetLabelFollowedBy()> - unknown SvxNumberFormat::GetLabelFollowedBy() return value" );
}
}
}
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 07fcb2b..0b7465b 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -251,7 +251,7 @@ MakeTxtAttrNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNesting,
break;
}
default:
- OSL_ENSURE(false, "MakeTxtAttrNesting: what the hell is that?");
+ OSL_FAIL("MakeTxtAttrNesting: what the hell is that?");
break;
}
return static_cast<SwTxtAttrNesting*>(pNew);
@@ -408,7 +408,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
static_cast<SwTxtAttrNesting*>(pOther));
break;
default:
- OSL_ENSURE(false, "bad code monkey");
+ OSL_FAIL("bad code monkey");
break;
}
}
@@ -424,8 +424,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
{
if (rNewHint.HasDummyChar())
{
- OSL_ENSURE(false,
- "ERROR: inserting duplicate CH_TXTATR hint");
+ OSL_FAIL("ERROR: inserting duplicate CH_TXTATR hint");
return false;
} else if (nNewEnd < nOtherEnd) {
// other has dummy char, new is inside other, but
@@ -480,7 +479,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
case POS_OUTSIDE:
case POS_EQUAL:
{
- OSL_ENSURE(false, "existing hint inside new hint: why?");
+ OSL_FAIL("existing hint inside new hint: why?");
}
break;
case POS_OVERLAP_BEFORE:
@@ -492,7 +491,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
{
if ( USHRT_MAX == Count() )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list