diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-03-07 22:19:36 +0530 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-04-05 10:15:45 +0000 |
| commit | 901d04d3965ed73696586de06c6890e79299f266 (patch) | |
| tree | ca85db3688d3a440c56c804f9875ed2040ac8e4d /svx/source/customshapes | |
| parent | d6411207bd83b34b4d6c6fd68cd41d3005228b05 (diff) | |
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 with OSL_DEBUG_LEVEL > 0 in order
to reduce debug levels. In some places i also used SAL_INFO(..)
and SAL_WARN(..) statements to replace their deprecated OSL_
counterparts
Change-Id: I73ecc20ffd654501b16820e3bf748f1bcbcdab79
Reviewed-on: https://gerrit.libreoffice.org/23004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 13 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 3c5f60400f3c..aa3c594095d6 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -850,13 +850,13 @@ double EnhancedCustomShape2d::GetAdjustValueAsDouble( const sal_Int32 nIndex ) c double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) const { double fNumber = 0.0; -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 static sal_uInt32 nLevel = 0; #endif if ( nIndex < (sal_Int32)vNodesSharedPtr.size() ) { if ( vNodesSharedPtr[ nIndex ].get() ) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 nLevel ++; #endif try @@ -873,10 +873,9 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) if ( !rtl::math::isFinite( fNumber ) ) fNumber = 0.0; -#if OSL_DEBUG_LEVEL > 1 - OSL_TRACE("equation %d (level: %d): %s --> %f (angle: %f)", nIndex, - nLevel, OUStringToOString( seqEquations[ nIndex ], - RTL_TEXTENCODING_ASCII_US ).getStr(), fNumber, 180.0*fNumber/10800000.0); +#if OSL_DEBUG_LEVEL > 0 + SAL_INFO("svx", "equation " << nLevel << " (level: " << seqEquations[nIndex] << "): " + << fNumber << " --> " << 180.0*fNumber/10800000.0); #endif } } @@ -884,7 +883,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) { OSL_TRACE("error: EnhancedCustomShape2d::GetEquationValueAsDouble failed"); } -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 nLevel --; #endif } diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 9a2f31b42349..63c2ccd8ee97 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -248,7 +248,7 @@ public: } virtual double operator()() const override { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 const char *funcName; switch (meFunct) { @@ -268,7 +268,8 @@ public: default: funcName = "???"; break; } - OSL_TRACE(" %s --> %f (angle: %f)", funcName, getValue( mrCustoShape, meFunct ), 180.0*getValue( mrCustoShape, meFunct )/10800000.0); + SAL_INFO("svx", funcName << " --> " << getValue(mrCustoShape, meFunct) << "(angle: " << + 180.0*getValue(mrCustoShape, meFunct)/10800000.0 << ")"); #endif return getValue( mrCustoShape, meFunct ); |