sd/source/ui/framework/configuration/ConfigurationTracer.cxx | 7 ++++--- sd/source/ui/framework/configuration/ConfigurationTracer.hxx | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 0c4a2b126c4aaa6f87baa1d86973b25fe7691009 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Sun Nov 18 14:58:45 2018 -0500 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Jul 24 21:01:33 2019 +0200 sd: use OSL_DEBUG_LEVEL instead of DEBUG Change-Id: I0703a1564a23657e956e43fe4cbf1d9549acb94f Reviewed-on: https://gerrit.libreoffice.org/68258 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/76240 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index aef2366824c6..7ddaa23ae906 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -19,6 +19,7 @@ #include "ConfigurationTracer.hxx" +#include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <sal/log.hxx> using namespace ::com::sun::star::uno; @@ -30,11 +31,11 @@ void ConfigurationTracer::TraceConfiguration ( const Reference<XConfiguration>& rxConfiguration, const char* pMessage) { -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >=1 SAL_INFO("sd.ui","" << pMessage << " at " << rxConfiguration.get() << " {"); if (rxConfiguration.is()) { - TraceBoundResources(rxConfiguration, NULL, 0); + TraceBoundResources(rxConfiguration, nullptr, 0); } else { @@ -47,7 +48,7 @@ void ConfigurationTracer::TraceConfiguration ( #endif } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >=1 void ConfigurationTracer::TraceBoundResources ( const Reference<XConfiguration>& rxConfiguration, const Reference<XResourceId>& rxResourceId, diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index c2fc122b499a..facedd3f4600 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -23,6 +23,7 @@ #include <sal/types.h> namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } } +namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } } namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } namespace sd { namespace framework { @@ -36,7 +37,7 @@ public: static void TraceConfiguration ( const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, const char* pMessage); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >=1 static void TraceBoundResources ( const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits