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

[Miklos Vajna]

 writerfilter/Library_writerfilter.mk       |    1 +
 writerfilter/source/ooxml/OOXMLFactory.cxx |    4 ++--
 writerfilter/source/ooxml/factoryimpl.xsl  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 22c2ffaa8a5922145fb5947864fd1ee6bd2e8584
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 24 15:43:53 2014 +0100

    writerfilter: fix build with DEBUG_FACTORY defined and enable when dbglevel==2
    
    Change-Id: Ie56458a0f8752c21470e166735fd495c194f06ba

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 796c37a..63bd1a5 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_defs,writerfilter,\
 		-DDEBUG_DMAPPER_TABLE_HANDLER \
 		-DDEBUG_TABLE \
 		-DDEBUG_DMAPPER_SETTINGS_TABLE \
+		-DDEBUG_FACTORY \
 	) \
 ))
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 20fc82c..5d683cb 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -269,7 +269,7 @@ OOXMLFactory::createFastChildContext(OOXMLFastContextHandler * pHandler,
         ret = createFastChildContextFromFactory(pHandler, pFactory, Element);
 
 #ifdef DEBUG_FACTORY
-    debug_logger->endElement("factory.createFastChildContext");
+    debug_logger->endElement();
 #endif
 
     return ret;
@@ -292,7 +292,7 @@ void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler,
     }
 
 #ifdef DEBUG_FACTORY
-    debug_logger->endElement("factory.characters");
+    debug_logger->endElement();
 #endif
 }
 
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index f9c486e..c6a7b36 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -127,7 +127,7 @@ uno::Reference< xml::sax::XFastContextHandler > OOXMLFactory::createFastCh
     }
     
 #ifdef DEBUG_FACTORY
-    debug_logger->endElement("factory.createFastChildContextFromFactory");        
+    debug_logger->endElement();
 #endif
 
     return aResult;
@@ -189,7 +189,7 @@ uno::Reference< xml::sax::XFastContextHandler > OOXMLFactory::createFastCh
     <xsl:text>
     
 #ifdef DEBUG_FACTORY
-    debug_logger->endElement("factory.createFastChildContextFromStart");
+    debug_logger->endElement();
 #endif
     return aResult;
 }