diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 17:04:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 17:22:09 +0100 |
| commit | 78bea877ff9471d7308041e65e0d6864a862c91b (patch) | |
| tree | f4edfd125043242992c12ffc14e5214c0469affd /editeng | |
| parent | b733d208b02facaaad8c4925277b34b9f7fd928f (diff) | |
OSL_ENSURE->assert where guaranteed deref follows
Change-Id: I6e007cc3a9fd222c1c1381c8b4f890966c05cbab
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit5.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index fe9cf60359e5..a884eb2fbd39 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -700,24 +700,22 @@ void ImpEditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) const SfxItemSet& ImpEditEngine::GetParaAttribs( sal_Int32 nPara ) const { const ContentNode* pNode = aEditDoc.GetObject( nPara ); - DBG_ASSERT( pNode, "Node not found: GetParaAttribs" ); + assert(pNode && "Node not found: GetParaAttribs"); return pNode->GetContentAttribs().GetItems(); } bool ImpEditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const { const ContentNode* pNode = aEditDoc.GetObject( nPara ); - DBG_ASSERT( pNode, "Node not found: HasParaAttrib" ); - + assert(pNode && "Node not found: HasParaAttrib"); return pNode->GetContentAttribs().HasItem( nWhich ); } const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const { - const ContentNode* pNode = aEditDoc.GetObject( nPara ); - DBG_ASSERT( pNode, "Node not found: GetParaAttrib" ); - - return pNode->GetContentAttribs().GetItem( nWhich ); + const ContentNode* pNode = aEditDoc.GetObject(nPara); + assert(pNode && "Node not found: GetParaAttrib"); + return pNode->GetContentAttribs().GetItem(nWhich); } void ImpEditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const |