[Libreoffice-commits] core.git: include/oox sd/source

[Tor Lillqvist]

 include/oox/export/utils.hxx             |    9 ---------
 sd/source/filter/eppt/pptx-epptooxml.cxx |    9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 1e840cc7c2b1cfac6f2935e6929d234464eac3ee
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Dec 20 11:18:03 2015 +0200

    Move silly DBG macro to the only file where it is used
    
    Change-Id: Ie0da09ffccba5ca92f629f38befa56370315feb7

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 95d154d..53cdfcd 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -28,15 +28,6 @@
 #define BS(x) (x ? "1":"0")
 #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
 
-// FIXME: this should be removed and replaced by SAL_INFO
-#ifndef DBG
-#  if OSL_DEBUG_LEVEL > 1
-#    define DBG(x) x
-#  else
-#    define DBG(x)
-#  endif
-#endif
-
 static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT )
 {
     return (sal_Int64)( (double)nPPT * 1587.5 );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e9b02e8..0e5cdf3 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -91,6 +91,15 @@ using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
+// FIXME: this should be removed and replaced by SAL_INFO
+#ifndef DBG
+#  if OSL_DEBUG_LEVEL > 1
+#    define DBG(x) x
+#  else
+#    define DBG(x)
+#  endif
+#endif
+
 DBG(void dump_pset(Reference< XPropertySet > rXPropSet);)
 
 #define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()