diff options
Diffstat (limited to 'chart2/source/view/diagram/VDiagram.cxx')
| -rw-r--r-- | chart2/source/view/diagram/VDiagram.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index c008ea2d5837..23109b11b3fb 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -41,7 +41,6 @@ #include "ThreeDHelper.hxx" #include <editeng/unoprnms.hxx> #include <tools/color.hxx> -#include <tools/debug.hxx> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> @@ -110,7 +109,7 @@ void VDiagram::init( , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { - DBG_ASSERT(xLogicTarget.is()&&xFinalTarget.is()&&xFactory.is(),"no proper initialization parameters"); + OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xFactory.is(),"no proper initialization parameters"); m_xLogicTarget = xLogicTarget; m_xFinalTarget = xFinalTarget; @@ -171,7 +170,7 @@ void VDiagram::createShapes( const awt::Point& rPos, const awt::Size& rSize ) void VDiagram::createShapes_2d() { - DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized"); + OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized"); if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is())) return; @@ -202,7 +201,7 @@ void VDiagram::createShapes_2d() { try { - DBG_ASSERT( m_xDiagram.is(), "Invalid Diagram model" ); + OSL_ENSURE( m_xDiagram.is(), "Invalid Diagram model" ); if( m_xDiagram.is() ) { uno::Reference< beans::XPropertySet > xWallProp( m_xDiagram->getWall()); @@ -314,7 +313,7 @@ namespace void lcl_ensureScaleValue( double& rfScale ) { - DBG_ASSERT(rfScale>0, "calculation error for automatic 3D height in chart"); + OSL_ENSURE(rfScale>0, "calculation error for automatic 3D height in chart"); if( rfScale<0 ) rfScale = 1.0; else if( rfScale<0.2 ) @@ -327,7 +326,7 @@ void lcl_ensureScaleValue( double& rfScale ) void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) { - DBG_ASSERT(m_xAspectRatio3D.is(), "created shape offers no XPropertySet"); + OSL_PRECOND(m_xAspectRatio3D.is(), "created shape offers no XPropertySet"); if( m_xAspectRatio3D.is()) { try @@ -386,7 +385,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) else { //todo - DBG_ASSERT(false, "not implemented yet"); + OSL_FAIL("not implemented yet"); if( fScaleX<0 ) fScaleX = 1.0; @@ -430,7 +429,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) else { //todo - DBG_ASSERT(false, "not implemented yet"); + OSL_FAIL("not implemented yet"); if( fScaleX<0 ) fScaleX = 1.0; @@ -494,7 +493,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) void VDiagram::createShapes_3d() { - DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized"); + OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized"); if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is())) return; @@ -681,7 +680,7 @@ void VDiagram::createShapes_3d() m_xCoordinateRegionShape = uno::Reference< drawing::XShape >( xShapes, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xShapeProp( m_xCoordinateRegionShape, uno::UNO_QUERY ); - DBG_ASSERT(xShapeProp.is(), "created shape offers no XPropertySet"); + OSL_ENSURE(xShapeProp.is(), "created shape offers no XPropertySet"); if( xShapeProp.is()) { try |