openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409435 - in /incubator/ooo/branches/gbuild/main/writerfilter/source: dmapper/ doctok/
Date Wed, 14 Nov 2012 21:40:38 GMT
Author: arist
Date: Wed Nov 14 21:40:37 2012
New Revision: 1409435

URL: http://svn.apache.org/viewvc?rev=1409435&view=rev
Log:
writerfilter10_11_b63fc5ed86aa.patch
# HG changeset patch
# User Henning Brinkmann <hbrinkm@openoffice.org>
# Date 1297174629 -3600
# Node ID b63fc5ed86aa24e07f6b2648aebe9499a0c0adf5
# Parent  aedd8fa673f0a21db4db4ab6c420f132c54959a6
imported patch debugcleanup


Modified:
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/FFDataHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicHelpers.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicImport.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/PropertyMap.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/SettingsTable.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/StyleSheetTable.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TblStylePrHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/ThemeTable.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/resourcesimpl.xsl

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
Wed Nov 14 21:40:37 2012
@@ -56,7 +56,7 @@ DomainMapperTableManager::DomainMapperTa
 {
     m_pTablePropsHandler->SetTableManager( this );
     
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
 #ifdef DEBUG_TABLE
     setTagLogger(dmapper_logger);
 #endif
@@ -75,7 +75,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);
@@ -121,7 +121,7 @@ bool DomainMapperTableManager::sprm(Sprm
                         if( m_nTableWidth )
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidth
);
                     }
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                     dmapper_logger->addTag(pPropMap->toTag());
 #endif
                     insertTableProps(pPropMap);
@@ -253,7 +253,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");
@@ -291,7 +291,7 @@ bool DomainMapperTableManager::sprm(Sprm
                 bRet = false;
                 
 #ifdef DEBUG_DOMAINMAPPER
-                dmapper_logger->element("unhandled");
+                dmapper_logger->element("TableManager.unhandled");
 #endif
         }
     }
@@ -326,7 +326,7 @@ void DomainMapperTableManager::endLevel(
     m_nTableWidth = 0;
     
     DomainMapperTableManager_Base_t::endLevel( );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("dmappertablemanager.endLevel");
     PropertyMapPtr pProps = getTableProps();
     if (pProps.get() != NULL)
@@ -341,7 +341,7 @@ void DomainMapperTableManager::endLevel(
   -----------------------------------------------------------------------*/
 void DomainMapperTableManager::endOfCellAction()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->element("endOFCellAction");
 #endif
     
@@ -354,7 +354,7 @@ void DomainMapperTableManager::endOfCell
   -----------------------------------------------------------------------*/
 void DomainMapperTableManager::endOfRowAction()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("endOfRowAction");
 #endif
     
@@ -363,13 +363,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");
@@ -386,7 +386,7 @@ void DomainMapperTableManager::endOfRowA
             insertTableProps(pPropMap);
         }
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->endElement("tableWidth");
 #endif
     }
@@ -398,7 +398,7 @@ void DomainMapperTableManager::endOfRowA
         pCurrentSpans->insert( pCurrentSpans->end( ), m_nCell - pCurrentSpans->size(),
1 );
     }    
     
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("gridSpans");
     {
         ::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin();
@@ -454,7 +454,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");
@@ -467,7 +467,7 @@ void DomainMapperTableManager::endOfRowA
     m_nCellBorderIndex = 0;
     pCurrentSpans->clear();
     
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement("endOfRowAction");
 #endif
 }

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/FFDataHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/FFDataHandler.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/FFDataHandler.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/FFDataHandler.cxx Wed Nov
14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicHelpers.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicHelpers.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicHelpers.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicHelpers.cxx Wed
Nov 14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicImport.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicImport.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicImport.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/GraphicImport.cxx Wed Nov
14 21:40:37 2012
@@ -1145,8 +1145,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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/PropertyMap.cxx Wed Nov
14 21:40:37 2012
@@ -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
 }
@@ -1240,7 +1240,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 
@@ -1258,7 +1258,7 @@ void TablePropertyMap::insertTableProper
             }
         }    
     }
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_PROPERTY_MAP
     dmapper_logger->addTag(toTag());
     dmapper_logger->endElement("TablePropertyMap.insertTableProperties");
 #endif

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/SettingsTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/SettingsTable.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/SettingsTable.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/SettingsTable.cxx Wed Nov
14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/StyleSheetTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/StyleSheetTable.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/StyleSheetTable.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/StyleSheetTable.cxx Wed
Nov 14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TablePropertiesHandler.cxx
Wed Nov 14 21:40:37 2012
@@ -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 );
@@ -257,7 +257,7 @@ namespace dmapper {
             default: bRet = false;
         }
         
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER
         dmapper_logger->endElement("TablePropertiesHandler.sprm");
 #endif
         

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TblStylePrHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TblStylePrHandler.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TblStylePrHandler.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/TblStylePrHandler.cxx Wed
Nov 14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/ThemeTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/ThemeTable.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/ThemeTable.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/ThemeTable.cxx Wed Nov
14 21:40:37 2012
@@ -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"
 
 namespace writerfilter {
@@ -57,7 +60,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());
@@ -76,18 +79,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
@@ -140,25 +143,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: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/WrapPolygonHandler.cxx
Wed Nov 14 21:40:37 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/resourcesimpl.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/resourcesimpl.xsl?rev=1409435&r1=1409434&r2=1409435&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/resourcesimpl.xsl (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/resourcesimpl.xsl Wed Nov
14 21:40:37 2012
@@ -477,7 +477,8 @@ using namespace ::std;
                    rHandler.entry(n, pEntry);
                }
                catch (ExceptionOutOfBounds e)
-               {                
+               {    
+                   (void) e;
                }
            }
        }



Mime
View raw message