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

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

Browse Source 
I disentangled my previous patch to make one patch per module. I also
modified the patch according to new directions given by Sweet5hark

Change-Id: Id690f7c1e87230e4d10e1c9fe472f35d1d1caa8b
Reviewed-on: https://gerrit.libreoffice.org/22924
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Rohan Kumar 2016-04-08 11:42:42 +05:30 committed by Björn Michaelsen
parent 941e891d16
commit aba0c20fb0
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oox/inc/drawingml/textliststyle.hxx
View File

@ -45,7 +45,7 @@ public:
const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; };
TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; };
#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 #ifdef DBG_UTIL
void dump() const; void dump() const;
#endif #endif

18
oox/source/drawingml/diagram/diagram.cxx
View File

@ -91,7 +91,7 @@ void Diagram::setLayout( const DiagramLayoutPtr & pLayout)
mpLayout = pLayout; mpLayout = pLayout;
} }
#if OSL_DEBUG_LEVEL > 1 #ifdef DEBUG_OOX_DIAGRAM
OString normalizeDotName( const OUString& rStr ) OString normalizeDotName( const OUString& rStr )
{ {
OUStringBuffer aBuf; OUStringBuffer aBuf;
@ -139,19 +139,17 @@ static sal_Int32 calcDepth( const OUString& rNodeName,
void Diagram::build( ) void Diagram::build( )
{ {
// build name-object maps // build name-object maps
#ifdef DEBUG_OOX_DIAGRAM
#if OSL_DEBUG_LEVEL > 1
std::ofstream output("/tmp/tree.dot"); std::ofstream output("/tmp/tree.dot");
output << "digraph datatree {" << std::endl; output << "digraph datatree {" << std::endl;
#endif #endif
dgm::Points& rPoints = getData()->getPoints(); dgm::Points& rPoints = getData()->getPoints();
dgm::Points::iterator aCurrPoint(rPoints.begin()); dgm::Points::iterator aCurrPoint(rPoints.begin());
dgm::Points::iterator aEndPoint(rPoints.end()); dgm::Points::iterator aEndPoint(rPoints.end());
while( aCurrPoint != aEndPoint ) while( aCurrPoint != aEndPoint )
{ {
#if OSL_DEBUG_LEVEL > 1 #ifdef DEBUG_OOX_DIAGRAM
output << "\t" output << "\t"
<< normalizeDotName(aCurrPoint->msModelId).getStr() << normalizeDotName(aCurrPoint->msModelId).getStr()
<< "["; << "[";
@ -179,6 +177,7 @@ void Diagram::build( )
} }
output << "];" << std::endl; output << "];" << std::endl;
#endif
// does currpoint have any text set? // does currpoint have any text set?
if( aCurrPoint->mpShape && if( aCurrPoint->mpShape &&
@ -186,8 +185,8 @@ void Diagram::build( )
!aCurrPoint->mpShape->getTextBody()->getParagraphs().empty() && !aCurrPoint->mpShape->getTextBody()->getParagraphs().empty() &&
!aCurrPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().empty() ) !aCurrPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().empty() )
{ {
#ifdef DEBUG_OOX_DIAGRAM
static sal_Int32 nCount=0; static sal_Int32 nCount=0;
output << "\t" output << "\t"
<< "textNode" << nCount << "textNode" << nCount
<< " [" << " ["
@ -201,8 +200,8 @@ void Diagram::build( )
<< " -> " << " -> "
<< "textNode" << nCount++ << "textNode" << nCount++
<< ";" << std::endl; << ";" << std::endl;
}
#endif #endif
}
const bool bInserted1=getData()->getPointNameMap().insert( const bool bInserted1=getData()->getPointNameMap().insert(
std::make_pair(aCurrPoint->msModelId,&(*aCurrPoint))).second; std::make_pair(aCurrPoint->msModelId,&(*aCurrPoint))).second;
@ -224,7 +223,7 @@ void Diagram::build( )
const dgm::Connections::const_iterator aEndCxn(rConnections.end()); const dgm::Connections::const_iterator aEndCxn(rConnections.end());
while( aCurrCxn != aEndCxn ) while( aCurrCxn != aEndCxn )
{ {
#if OSL_DEBUG_LEVEL > 1 #ifdef DEBUG_OOX_DIAGRAM
if( !aCurrCxn->msParTransId.isEmpty() || if( !aCurrCxn->msParTransId.isEmpty() ||
!aCurrCxn->msSibTransId.isEmpty() ) !aCurrCxn->msSibTransId.isEmpty() )
{ {
@ -308,8 +307,7 @@ void Diagram::build( )
++aPresOfIter; ++aPresOfIter;
} }
#ifdef DEBUG_OOX_DIAGRAM
#if OSL_DEBUG_LEVEL > 1
output << "}" << std::endl; output << "}" << std::endl;
#endif #endif
} }

4
oox/source/drawingml/textliststyle.cxx
View File

@ -86,12 +86,12 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle )
applyStyleList( rTextListStyle.getListStyle(), getListStyle() ); applyStyleList( rTextListStyle.getListStyle(), getListStyle() );
} }
#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 #ifdef DBG_UTIL
void TextListStyle::dump() const void TextListStyle::dump() const
{ {
for ( int i = 0; i < 9; i++ ) for ( int i = 0; i < 9; i++ )
{ {
OSL_TRACE("text list style level: %d", i); SAL_INFO("oox.drawingml", "text list style level: " << i);
maListStyle[i]->dump(); maListStyle[i]->dump();
} }
} }