summaryrefslogtreecommitdiff
path: root/sw/source/core/objectpositioning/anchoredobjectposition.cxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-11-25 17:08:45 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-11-25 17:12:34 +0100
commitc16ba8a04fd4599e439e7e039705e41691c43acb (patch)
tree66a1c67973a674245548e10ff0746d1e473a7703 /sw/source/core/objectpositioning/anchoredobjectposition.cxx
parente9eaf033646695987e218907a565b555b976c5c8 (diff)
Removed DBG_UTIL from sw
* Fixed the different dbglevel builds * This needed to change all the sw local ASSERT to OSL_ENSURE...
Diffstat (limited to 'sw/source/core/objectpositioning/anchoredobjectposition.cxx')
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 84735025bd1e..f3df1223f718 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -75,7 +75,7 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj )
( !mrDrawObj.ISA(SdrVirtObj) && // 'master' drawing object
!mrDrawObj.ISA(SwFlyDrawObj) ); // - indirectly checked
(void) bObjOfExceptedType;
- ASSERT( bObjOfExceptedType,
+ OSL_ENSURE( bObjOfExceptedType,
"SwAnchoredObjectPosition(..) - object of unexcepted type!" );
#endif
@@ -100,7 +100,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
// determine contact object
{
mpContact = static_cast<SwContact*>(GetUserCall( &mrDrawObj ));
- ASSERT( mpContact,
+ OSL_ENSURE( mpContact,
"SwAnchoredObjectPosition::_GetInfoAboutObj() - missing SwContact-object." );
}
@@ -108,7 +108,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
{
// OD 2004-03-30 #i26791#
mpAnchoredObj = mpContact->GetAnchoredObj( &mrDrawObj );
- ASSERT( mpAnchoredObj,
+ OSL_ENSURE( mpAnchoredObj,
"SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchored object." );
}
@@ -116,7 +116,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
{
// OD 2004-03-23 #i26791#
mpAnchorFrm = mpAnchoredObj->AnchorFrm();
- ASSERT( mpAnchorFrm,
+ OSL_ENSURE( mpAnchorFrm,
"SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchor frame." );
}
@@ -124,7 +124,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
{
// --> OD 2004-07-01 #i28701#
mpFrmFmt = &mpAnchoredObj->GetFrmFmt();
- ASSERT( mpFrmFmt,
+ OSL_ENSURE( mpFrmFmt,
"<SwAnchoredObjectPosition::_GetInfoAboutObj() - missing frame format." );
}
@@ -305,7 +305,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
}
else
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
@@ -320,7 +320,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
}
else
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
@@ -332,7 +332,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
//case text::RelOrientation::FRAME_LEFT: not valid for vertical alignment
//case text::RelOrientation::FRAME_RIGHT: not valid for vertical alignment
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
@@ -390,7 +390,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos(
break;
default:
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_GetVertRelPos(..) - invalid vertical positioning" );
}
}
@@ -924,7 +924,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
if ( !GetAnchorFrm().ISA(SwTxtFrm) ||
!GetAnchoredObj().ISA(SwFlyAtCntFrm) )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" );
return _nProposedRelPosX;
}