[Libreoffice-commits] .: 2 commits - writerfilter/inc writerfilter/unocomponent

[David Tardon]

 writerfilter/inc/writerfilter.mk                                   |    1 +
 writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx |    1 -
 writerfilter/unocomponent/debugservices/ooxml/makefile.mk          |    1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a92ff9724d8a6b63496e86f81b9b2f22ff0a7496
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jan 16 18:07:20 2011 +0100

    fix debug build

diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
index 2f41f38..fd58bf1 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
@@ -145,7 +145,6 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
         pDocument->resolve(*pStream);
 
 #ifdef DEBUG_ELEMENT
-        writerfilter::TagLogger::dump("DEBUG");
         debugLogger->endDocument();
 #endif
 
commit 558164ace5b1d7c6eaab020a4562c51b713c06aa
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jan 16 18:07:06 2011 +0100

    dbglevel=2 build uses libxml2

diff --git a/writerfilter/inc/writerfilter.mk b/writerfilter/inc/writerfilter.mk
index 116add5..7538507 100644
--- a/writerfilter/inc/writerfilter.mk
+++ b/writerfilter/inc/writerfilter.mk
@@ -29,4 +29,5 @@ CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
 .IF "$(DBG_LEVEL)">="2"
 CDEFS+=-DDEBUG_DOMAINMAPPER -DDEBUG_ELEMENT -DDEBUG_RESOLVE \
        -DDEBUG_CONTEXT_STACK -DDEBUG_ATTRIBUTES -DDEBUG_PROPERTIES
+CFLAGS += $(LIBXML_CFLAGS)
 .ENDIF
diff --git a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk b/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
index 25835ae..f7de799 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
+++ b/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
@@ -32,6 +32,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
 
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
 RESSOUREMODELLIB=-lresourcemodel