[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/README

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Mar 20 08:06:20 UTC 2019


 writerfilter/Library_writerfilter.mk |    2 +-
 writerfilter/README                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit efc29fbb6d458f5fd3660a36e2ff1592608fcbac
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Mar 19 20:51:34 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Mar 20 09:05:55 2019 +0100

    The DEBUG_WRITERFILTER code should be a dbgutil thing
    
    DEBUG_WRITERFILTER being on or off introduces binary incompatibility
    between object files that implement and use those things, so it
    shouldn't be changed without a full recompilation. Thus is matches
    dbgutil.
    
    Change-Id: Iec3c713ca7b299daf4b9cf1c978e49bf5ddf6886
    Reviewed-on: https://gerrit.libreoffice.org/69438
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 26fad1da3633..d79bce50f763 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter))
 $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
 
 $(eval $(call gb_Library_add_defs,writerfilter,\
-	$(if $(filter-out 0,$(gb_DEBUGLEVEL)), \
+	$(if $(ENABLE_DBGUTIL), \
 		-DDEBUG_WRITERFILTER \
 	) \
 ))
diff --git a/writerfilter/README b/writerfilter/README
index f45f9e85e720..7a9c8cc57df4 100644
--- a/writerfilter/README
+++ b/writerfilter/README
@@ -12,7 +12,7 @@ Import filter for docx and rtf.
 == Source contents ==
  * dmapper: the domain mapper, hiding UNO from the tokenizers, used by DOCX and RTF import
    * The incoming traffic of dmapper can be dumped into an XML file in /tmp in
-     debug builds, start soffice with the `SW_DEBUG_WRITERFILTER=1`
+     dbgutil builds, start soffice with the `SW_DEBUG_WRITERFILTER=1`
      environment variable if you want that.
  * filter: the UNO filter service implementations, invoked by UNO and calling
    the dmapper + one of the tokenizers


More information about the Libreoffice-commits mailing list