Replace DBG_* with OSL_* in calc/chart2

7 files changed, 7 insertions, 18 deletions

diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index ded69433b509..6f6076ac3bf7 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -32,7 +32,6 @@
 #include "Tickmarks_Dates.hxx"
 #include "ViewDefines.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <memory>
 
 //.............................................................................
@@ -115,7 +114,7 @@ TickFactory::TickFactory(
     if( m_rScale.Scaling.is() )
     {
         m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     m_fScaledVisibleMin = m_rScale.Minimum;
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index fa466b755824..de5e43a24b05 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -30,7 +30,6 @@
 #include "Tickmarks_Dates.hxx"
 #include "DateScaling.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include "DateHelper.hxx"
 
 //.............................................................................
@@ -56,7 +55,7 @@ DateTickFactory::DateTickFactory(
     if( m_aScale.Scaling.is() )
     {
         m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     m_fScaledVisibleMin = m_aScale.Minimum;
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index aa5376161853..086011eece4f 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -30,7 +30,6 @@
 #include "Tickmarks_Equidistant.hxx"
 #include "ViewDefines.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 
 #include <limits>
 #include <memory>
@@ -97,7 +96,7 @@ EquidistantTickFactory::EquidistantTickFactory(
     if( m_rScale.Scaling.is() )
     {
         m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     double fMin = m_fScaledVisibleMin = m_rScale.Minimum;
@@ -264,7 +263,7 @@ double* EquidistantTickFactory::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth
 {
     //check validity of arguments
     {
-        //DBG_ASSERT( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
+        //OSL_ENSURE( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
         if(fStartParentTick >= fNextParentTick)
             return NULL;
         if(nDepth>static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) || nDepth<=0)
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 62d2a9353d7c..0012b8c863e5 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -35,9 +35,6 @@
 #include "Tickmarks.hxx"
 #include "macros.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 #include <memory>
 
 //.............................................................................
@@ -145,7 +142,7 @@ sal_Bool VAxisBase::isAnythingToDraw()
     if( !m_aAxisProperties.m_xAxisModel.is() )
         return false;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return false;
 
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx
index 489af51f7c0e..287ea2553144 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -34,9 +34,6 @@
 #include "CommonConverters.hxx"
 #include "Tickmarks.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index dc273328e45a..ba8a9b6443f3 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -49,8 +49,6 @@
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 
 //.............................................................................
@@ -113,7 +111,7 @@ void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes
        , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
             throw (uno::RuntimeException)
 {
-    DBG_ASSERT(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
+    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
 
     sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index b2801e31cd6d..1d9a3cbb712e 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -241,7 +241,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
 
 void VPolarGrid::createShapes()
 {
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
+    OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
     if(!m_aGridPropertiesList.getLength())