svx/source/unodraw/unopage.cxx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b7a159ae76dbccc3312b7d1fd4e8530ef6557322
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 12 09:53:08 2015 +0000
DBG_ASSERT->SAL_WARN
Change-Id: I77646432f38cf65f487ff2f81c333be7a626be39
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 4d75251..619b7ab 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -81,9 +81,9 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
SvxDrawPage::~SvxDrawPage() throw()
{
- DBG_ASSERT( mrBHelper.bDisposed, "SvxDrawPage must be disposed!" );
if( !mrBHelper.bDisposed )
{
+ SAL_WARN("svx", "SvxDrawPage must be disposed!");
acquire();
dispose();
}
@@ -394,8 +394,8 @@ namespace
// only in the given SdrPageView. It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > &
aShapes, SdrPageView* pPageView ) throw ()
{
- DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
+ SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
+ SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
if(pPageView!=NULL && mpView!=NULL)
{
@@ -416,8 +416,8 @@ void SvxDrawPage::_SelectObjectsInView( const Reference<
drawing::XShapes > & aS
// It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > &
xShape, SdrPageView* pPageView ) throw()
{
- DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
+ SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
+ SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
if(pPageView!=NULL && mpView != NULL)
{
@@ -434,8 +434,8 @@ Reference< drawing::XShapeGroup > SAL_CALL
SvxDrawPage::group( const Reference<
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
- DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
+ SAL_WARN_IF(!mpPage , "svx", "SdrPage is NULL!");
+ SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup;
if(mpPage==NULL||mpView==NULL||!xShapes.is())
@@ -472,8 +472,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference<
drawing::XShapeGroup >& aGr
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
- DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
+ SAL_WARN_IF(!mpPage, "svx", "SdrPage is NULL!");
+ SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
if(mpPage==NULL||mpView==NULL||!aGroup.is())
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
