vcl/inc/dbggui.hxx | 8 -------- vcl/source/app/svmain.cxx | 8 ++++++-- vcl/source/window/accessibility.cxx | 1 - vcl/source/window/window.cxx | 1 - vcl/source/window/winproc.cxx | 1 - 5 files changed, 6 insertions(+), 13 deletions(-)
New commits: commit fcd8844cb01722fbc09a9947440912bf57b1b6c7 Author: Tor Lillqvist <[email protected]> Date: Tue Mar 8 10:22:24 2016 +0200 Bin unneeded inclusions of dbggui.hxx Change-Id: I5cac6fb0278e3952e2538f06188ed510644fcaa0 diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 0fcd518..a42ca44 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -62,7 +62,6 @@ #include "salinst.hxx" #include "salgdi.hxx" #include "svdata.hxx" -#include "dbggui.hxx" #include "fontinstance.hxx" #include "window.h" #include "toolbox.h" diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e6ea5e8..4d89a17 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -49,7 +49,6 @@ #include <salinst.hxx> #include <salgdi.hxx> #include <svdata.hxx> -#include <dbggui.hxx> #include <window.h> #include <toolbox.h> #include <outdev.h> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 48604b8..c680cb4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -39,7 +39,6 @@ #include <touch/touch.h> #include <svdata.hxx> -#include <dbggui.hxx> #include <salwtype.hxx> #include <salframe.hxx> #include <accmgr.hxx> commit 13e9870bb554d23eef18f327970b1c378bcf7068 Author: Tor Lillqvist <[email protected]> Date: Tue Mar 8 10:20:02 2016 +0200 Bin a pointless level of macro abstraction Change-Id: I343844aca956a1ce05c733f60a28d51115574ef8 diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index 772f3db..1628d1c 100644 --- a/vcl/inc/dbggui.hxx +++ b/vcl/inc/dbggui.hxx @@ -25,14 +25,6 @@ void DbgGUIInitSolarMutexCheck(); void DbgGUIDeInitSolarMutexCheck(); -#define DBGGUI_INIT_SOLARMUTEXCHECK() DbgGUIInitSolarMutexCheck() -#define DBGGUI_DEINIT_SOLARMUTEXCHECK() DbgGUIDeInitSolarMutexCheck() - -#else - -#define DBGGUI_INIT_SOLARMUTEXCHECK() -#define DBGGUI_DEINIT_SOLARMUTEXCHECK() - #endif #endif // INCLUDED_VCL_INC_DBGGUI_HXX diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 5fdd268..6ca4c07 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -301,7 +301,9 @@ bool InitVCL() // Set exception handler pExceptionHandler = osl_addSignalHandler(VCLExceptionSignal_impl, nullptr); - DBGGUI_INIT_SOLARMUTEXCHECK(); +#ifdef DBG_UTIL + DbgGUIInitSolarMutexCheck(); +#endif #if OSL_DEBUG_LEVEL > 0 DebugEventInjector::getCreate(); @@ -447,7 +449,9 @@ void DeInitVCL() } pSVData->mpDefaultWin.disposeAndClear(); - DBGGUI_DEINIT_SOLARMUTEXCHECK(); +#ifdef DBG_UTIL + DbgGUIDeInitSolarMutexCheck(); +#endif if ( pSVData->mpUnoWrapper ) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
