summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/charthelper.cxx2
-rw-r--r--svx/source/svdraw/svditer.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx4
-rw-r--r--svx/source/svdraw/svdpage.cxx34
5 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index afef03cde2d0..255c0c03832b 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -50,7 +50,7 @@ bool ChartHelper::isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram
//iterate through all chart types in the current coordinate system
uno::Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCooSys, uno::UNO_QUERY);
- assert( xChartTypeContainer.is());
+ OSL_ASSERT( xChartTypeContainer.is());
if( !xChartTypeContainer.is() )
continue;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 100b1204792e..a8e56773ff8c 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -65,7 +65,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
{
SdrObject* pObj = bUseZOrder ?
rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx );
- assert( pObj != nullptr );
+ OSL_ASSERT( pObj != nullptr );
if( pObj )
ImpProcessObj( pObj, eMode, bUseZOrder );
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 9b87685a8883..478b0cbb65b7 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1394,7 +1394,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev)
if (nMarkCount!=0) {
nChgMarkNum=bPrev ? 0 : nMarkCount-1;
SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
- assert(pM!=nullptr);
+ OSL_ASSERT(pM!=nullptr);
if (pM->GetMarkedSdrObj() != nullptr)
nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition();
}
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 60d718e3b27f..b331d5d848d7 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1585,7 +1585,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
GetObjRef();
if (mpImpl->mxObjRef.is())
{
- assert( pModel );
+ OSL_ASSERT( pModel );
sal_Int64 nMiscStatus = mpImpl->mxObjRef->getStatus( GetAspect() );
// the client is required to get access to scaling
@@ -1650,7 +1650,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
// make the new object area known to the client
// compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied
- // WHY this -> assert( pClient );
+ // WHY this -> OSL_ASSERT( pClient );
if( pClient )
pClient->SetObjArea(maRect);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 0fdc54dffdba..83281d013a74 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -395,7 +395,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- assert(nObjNum<maList.size());
+ OSL_ASSERT(nObjNum<maList.size());
return nullptr;
}
@@ -426,7 +426,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- assert(nObjNum<maList.size());
+ OSL_ASSERT(nObjNum<maList.size());
return nullptr;
}
@@ -473,8 +473,8 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if (nObjNum >= maList.size() || pNewObj == nullptr)
{
- assert(nObjNum<maList.size());
- assert(pNewObj!=nullptr);
+ OSL_ASSERT(nObjNum<maList.size());
+ OSL_ASSERT(pNewObj!=nullptr);
return nullptr;
}
@@ -508,12 +508,12 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- assert(nObjNum<maList.size());
+ OSL_ASSERT(nObjNum<maList.size());
return nullptr;
}
if (pNewObj == nullptr)
{
- assert(pNewObj!=nullptr);
+ OSL_ASSERT(pNewObj!=nullptr);
return nullptr;
}
@@ -562,8 +562,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
{
if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
{
- assert(nOldObjNum<maList.size());
- assert(nNewObjNum<maList.size());
+ OSL_ASSERT(nOldObjNum<maList.size());
+ OSL_ASSERT(nNewObjNum<maList.size());
return nullptr;
}
@@ -675,7 +675,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const
{
if (nNum >= maList.size())
{
- assert(nNum<maList.size());
+ OSL_ASSERT(nNum<maList.size());
return nullptr;
}
else
@@ -768,8 +768,8 @@ void SdrObjList::SetObjectNavigationPosition (
maList.end(),
mxNavigationOrder->begin());
}
- assert(mxNavigationOrder.get()!=nullptr);
- assert( mxNavigationOrder->size() == maList.size());
+ OSL_ASSERT(mxNavigationOrder.get()!=nullptr);
+ OSL_ASSERT( mxNavigationOrder->size() == maList.size());
SdrObjectWeakRef aReference (&rObject);
@@ -815,7 +815,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// index is correct and look up the object in mxNavigationOrder.
if (nNavigationPosition >= mxNavigationOrder->size())
{
- assert(nNavigationPosition < mxNavigationOrder->size());
+ OSL_ASSERT(nNavigationPosition < mxNavigationOrder->size());
}
else
return (*mxNavigationOrder)[nNavigationPosition].get();
@@ -826,7 +826,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// instead.
if (nNavigationPosition >= maList.size())
{
- assert(nNavigationPosition < maList.size());
+ OSL_ASSERT(nNavigationPosition < maList.size());
}
else
return maList[nNavigationPosition];
@@ -893,7 +893,7 @@ void SdrObjList::InsertObjectIntoContainer (
SdrObject& rObject,
const sal_uInt32 nInsertPosition)
{
- assert(nInsertPosition<=maList.size());
+ OSL_ASSERT(nInsertPosition<=maList.size());
// Update the navigation positions.
if (HasObjectNavigationOrder())
@@ -921,7 +921,7 @@ void SdrObjList::ReplaceObjectInContainer (
{
if (nObjectPosition >= maList.size())
{
- assert(nObjectPosition<maList.size());
+ OSL_ASSERT(nObjectPosition<maList.size());
return;
}
@@ -931,7 +931,7 @@ void SdrObjList::ReplaceObjectInContainer (
// A user defined position of the object that is to be replaced is
// not transferred to the new object so erase the former and append
// the later object from/to the navigation order.
- assert(nObjectPosition < maList.size());
+ OSL_ASSERT(nObjectPosition < maList.size());
SdrObjectWeakRef aReference (maList[nObjectPosition]);
WeakSdrObjectContainerType::iterator iObject (::std::find(
mxNavigationOrder->begin(),
@@ -955,7 +955,7 @@ void SdrObjList::RemoveObjectFromContainer (
{
if (nObjectPosition >= maList.size())
{
- assert(nObjectPosition<maList.size());
+ OSL_ASSERT(nObjectPosition<maList.size());
return;
}
generated by cgit (git 2.34.1) at 2024-07-31 15:54:54 +0000