Author: damjan Date: Wed Feb 24 01:30:39 2016 New Revision: 1732002 URL: http://svn.apache.org/viewvc?rev=1732002&view=rev Log: Merge r1409435 from branches/gbuild: imported patch debugcleanup
BUILDS Modified: openoffice/branches/gbuild-reintegration/ (props changed) openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FFDataHandler.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicHelpers.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/SettingsTable.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TblStylePrHandler.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ThemeTable.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/resourcesimpl.xsl Propchange: openoffice/branches/gbuild-reintegration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 24 01:30:39 2016 @@ -1,4 +1,4 @@ -/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409434,1409470 +/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409435,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/dmapper/DomainMapperTableManager.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx Wed Feb 24 01:30:39 2016 @@ -55,7 +55,7 @@ DomainMapperTableManager::DomainMapperTa { m_pTablePropsHandler->SetTableManager( this ); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER #ifdef DEBUG_TABLE setTagLogger(dmapper_logger); #endif @@ -74,7 +74,7 @@ DomainMapperTableManager::~DomainMapperT -----------------------------------------------------------------------*/ bool DomainMapperTableManager::sprm(Sprm & rSprm) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("tablemanager.sprm"); string sSprm = rSprm.toString(); dmapper_logger->chars(sSprm); @@ -124,7 +124,7 @@ bool DomainMapperTableManager::sprm(Sprm if( m_nTableWidthOfCurrentTable.top() > 0 ) pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidthOfCurrentTable.top() ); } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->addTag(pPropMap->toTag()); #endif insertTableProps(pPropMap); @@ -267,7 +267,7 @@ bool DomainMapperTableManager::sprm(Sprm case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */ { -#if DEBUG_DOMAINMAPPER +#if DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("tablemanager.GridSpan"); dmapper_logger->attribute("gridSpan", nIntValue); dmapper_logger->endElement("tablemanager.GridSpan"); @@ -310,7 +310,7 @@ bool DomainMapperTableManager::sprm(Sprm bRet = false; #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("TableManager.unhandled"); #endif } } @@ -383,7 +383,7 @@ void DomainMapperTableManager::endLevel( DomainMapperTableManager_Base_t::endLevel(); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("dmappertablemanager.endLevel"); PropertyMapPtr pProps = getTableProps(); if (pProps.get() != NULL) @@ -398,7 +398,7 @@ void DomainMapperTableManager::endLevel( -----------------------------------------------------------------------*/ void DomainMapperTableManager::endOfCellAction() { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->element("endOFCellAction"); #endif @@ -411,7 +411,7 @@ void DomainMapperTableManager::endOfCell -----------------------------------------------------------------------*/ void DomainMapperTableManager::endOfRowAction() { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("endOfRowAction"); #endif @@ -421,13 +421,13 @@ void DomainMapperTableManager::endOfRowA { ::std::vector<sal_Int32>::const_iterator aCellIter = pTableGrid->begin(); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("tableWidth"); #endif while( aCellIter != pTableGrid->end() ) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("col"); dmapper_logger->attribute("width", *aCellIter); dmapper_logger->endElement("col"); @@ -443,7 +443,7 @@ void DomainMapperTableManager::endOfRowA insertTableProps(pPropMap); } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->endElement("tableWidth"); #endif } @@ -455,7 +455,7 @@ void DomainMapperTableManager::endOfRowA pCurrentSpans->insert( pCurrentSpans->end( ), m_nCellCounterForCurrentRow.top() - pCurrentSpans->size(), 1 ); } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("gridSpans"); { ::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin(); @@ -511,7 +511,7 @@ void DomainMapperTableManager::endOfRowA TablePropertyMapPtr pPropMap( new TablePropertyMap ); pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) ); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("rowProperties"); dmapper_logger->addTag(pPropMap->toTag()); dmapper_logger->endElement("rowProperties"); @@ -523,7 +523,7 @@ void DomainMapperTableManager::endOfRowA m_nCurrentCellBorderIndex.top() = 0; pCurrentSpans->clear(); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->endElement("endOfRowAction"); #endif } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FFDataHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FFDataHandler.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FFDataHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FFDataHandler.cxx Wed Feb 24 01:30:39 2016 @@ -410,7 +410,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sp break; default: #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("FFDataHandler.unhandled"); #endif break; } @@ -453,7 +453,7 @@ void FFDataHandler::lcl_attribute(Id nam break; default: #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("FFDataHandler.unhandled"); #endif break; } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicHelpers.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicHelpers.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicHelpers.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicHelpers.cxx Wed Feb 24 01:30:39 2016 @@ -110,7 +110,7 @@ void PositionHandler::lcl_attribute( Id break; default: #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("PositionHandler.unhandled"); #endif break; } @@ -182,7 +182,7 @@ void PositionHandler::lcl_sprm( Sprm& rS m_nPosition = ConversionHelper::convertEMUToMM100( nIntValue ); default: #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("PositionHandler.unhandled"); #endif break; } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx Wed Feb 24 01:30:39 2016 @@ -1157,8 +1157,8 @@ void GraphicImport::lcl_attribute(Id nNa //TODO: does it need to be handled? break; default: -#ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT - dmapper_logger->element("unhandled"); +#ifdef DEBUG_DOMAINMAPPER + dmapper_logger->element("GraphicImport.unhandled"); #endif ; } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx Wed Feb 24 01:30:39 2016 @@ -253,7 +253,7 @@ const uno::Reference< text::XFootnote>& -----------------------------------------------------------------------*/ void PropertyMap::insertTableProperties( const PropertyMap* ) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_PROPERTY_MAP dmapper_logger->element("PropertyMap.insertTableProperties"); #endif } @@ -1249,7 +1249,7 @@ void TablePropertyMap::setValue( TablePr -----------------------------------------------------------------------*/ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap ) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_PROPERTY_MAP dmapper_logger->startElement("TablePropertyMap.insertTableProperties"); dmapper_logger->addTag(pMap->toTag()); #endif @@ -1267,7 +1267,7 @@ void TablePropertyMap::insertTableProper } } } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_PROPERTY_MAP dmapper_logger->addTag(toTag()); dmapper_logger->endElement("TablePropertyMap.insertTableProperties"); #endif Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/SettingsTable.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/SettingsTable.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/SettingsTable.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/SettingsTable.cxx Wed Feb 24 01:30:39 2016 @@ -216,8 +216,8 @@ void SettingsTable::lcl_sprm(Sprm& rSprm break; default: { -#ifdef DEBUG_DMAPPER_SETTINGS_TABLE - dmapper_logger->element("unhandled"); +#ifdef DEBUG_DOMAINMAPPER + dmapper_logger->element("SettingsTable.unhandled"); #endif } } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx Wed Feb 24 01:30:39 2016 @@ -507,7 +507,7 @@ void StyleSheetTable::lcl_attribute(Id N default: { #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("StyleSheetTable.unhandled"); #endif } break; Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx Wed Feb 24 01:30:39 2016 @@ -53,7 +53,7 @@ namespace dmapper { bool TablePropertiesHandler::sprm(Sprm & rSprm) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER dmapper_logger->startElement("TablePropertiesHandler.sprm"); dmapper_logger->attribute("sprm", rSprm.toString()); #endif @@ -161,7 +161,7 @@ namespace dmapper { TablePropertyMapPtr pTablePropMap( new TablePropertyMap ); pTablePropMap->insert( pBorderHandler->getProperties() ); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER dmapper_logger->addTag(pTablePropMap->toTag()); #endif insertTableProps( pTablePropMap ); @@ -258,7 +258,7 @@ namespace dmapper { default: bRet = false; } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER dmapper_logger->endElement("TablePropertiesHandler.sprm"); #endif Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TblStylePrHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TblStylePrHandler.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TblStylePrHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/TblStylePrHandler.cxx Wed Feb 24 01:30:39 2016 @@ -23,7 +23,9 @@ #include <PropertyMap.hxx> #include <ooxml/resourceids.hxx> #include <dmapperLoggers.hxx> +#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER #include <resourcemodel/QNameToString.hxx> +#endif #include "dmapperLoggers.hxx" @@ -46,7 +48,7 @@ TblStylePrHandler::~TblStylePrHandler( ) void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER dmapper_logger->startElement("TblStylePrHandler.attribute"); dmapper_logger->attribute("name", (*QNameToString::Instance())(rName)); dmapper_logger->chars(rVal.toString()); @@ -67,7 +69,7 @@ void TblStylePrHandler::lcl_attribute(Id void TblStylePrHandler::lcl_sprm(Sprm & rSprm) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER dmapper_logger->startElement("TblStylePrHandler.sprm"); dmapper_logger->attribute("sprm", rSprm.toString()); #endif @@ -96,7 +98,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & } } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER dmapper_logger->endElement("TblStylePrHandler.sprm"); #endif } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ThemeTable.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ThemeTable.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ThemeTable.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ThemeTable.cxx Wed Feb 24 01:30:39 2016 @@ -26,6 +26,9 @@ #include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #endif +#ifdef DEBUG_DMAPPER_THEME_TABLE +#include <resourcemodel/QNameToString.hxx> +#endif #include "dmapperLoggers.hxx" #ifdef DEBUG_DOMAINMAPPER @@ -61,7 +64,7 @@ ThemeTable::~ThemeTable() void ThemeTable::lcl_attribute(Id Name, Value & val) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->startElement("ThemeTable.attribute"); dmapper_logger->attribute("name", (*QNameToString::Instance())(Name)); dmapper_logger->attribute("value", val.toString()); @@ -80,18 +83,18 @@ void ThemeTable::lcl_attribute(Id Name, default: { #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("ThemeTable.unhandled"); #endif } } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->endElement("ThemeTable.attribute"); #endif } void ThemeTable::lcl_sprm(Sprm& rSprm) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->startElement("ThemeTable.sprm"); dmapper_logger->chars(rSprm.toString()); #endif @@ -144,25 +147,25 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) break; default: { -#ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); +#ifdef DEBUG_DMAPPER_THEME_TABLE + dmapper_logger->element("ThemeTable.unhandled"); #endif } } -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->endElement("ThemeTable.sprm"); #endif } void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref) { -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->startElement("ThemeTable.entry"); #endif ref->resolve(*this); -#ifdef DEBUG_DOMAINMAPPER +#ifdef DEBUG_DMAPPER_THEME_TABLE dmapper_logger->endElement("ThemeTable.entry"); #endif } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx Wed Feb 24 01:30:39 2016 @@ -176,7 +176,7 @@ void WrapPolygonHandler::lcl_attribute(I break; default: #ifdef DEBUG_WRAP_POLYGON_HANDLER - dmapper_logger->element("unhandled"); + dmapper_logger->element("WrapPolygonHandler.unhandled"); #endif break; } @@ -198,7 +198,7 @@ void WrapPolygonHandler::lcl_sprm(Sprm & break; default: #ifdef DEBUG_WRAP_POLYGON_HANDLER - dmapper_logger->element("unhandled"); + dmapper_logger->element("WrapPolygonHandler.unhandled"); #endif break; } Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/resourcesimpl.xsl URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/resourcesimpl.xsl?rev=1732002&r1=1732001&r2=1732002&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/resourcesimpl.xsl (original) +++ openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/resourcesimpl.xsl Wed Feb 24 01:30:39 2016 @@ -477,7 +477,8 @@ using namespace ::std; rHandler.entry(n, pEntry); } catch (ExceptionOutOfBounds e) - { + { + (void) e; } } }