mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to have SAL_INFOs inside OSL_DEBUG_LEVEL checks

Browse Source 
Also, use the operator<< functionality added in
3f5392c196.

Change-Id: I4ae24d2c45e818d9a1b04f2d8e5660c39c71bcdd
This commit is contained in:
Tor Lillqvist
2017-02-14 20:27:32 +02:00
parent 1d171331cd
commit f6afad4c7b
2 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svx/source/customshapes/EnhancedCustomShape2d.cxx
View File

@@ -854,15 +854,11 @@ double EnhancedCustomShape2d::GetAdjustValueAsDouble( const sal_Int32 nIndex ) c
double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) const double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) const
{ {
double fNumber = 0.0; double fNumber = 0.0;
#if OSL_DEBUG_LEVEL > 0
static sal_uInt32 nLevel = 0; static sal_uInt32 nLevel = 0;
#endif
if ( nIndex < (sal_Int32)vNodesSharedPtr.size() ) if ( nIndex < (sal_Int32)vNodesSharedPtr.size() )
{ {
if ( vNodesSharedPtr[ nIndex ].get() ) { if ( vNodesSharedPtr[ nIndex ].get() ) {
#if OSL_DEBUG_LEVEL > 0
nLevel ++; nLevel ++;
#endif
try try
{ {
if ( vEquationResults[ nIndex ].bReady ) if ( vEquationResults[ nIndex ].bReady )
@@ -877,19 +873,15 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex )
if ( !rtl::math::isFinite( fNumber ) ) if ( !rtl::math::isFinite( fNumber ) )
fNumber = 0.0; fNumber = 0.0;
#if OSL_DEBUG_LEVEL > 0
SAL_INFO("svx", "equation " << nLevel << " (level: " << seqEquations[nIndex] << "): " SAL_INFO("svx", "equation " << nLevel << " (level: " << seqEquations[nIndex] << "): "
<< fNumber << " --> " << 180.0*fNumber/10800000.0); << fNumber << " --> " << 180.0*fNumber/10800000.0);
#endif
} }
} }
catch ( ... ) catch ( ... )
{ {
SAL_WARN("svx", "EnhancedCustomShape2d::GetEquationValueAsDouble failed"); SAL_WARN("svx", "EnhancedCustomShape2d::GetEquationValueAsDouble failed");
} }
#if OSL_DEBUG_LEVEL > 0
nLevel --; nLevel --;
#endif
} }
SAL_INFO( SAL_INFO(
"svx", "svx",

32
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
View File

@@ -29,14 +29,10 @@
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
#include <typeinfo>
#define BOOST_SPIRIT_DEBUG #define BOOST_SPIRIT_DEBUG
#endif #endif
#include <boost/spirit/include/classic_core.hpp> #include <boost/spirit/include/classic_core.hpp>
#if (OSL_DEBUG_LEVEL > 0)
#include <iostream>
#endif
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <stack> #include <stack>
@@ -224,29 +220,8 @@ public:
} }
virtual double operator()() const override virtual double operator()() const override
{ {
#if OSL_DEBUG_LEVEL > 0 SAL_INFO("svx", meFunct << " --> " << mrCustoShape.GetEnumFunc(meFunct) << "(angle: " <<
const char *funcName;
switch (meFunct) {
case ExpressionFunct::EnumPi : funcName = "pi"; break;
case ExpressionFunct::EnumLeft : funcName = "left"; break;
case ExpressionFunct::EnumTop : funcName = "top"; break;
case ExpressionFunct::EnumRight : funcName = "right"; break;
case ExpressionFunct::EnumBottom : funcName = "bottom"; break;
case ExpressionFunct::EnumXStretch : funcName = "xstretch"; break;
case ExpressionFunct::EnumYStretch : funcName = "ystretch"; break;
case ExpressionFunct::EnumHasStroke : funcName = "hasstroke"; break;
case ExpressionFunct::EnumHasFill : funcName = "hasfill"; break;
case ExpressionFunct::EnumWidth : funcName = "width"; break;
case ExpressionFunct::EnumHeight : funcName = "height"; break;
case ExpressionFunct::EnumLogWidth : funcName = "logwidth"; break;
case ExpressionFunct::EnumLogHeight : funcName = "logheight"; break;
default: funcName = "???"; break;
}
SAL_INFO("svx", funcName << " --> " << mrCustoShape.GetEnumFunc(meFunct) << "(angle: " <<
180.0 * mrCustoShape.GetEnumFunc(meFunct) / 10800000.0 << ")"); 180.0 * mrCustoShape.GetEnumFunc(meFunct) / 10800000.0 << ")");
#endif
return mrCustoShape.GetEnumFunc( meFunct ); return mrCustoShape.GetEnumFunc( meFunct );
} }
@@ -1160,10 +1135,6 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& r
aExpressionGrammer >> ::boost::spirit::end_p, aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) ); ::boost::spirit::space_p ) );
#if (OSL_DEBUG_LEVEL > 0)
::std::cout.flush(); // needed to keep stdout and cout in sync
#endif
// input fully congested by the parser? // input fully congested by the parser?
if( !aParseInfo.full ) if( !aParseInfo.full )
throw ParseError( "EnhancedCustomShapeFunctionParser::parseFunction(): string not fully parseable" ); throw ParseError( "EnhancedCustomShapeFunctionParser::parseFunction(): string not fully parseable" );
@@ -1177,7 +1148,6 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& r
return pContext->maOperandStack.top(); return pContext->maOperandStack.top();
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */