diff options
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/drawingml/textliststyle.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/diagram.cxx | 18 | ||||
| -rw-r--r-- | oox/source/drawingml/textliststyle.cxx | 4 |
3 files changed, 11 insertions, 13 deletions
diff --git a/oox/inc/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx index 1f3c6a0254d0..d4cc4556eabd 100644 --- a/oox/inc/drawingml/textliststyle.hxx +++ b/oox/inc/drawingml/textliststyle.hxx @@ -45,7 +45,7 @@ public: const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; -#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void dump() const; #endif diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 04bda5b39423..7749d5ecdabe 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -91,7 +91,7 @@ void Diagram::setLayout( const DiagramLayoutPtr & pLayout) mpLayout = pLayout; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_OOX_DIAGRAM OString normalizeDotName( const OUString& rStr ) { OUStringBuffer aBuf; @@ -139,19 +139,17 @@ static sal_Int32 calcDepth( const OUString& rNodeName, void Diagram::build( ) { // build name-object maps - -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_OOX_DIAGRAM std::ofstream output("/tmp/tree.dot"); output << "digraph datatree {" << std::endl; #endif - dgm::Points& rPoints = getData()->getPoints(); dgm::Points::iterator aCurrPoint(rPoints.begin()); dgm::Points::iterator aEndPoint(rPoints.end()); while( aCurrPoint != aEndPoint ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_OOX_DIAGRAM output << "\t" << normalizeDotName(aCurrPoint->msModelId).getStr() << "["; @@ -179,6 +177,7 @@ void Diagram::build( ) } output << "];" << std::endl; +#endif // does currpoint have any text set? if( aCurrPoint->mpShape && @@ -186,8 +185,8 @@ void Diagram::build( ) !aCurrPoint->mpShape->getTextBody()->getParagraphs().empty() && !aCurrPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().empty() ) { +#ifdef DEBUG_OOX_DIAGRAM static sal_Int32 nCount=0; - output << "\t" << "textNode" << nCount << " [" @@ -201,8 +200,8 @@ void Diagram::build( ) << " -> " << "textNode" << nCount++ << ";" << std::endl; - } #endif + } const bool bInserted1=getData()->getPointNameMap().insert( std::make_pair(aCurrPoint->msModelId,&(*aCurrPoint))).second; @@ -224,7 +223,7 @@ void Diagram::build( ) const dgm::Connections::const_iterator aEndCxn(rConnections.end()); while( aCurrCxn != aEndCxn ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_OOX_DIAGRAM if( !aCurrCxn->msParTransId.isEmpty() || !aCurrCxn->msSibTransId.isEmpty() ) { @@ -308,8 +307,7 @@ void Diagram::build( ) ++aPresOfIter; } - -#if OSL_DEBUG_LEVEL > 1 +#ifdef DEBUG_OOX_DIAGRAM output << "}" << std::endl; #endif } diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 5ea7a04c8125..44b0f4121324 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -86,12 +86,12 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle ) applyStyleList( rTextListStyle.getListStyle(), getListStyle() ); } -#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void TextListStyle::dump() const { 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(); } } |