Merge branch 'master' into feature/gnumake4

Conflicts:
filter/source/config/cache/filtercache.cxx
filter/source/odfflatxml/makefile.mk
oox/Library_oox.mk
oox/Makefile
oox/Module_oox.mk
oox/Package_generated.mk
oox/Package_inc.mk
oox/prj/build.lst
oox/prj/d.lst
oox/prj/makefile.mk
oox/source/dump/makefile.mk
unoxml/Library_unordf.mk
unoxml/Library_unoxml.mk
writerfilter/CppunitTest_writerfilter_doctok.mk
writerfilter/Library_writerfilter.mk
writerfilter/Module_writerfilter.mk
writerfilter/Package_inc.mk
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
writerfilter/prj/build.lst
writerfilter/prj/makefile.mk
writerfilter/qa/complex/ooxml/makefile.mk
writerfilter/qa/cppunittests/doctok/makefile.mk
writerfilter/qa/cppunittests/doctok/testdoctok.cxx
writerfilter/qa/cppunittests/xxml/testXXML.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/GraphicHelpers.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/ThemeTable.cxx
writerfilter/source/doctok/WW8DocumentImpl.cxx
writerfilter/source/doctok/resourcesimpl.xsl
writerfilter/source/filter/WriterFilter.cxx
writerfilter/source/generated.mk
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFactory.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/RefAndPointer.hxx
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/unocomponent/component.cxx
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx

1 files changed, 8 insertions, 6 deletions

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index f60e4067cff0..440aee65164b 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -145,7 +146,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
         AttributeToResourceMap::const_iterator aIt;
         AttributeToResourceMap::const_iterator aEndIt = pMap->end();
 
-        for (aIt = pMap->begin(); aIt != aEndIt; aIt++)
+        for (aIt = pMap->begin(); aIt != aEndIt; ++aIt)
         {
             Id nId = (*pTokenToIdMap)[aIt->first];
 #ifdef DEBUG_FACTORY
@@ -235,7 +236,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
                             pFactory->attributeAction(pHandler, aIt->first, pValue);
                         }
 #ifdef DEBUG_FACTORY
-                        debug_logger->endElement("list");
+                        debug_logger->endElement();
 #endif
                     }
                     break;
@@ -247,12 +248,12 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
                 }
             }
 #ifdef DEBUG_FACTORY
-            debug_logger->endElement("factory.attribute");
+            debug_logger->endElement();
 #endif
         }
 
 #ifdef DEBUG_FACTORY
-        debug_logger->endElement("factory.attributes");
+        debug_logger->endElement();
 #endif
     }
 }
@@ -316,7 +317,7 @@ void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*n
 #endif
         pFactory->startAction(pHandler);
 #ifdef DEBUG_FACTORY
-        debug_logger->endElement("factory.startAction");
+        debug_logger->endElement();
 #endif
     }
 }
@@ -333,7 +334,7 @@ void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*nTo
 #endif
         pFactory->endAction(pHandler);
 #ifdef DEBUG_FACTORY
-        debug_logger->endElement("factory.endAction");
+        debug_logger->endElement();
 #endif
     }
 }
@@ -364,3 +365,4 @@ string OOXMLFactory_ns::getName() const
 }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */