Author: damjan
Date: Wed Feb 24 01:36:34 2016
New Revision: 1732004
URL: http://svn.apache.org/viewvc?rev=1732004&view=rev
Log:
Merge r1409436 from branches/gbuild:
imported patch debugcleanup2
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFactory.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 01:36:34 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409435,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1732004&r1=1732003&r2=1732004&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
Wed Feb 24 01:36:34 2016
@@ -163,7 +163,7 @@ writerfilter::Reference<Stream>::Pointer
OOXMLStream::StreamType_t nType,
const sal_Int32 nIDForXNoteStream )
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOCUMENT
debug_logger->startElement("getXNoteStream");
debug_logger->attribute("id", rId);
debug_logger->endElement("getXNoteStream");
@@ -327,7 +327,7 @@ void OOXMLDocumentImpl::resolveFooter(St
void OOXMLDocumentImpl::resolve(Stream & rStream)
{
-#ifdef DEBUG_RESOLVE
+#ifdef DEBUG_DOCUMENT
debug_logger->startElement("OOXMLDocumentImpl.resolve");
#endif
@@ -362,13 +362,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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFactory.cxx?rev=1732004&r1=1732003&r2=1732004&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFactory.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFactory.cxx
Wed Feb 24 01:36:34 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1732004&r1=1732003&r2=1732004&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
Wed Feb 24 01:36:34 2016
@@ -1345,7 +1345,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleComment()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleComment");
#endif
@@ -1355,7 +1355,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handlePicture()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handlePicture");
#endif
@@ -1365,7 +1365,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleBreak()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleBreak");
#endif
@@ -1375,7 +1375,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleOLE()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleOLE");
#endif
@@ -1386,7 +1386,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");
@@ -1492,7 +1492,7 @@ throw (uno::RuntimeException, xml::sax::
void OOXMLFastContextHandlerValue::setDefaultBooleanValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultBooleanValue");
#endif
@@ -1505,7 +1505,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultIntegerValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultIntegerValue");
#endif
@@ -1518,7 +1518,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultHexValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultHexValue");
#endif
@@ -1531,7 +1531,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultStringValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultStringValue");
#endif
@@ -1653,7 +1653,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->getInt());
debug_logger->attribute("id", mpParserState->getDocument()->getXNoteId());
@@ -1859,7 +1859,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");
@@ -2143,7 +2143,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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx?rev=1732004&r1=1732003&r2=1732004&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
Wed Feb 24 01:36:34 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx?rev=1732004&r1=1732003&r2=1732004&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
Wed Feb 24 01:36:34 2016
@@ -99,7 +99,7 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
Stream * mpStream;
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_PROTOCOL
Stream::Pointer_t mpTmpStream;
#endif
OOXMLDocument * mpDocument;
