[Libreoffice-commits] .: 4 commits - cppcanvas/source svtools/source

[Radek Doulík]

 cppcanvas/source/mtfrenderer/emfplus.cxx      |    5 ++++-
 cppcanvas/source/mtfrenderer/implrenderer.cxx |    5 ++++-
 svtools/source/config/helpopt.cxx             |    2 +-
 svtools/source/filter/wmf/enhwmf.cxx          |    7 +++++--
 svtools/source/filter/wmf/winmtf.cxx          |    5 ++++-
 5 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 7b1fa15af253691e89018606ac66cd677f17589e
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jul 26 14:26:51 2011 +0200

    enable emf debug dump when dbglevel > 1

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 937ab2b..6fcf3b9 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -95,8 +95,11 @@
 #include "outdevstate.hxx"
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
+#if OSL_DEBUG_LEVEL > 1
+#define EMFP_DEBUG(x) x
+#else
 #define EMFP_DEBUG(x)
-//#define EMFP_DEBUG(x) x
+#endif
 
 using namespace ::com::sun::star;
 
commit 6fdbe693cfc12bee6eaedf5c64040d4bd69a110f
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jul 26 14:21:36 2011 +0200

    enable emf debug dump when dbglevel > 1

diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index d4f5cab..f2b8c99 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -159,8 +159,11 @@
 #define EMR_SETLINKEDUFIS              119
 #define EMR_SETTEXTJUSTIFICATION       120
 
+#if OSL_DEBUG_LEVEL > 1
+#define EMFP_DEBUG(x) x
+#else
 #define EMFP_DEBUG(x)
-//#define EMFP_DEBUG(x) x
+#endif
 
 //-----------------------------------------------------------------------------------
 
@@ -288,7 +291,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
         // GetDC
         if( type == 16388 ) {
             bHaveDC = true;
-            EMFP_DEBUG(printf ("\t\tEMF+ lock DC (device context)\n", type));
+            EMFP_DEBUG(printf ("\t\tEMF+ lock DC (device context)\n"));
         }
 
         //Get the length of the remaining data of this record based
diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index 428c0a7..1a36369 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -44,8 +44,11 @@
 
 #define WIN_MTF_MAX_CLIP_DEPTH 16
 
+#if OSL_DEBUG_LEVEL > 1
+#define EMFP_DEBUG(x) x
+#else
 #define EMFP_DEBUG(x)
-//#define EMFP_DEBUG(x) x
+#endif
 
 void WinMtfClipPath::intersectClipRect( const Rectangle& rRect )
 {
commit 3f43f2c132cfcea012c0e683fe09ef65763d63b3
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jul 26 14:18:13 2011 +0200

    enable emf debug dump when dbglevel > 1

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7bbde90..49c679e 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -92,8 +92,11 @@
 #define EmfPlusRegionInitialStateEmpty 0x10000002
 #define EmfPlusRegionInitialStateInfinite 0x10000003
 
+#if OSL_DEBUG_LEVEL > 1
+#define EMFP_DEBUG(x) x
+#else
 #define EMFP_DEBUG(x)
-//#define EMFP_DEBUG(x) x
+#endif
 
 using namespace ::com::sun::star;
 
commit cded6c0005c9a99d8defb17da7a51e942d4c6279
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jul 26 14:11:04 2011 +0200

    fix debug build

diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index aacb0a3..6badfff 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -198,7 +198,7 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
         for ( int nProp = 0; nProp < rPropertyNames.getLength(); nProp++ )
         {
 #if OSL_DEBUG_LEVEL > 1
-            OSL_ASSERT( pValues[nProp].hasValue(), "property value missing" );
+            DBG_ASSERT( pValues[nProp].hasValue(), "property value missing" );
 #endif
             if ( pValues[nProp].hasValue() )
             {