diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-12-07 22:23:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-12-07 22:45:09 +0100 |
| commit | 1b6545d21815e8a033699ed5d6a49c80ea635949 (patch) | |
| tree | c7ff7634fd1cd6d295eb4e010b047c2f21bd1ef0 /sw | |
| parent | 97517ef7d26da69b99dc28a8dc3affb788432b9a (diff) | |
sw: convert OSL_ENSURE to assert in anchoreddrawobject.cxx
Change-Id: I9cce5acd2baca419bb430603b9fff34d6b6b3655
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/anchoreddrawobject.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index acaebcb1b71f..9fe438db4ec3 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -330,7 +330,7 @@ void SwAnchoredDrawObject::MakeObjPos() break; default: { - OSL_FAIL( "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type." ); + assert(!"<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type."); } } @@ -608,14 +608,12 @@ void SwAnchoredDrawObject::InvalidateObjPos() SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat() { - OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(), - "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." ); + assert(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); } const SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat() const { - OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(), - "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." ); + assert(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); } @@ -791,7 +789,7 @@ void SwAnchoredDrawObject::SetPositioningAttr() break; default: { - OSL_FAIL( "<SwAnchoredDrawObject::SetPositioningAttr()> - unsupported layout direction" ); + assert(!"<SwAnchoredDrawObject::SetPositioningAttr()> - unsupported layout direction"); } } } |