openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409436 - in /incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml: OOXMLDocumentImpl.cxx OOXMLFactory.cxx OOXMLFastContextHandler.cxx OOXMLFastDocumentHandler.cxx OOXMLFastDocumentHandler.hxx
Date Wed, 14 Nov 2012 21:41:10 GMT
Author: arist
Date: Wed Nov 14 21:41:09 2012
New Revision: 1409436

URL: http://svn.apache.org/viewvc?rev=1409436&view=rev
Log:
writerfilter10_12_b208d29d0b58.patch
# HG changeset patch
# User Henning Brinkmann <hbrinkm@openoffice.org>
# Date 1297174630 -3600
# Node ID b208d29d0b58c5ee644dccc507e4c23a4663e01f
# Parent  b63fc5ed86aa24e07f6b2648aebe9499a0c0adf5
imported patch debugcleanup2


Modified:
    incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFactory.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1409436&r1=1409435&r2=1409436&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx Wed
Nov 14 21:41:09 2012
@@ -145,7 +145,7 @@ writerfilter::Reference<Stream>::Pointer
 OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rType,
                                   const rtl::OUString & rId)
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOCUMENT
     debug_logger->startElement("getXNoteStream");
     debug_logger->attribute("id", rId);
     debug_logger->endElement("getXNoteStream");
@@ -305,7 +305,7 @@ void OOXMLDocumentImpl::resolveFooter(St
 
 void OOXMLDocumentImpl::resolve(Stream & rStream)
 {
-#ifdef DEBUG_RESOLVE
+#ifdef DEBUG_DOCUMENT
     debug_logger->startElement("OOXMLDocumentImpl.resolve");
 #endif
     
@@ -343,13 +343,13 @@ void OOXMLDocumentImpl::resolve(Stream &
             xParser->parseStream(aParserInput);
         }
         catch (...) {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOCUMENT
             debug_logger->element("exception");
 #endif
         }
     }
 
-#ifdef DEBUG_RESOLVE
+#ifdef DEBUG_DOCUMENT
     debug_logger->endElement("OOXMLDocumentImpl.resolve");
 #endif
 }

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFactory.cxx?rev=1409436&r1=1409435&r2=1409436&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFactory.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFactory.cxx Wed Nov
14 21:41:09 2012
@@ -307,11 +307,11 @@ void OOXMLFactory::startAction(OOXMLFast
     
     if (pFactory.get() != NULL)
     {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
         debug_logger->startElement("factory.startAction");
 #endif
         pFactory->startAction(pHandler);
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
         debug_logger->endElement("factory.startAction");
 #endif
     }
@@ -324,11 +324,11 @@ void OOXMLFactory::endAction(OOXMLFastCo
     
     if (pFactory.get() != NULL)
     {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
         debug_logger->startElement("factory.endAction");
 #endif
         pFactory->endAction(pHandler);
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
         debug_logger->endElement("factory.endAction");
 #endif
     }

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1409436&r1=1409435&r2=1409436&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
Wed Nov 14 21:41:09 2012
@@ -1351,7 +1351,7 @@ void OOXMLFastContextHandlerProperties::
 
 void OOXMLFastContextHandlerProperties::handleComment()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("handleComment");
 #endif
 
@@ -1361,7 +1361,7 @@ void OOXMLFastContextHandlerProperties::
 
 void OOXMLFastContextHandlerProperties::handlePicture()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("handlePicture");
 #endif
 
@@ -1371,7 +1371,7 @@ void OOXMLFastContextHandlerProperties::
 
 void OOXMLFastContextHandlerProperties::handleBreak()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("handleBreak");
 #endif
 
@@ -1381,7 +1381,7 @@ void OOXMLFastContextHandlerProperties::
 
 void OOXMLFastContextHandlerProperties::handleOLE()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("handleOLE");
 #endif
 
@@ -1392,7 +1392,7 @@ void OOXMLFastContextHandlerProperties::
 void OOXMLFastContextHandlerProperties::setParent
 (OOXMLFastContextHandler * pParent)
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->startElement("setParent");
     debug_logger->chars("OOXMLFastContextHandlerProperties");
     debug_logger->endElement("setParent");
@@ -1498,7 +1498,7 @@ throw (uno::RuntimeException, xml::sax::
 
 void OOXMLFastContextHandlerValue::setDefaultBooleanValue()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("setDefaultBooleanValue");
 #endif
 
@@ -1511,7 +1511,7 @@ void OOXMLFastContextHandlerValue::setDe
 
 void OOXMLFastContextHandlerValue::setDefaultIntegerValue()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("setDefaultIntegerValue");
 #endif
     
@@ -1524,7 +1524,7 @@ void OOXMLFastContextHandlerValue::setDe
 
 void OOXMLFastContextHandlerValue::setDefaultHexValue()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("setDefaultHexValue");
 #endif
     
@@ -1537,7 +1537,7 @@ void OOXMLFastContextHandlerValue::setDe
 
 void OOXMLFastContextHandlerValue::setDefaultStringValue()
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->element("setDefaultStringValue");
 #endif
     
@@ -1656,7 +1656,7 @@ void OOXMLFastContextHandlerXNote::lcl_e
 
 void OOXMLFastContextHandlerXNote::checkId(OOXMLValue::Pointer_t pValue)
 {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->startElement("checkId");
     debug_logger->attribute("myId", pValue->getString());
     debug_logger->attribute("id", getXNoteId());
@@ -1862,7 +1862,7 @@ OOXMLFastContextHandlerShape::OOXMLFastC
             mrShapeContext->setDrawPage(getDocument()->getDrawPage());
             mrShapeContext->setInputStream(getDocument()->getStorageStream());
 
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
             debug_logger->startElement("setRelationFragmentPath");
             debug_logger->attribute("path", mpParserState->getTarget());
             debug_logger->endElement("setRelationFragmentPath");
@@ -2146,7 +2146,7 @@ OOXMLFastContextHandlerWrapper::lcl_crea
 
     Id nNameSpace = Element & 0xffff0000;
 
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
     debug_logger->startElement("Wrapper-createChildContext");
     debug_logger->attribute("token", fastTokenToId(Element));
 

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx?rev=1409436&r1=1409435&r2=1409436&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
Wed Nov 14 21:41:09 2012
@@ -23,8 +23,10 @@
 
 #include <iostream>
 #include <boost/shared_ptr.hpp>
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
 #include "ooxmlLoggers.hxx"
+#endif
+#ifdef DEBUG_PROTOCOL
 #include <resourcemodel/Protocol.hxx>
 #endif
 #include "OOXMLFastDocumentHandler.hxx"

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx?rev=1409436&r1=1409435&r2=1409436&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
Wed Nov 14 21:41:09 2012
@@ -100,7 +100,7 @@ private:
     uno::Reference< uno::XComponentContext > m_xContext;
 
     Stream * mpStream;
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_PROTOCOL
     Stream::Pointer_t mpTmpStream;
 #endif
     OOXMLDocument * mpDocument;



Mime
View raw message