[Libreoffice-commits] .: 2 commits - oox/inc oox/source sw/source

[Miklos Vajna]

 oox/inc/oox/drawingml/textliststyle.hxx |    2 +-
 oox/source/drawingml/textliststyle.cxx  |    2 +-
 sw/source/core/text/itratr.cxx          |   12 ------------
 sw/source/core/text/itratr.hxx          |    4 ----
 4 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 8a89650769326c56e6918f3b6ed4ef938bf43006
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jul 1 12:23:52 2012 +0200

    don't build oox::drawingml::TextListStyle::dump by default
    
    Change-Id: I24a468dbe208afd2a71dd10e7ed5610d8c259aec

diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx
index 9be1c58..256aec2 100644
--- a/oox/inc/oox/drawingml/textliststyle.hxx
+++ b/oox/inc/oox/drawingml/textliststyle.hxx
@@ -51,7 +51,7 @@ public:
     inline const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; };
     inline TextParagraphPropertiesVector&       getAggregationListStyle() { return maAggregationListStyle; };
 
-#ifdef DBG_UTIL
+#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1
     void dump() const;
 #endif
 
diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx
index c85a3fd..14410b1 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -66,7 +66,7 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle )
     applyStyleList( rTextListStyle.getListStyle(), getListStyle() );
 }
 
-#ifdef DBG_UTIL
+#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 2
 void TextListStyle::dump() const
 {
     for ( int i = 0; i < 9; i++ )
commit d177ba1096a3a378b192df05d1d97f7cec17f35b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jul 1 12:15:57 2012 +0200

    unused and empty SwAttrIter::Dump()
    
    Change-Id: Ic7cc9235ed7255cf7971cab91928fc68690e61c5

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index f54f660..faf1804 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -344,18 +344,6 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const
     return nNext;
 }
 
-#ifdef DBG_UTIL
-/*************************************************************************
- *                      SwAttrIter::Dump()
- *************************************************************************/
-
-void SwAttrIter::Dump( SvStream &/*rOS*/ ) const
-{
-// Noch nicht an den neuen Attributiterator angepasst ...
-}
-
-#endif
-
 class SwMinMaxArgs
 {
 public:
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 1dfafbb..a6de5e7 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -123,10 +123,6 @@ public:
     inline void SetPropFont( const sal_uInt8 nNew ) { nPropFont = nNew; }
 
     inline SwAttrHandler& GetAttrHandler() { return aAttrHandler; }
-
-#ifdef DBG_UTIL
-    void Dump( SvStream &rOS ) const;
-#endif
 };
 
 #endif