[Libreoffice] Remove dead code

Hi,

I have removed some dead code form */xml2cmp, /xmlhelp* and */xmloff*.
My code is under the LGPLv3+/MPL dual license.

Regards,
Balint Dozsa

From d0e63ce6f07fac833c2c44b8ab1333229291127d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20D=C3=B3zsa?= <dozsabalint@gmail.com>
Date: Wed, 16 Feb 2011 18:58:05 +0100
Subject: [PATCH] Remove dead code

---
 xml2cmp/source/xcd/cr_metho.cxx |    2 --
 xml2cmp/source/xcd/main.cxx     |    1 -
 xml2cmp/source/xcd/xmlelem.hxx  |    2 --
 3 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index 8507722..bbb98a5 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -92,8 +92,6 @@ Create_AccessMethod( const char *                     i_pOutputFileName,
                         break;
             case '\r':  aFile.write( "\\r", 2);
                         break;
-//                     case '\t':  aFile.write( "\\t", 2);
-//                                             break;
             default:    aFile.write( pTrans, 1);
         }
     }  /* end for */
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index f535f07..98cd2dc 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -233,7 +233,6 @@ StreamOut_TypeInfo( std::ostream &               o_rOut,
             if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) )
                 continue;
             delete pLastHeapTop;
-            // pLastHeapTop = 0;
         }
         pLastHeapTop = pHeapTop;
 
diff --git a/xml2cmp/source/xcd/xmlelem.hxx b/xml2cmp/source/xcd/xmlelem.hxx
index 2d4b5ae..b42eb43 100644
--- a/xml2cmp/source/xcd/xmlelem.hxx
+++ b/xml2cmp/source/xcd/xmlelem.hxx
@@ -55,8 +55,6 @@ class XmlElement
     virtual void        Insert2Index(
                             Index &            o_rIndex ) const;                       // Default: 
Does nothing, but can be overwritten.
 
-//     virtual void        Put2Dependy() = 0;
-
     const Simstr &             Name() const                    { return sName; }
 
   protected:
-- 
1.7.1

From bbbe5375b8f55eb8355399262a38460dc0149638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20D=C3=B3zsa?= <dozsabalint@gmail.com>
Date: Wed, 16 Feb 2011 18:59:20 +0100
Subject: [PATCH] Remove dead code

---
 .../source/com/sun/star/help/HelpComponent.java    |   37 ----------------
 xmlhelp/source/cxxhelp/provider/contentcaps.cxx    |    2 -
 xmlhelp/source/cxxhelp/provider/db.cxx             |   44 --------------------
 xmlhelp/source/cxxhelp/provider/db.hxx             |   17 --------
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx   |   18 --------
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx   |    2 +-
 xmloff/source/chart/MultiPropertySetHandler.hxx    |    8 ----
 xmloff/source/chart/PropertyMaps.cxx               |    1 -
 xmloff/source/chart/SchXMLChartContext.cxx         |   19 --------
 xmloff/source/chart/SchXMLExport.cxx               |   41 +------------------
 xmloff/source/chart/SchXMLImport.cxx               |    4 --
 xmloff/source/chart/SchXMLPlotAreaContext.cxx      |    2 -
 xmloff/source/chart/SchXMLTools.cxx                |    3 -
 xmloff/source/core/DocumentSettingsContext.cxx     |    4 --
 xmloff/source/core/ProgressBarHelper.cxx           |    8 ----
 xmloff/source/core/RDFaImportHelper.cxx            |    2 -
 xmloff/source/core/SettingsExportHelper.cxx        |    4 +-
 xmloff/source/core/xmlexp.cxx                      |   17 --------
 xmloff/source/core/xmlimp.cxx                      |    6 ---
 xmloff/source/core/xmltoken.cxx                    |    1 -
 20 files changed, 3 insertions(+), 237 deletions(-)

diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java 
b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index 18cb3fe..3156041 100755
--- a/xmlhelp/source/com/sun/star/help/HelpComponent.java
+++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java
@@ -30,43 +30,6 @@ package com.sun.star.help;
 import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lang.XSingleComponentFactory;
 import com.sun.star.registry.XRegistryKey;
-    
-/*
-import com.sun.star.lib.uno.helper.Factory;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.AnyConverter;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.FilterIndexReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.WildcardQuery;
-
-import com.sun.star.script.XInvocation;
-import com.sun.star.beans.XIntrospectionAccess;
-
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.io.File;
-*/
 
 /** This class capsulates the class, that implements the minimal component, a
  * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx 
b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 4aa0a66..3e150b8 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -194,8 +194,6 @@ uno::Sequence< beans::Property > Content::getProperties(
 uno::Sequence< star::ucb::CommandInfo > Content::getCommands(
     const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ )
 {
-//     osl::MutexGuard aGuard( m_aMutex );
-
     //=================================================================
     //
     // Supported commands
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 4cce60f..a38dfca 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -49,13 +49,9 @@ namespace berkeleydbproxy {
 //----------------------------------------------------------------------------
 namespace db_internal
 {
-    // static void raise_error(int dberr, const char * where);
-
     static inline int check_error(int dberr, const char * where)
     {
         (void)where;
-        
-        // if (dberr) raise_error(dberr,where); 
         return dberr;
     }
 }
@@ -592,28 +588,6 @@ Dbt::Dbt(void *data_arg, u_int32_t size_arg)
     this->set_size(size_arg);
 }
 
-/*
-Dbt::Dbt(const Dbt & other)
-{
-    using namespace std;
-    const DBT *otherpod = &other;
-    DBT *thispod = this;
-    memcpy(thispod, otherpod, sizeof *thispod);
-}
-
-Dbt& Dbt::operator = (const Dbt & other)
-{
-    if (this != &other) 
-    {
-        using namespace std;
-        const DBT *otherpod = &other;
-        DBT *thispod = this;
-        memcpy(thispod, otherpod, sizeof *thispod);
-    }
-    return *this;
-}
-*/
-
 Dbt::~Dbt() 
 {
 }
@@ -643,24 +617,6 @@ void Dbt::set_flags(u_int32_t value)
     this->flags = value;
 }
 
-//----------------------------------------------------------------------------
-/*
-void db_internal::raise_error(int dberr, const char * where)
-{
-    if (!where) where = "<unknown>";
-    
-    const char * dberrmsg = db_strerror(dberr);
-    if (!dberrmsg || !*dberrmsg) dberrmsg = "<unknown DB error>";
-    
-    rtl::OString msg = where;
-    msg += ": ";
-    msg += dberrmsg;
-
-    throw DbException(msg);
-}
-*/
-
-//----------------------------------------------------------------------------
 } // namespace ecomp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index aaa6f5d..d989181 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -217,8 +217,6 @@ namespace berkeleydbproxy {
         Dbt(void *data_arg, u_int32_t size_arg); 
     
         Dbt(); 
-        //Dbt(const Dbt & other);
-        //Dbt & operator=(const Dbt & other);
     
         ~Dbt();
 
@@ -234,19 +232,4 @@ namespace berkeleydbproxy {
 
 #endif
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 
b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 3b5b30b..1d134eb 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -551,7 +551,6 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
 
 void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException )
 {
-    // fprintf(stdout,"url send to xmlhelp: 
%s\n",(rtl::OUStringToOString(m_aURL,RTL_TEXTENCODING_UTF8).getStr()));
     m_aExpr = m_aURL;
 
     sal_Int32 lstIdx = m_aExpr.lastIndexOf( sal_Unicode( '#' ) );
@@ -627,9 +626,6 @@ bool URLParameter::name( bool modulePresent )
     {
         sal_Int32 idx = 1;
         while( idx < length && (m_aExpr.getStr())[idx] != '?' )
-//                ( isLetterOrDigit( (m_aExpr.getStr())[idx] )
-//                  || (m_aExpr.getStr())[idx] == '/'
-//                  || (m_aExpr.getStr())[idx] == '.' ))
             ++idx;
 
         if( idx != 1 && ! modulePresent )
@@ -641,7 +637,6 @@ bool URLParameter::name( bool modulePresent )
         }
     }
 
-//    fprintf(stdout,"id %s\n",(rtl::OUStringToOString(m_aId,RTL_TEXTENCODING_UTF8).getStr()));
     return true;
 }
 
@@ -894,18 +889,6 @@ fileClose(void * context) {
 
 } // extern "C"
 
-/*
-// For debugging only
-extern "C" void StructuredXMLErrorFunction(void *userData, xmlErrorPtr error)
-{
-    (void)userData;
-    (void)error;
-
-    // Reset error handler
-    xmlSetStructuredErrorFunc( NULL, NULL );
-}
-*/
-
 InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
                                                 Databases*    pDatabases,
                                                 bool isRoot )
@@ -1073,7 +1056,6 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
         xmlRegisterInputCallbacks(zipMatch, zipOpen, zipRead, uriClose);
         xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
         xmlRegisterInputCallbacks(fileMatch, fileOpen, fileRead, fileClose);
-        //xmlSetStructuredErrorFunc( NULL, (xmlStructuredErrorFunc)StructuredXMLErrorFunction );
 
         xsltStylesheetPtr cur =
             xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx 
b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 4bdab80..0a2134a 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -96,7 +96,7 @@ namespace chelp {
     
         rtl::OUString getTitle()
         {
-            if( ! m_ptr ) // || getHash().getLength() )
+            if( ! m_ptr )
                 return rtl::OUString();
             
             sal_Int32 sizeOfTitle =
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx 
b/xmloff/source/chart/MultiPropertySetHandler.hxx
index 6a296c8..cd1280b 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -214,14 +214,6 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void)
 }
 
 
-/*     
-template<class T> void MultiPropertySetHandler::Add (const ::rtl::OUString & sName, T& pValue)
-{
-    aPropertyList[sName] = new PropertyWrapper<T> (sName, pValue);
-}
-*/
-
-
 
 BOOL   MultiPropertySetHandler::GetProperties  (void)
 {
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 74f231b..f65dbbd 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -490,7 +490,6 @@ XMLChartImportPropertyMapper::XMLChartImportPropertyMapper( const UniReference<
 
     // do not chain text properties: on import this is done by shape mapper
     // to import old documents
-//     ChainImportMapper( XMLTextImportHelper::CreateParaExtPropMapper());
 }
 
 XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper()
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 68140c1..8fe540b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -280,11 +280,9 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const 
::rtl::OUStrin
 
 static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
 {
-//     { XML_LEFT,             chart::ChartLegendPosition_LEFT         },
     // #i35421#
     { XML_START,               chart::ChartLegendPosition_LEFT         },
     { XML_TOP,                 chart::ChartLegendPosition_TOP          },
-//     { XML_RIGHT,            chart::ChartLegendPosition_RIGHT        },
     // #i35421#
     { XML_END,                 chart::ChartLegendPosition_RIGHT        },
     { XML_BOTTOM,              chart::ChartLegendPosition_BOTTOM       },
@@ -547,23 +545,6 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
         }
         nOldSeriesCount = nMaxOldSeriesIndex+1;
     }
-    /*
-    sal_Int32 nOldSeriesCount = 0;
-    {
-        sal_Int32 nMaxOldSeriesIndex = 0;
-        sal_Int32 nOldSeriesIndex = 0;
-        for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt )
-        {
-            DataRowPointStyle aStyle(*aIt);
-            if(aStyle.meType == DataRowPointStyle::DATA_SERIES )
-            {
-                nMaxOldSeriesIndex = nOldSeriesIndex;
-                nOldSeriesIndex++;
-            }
-        }
-        nOldSeriesCount = nMaxOldSeriesIndex+1;
-    }
-    */
   
 
     //initialize new series styles
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 2a5d4e8..bc10852 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -915,10 +915,6 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< 
bea
         return aResult;
 
     const OUString aRolePrefix( RTL_CONSTASCII_USTRINGPARAM( "error-bars-" ));
-//     const OUString aXRolePrefix( aRolePrefix + OUString( RTL_CONSTASCII_USTRINGPARAM( "x-" )));
-//     const OUString aYRolePrefix( aRolePrefix + OUString( RTL_CONSTASCII_USTRINGPARAM( "y-" )));
-//     const OUString aPositivePostfix( RTL_CONSTASCII_USTRINGPARAM( "positive" ));
-//     const OUString aNegativePostfix( RTL_CONSTASCII_USTRINGPARAM( "negative" ));
 
     Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences(
         xErrorBarDataSource->getDataSequences());
@@ -1216,7 +1212,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument 
> &
         {
             DBG_WARNING( "Required property not found in ChartDocument" );
         }
-    } // if( xDocPropSet.is())
+    }
 
     if ( bIncludeTable && (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 
) )
     {
@@ -1432,12 +1428,10 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< 
chart::XChartDocument >&
                 switch( aLegendPos )
                 {
                     case chart::ChartLegendPosition_LEFT:
-//                                             msString = GetXMLToken(XML_LEFT);
                         // #i35421# change left->start (not clear why this was done)
                         msString = GetXMLToken(XML_START);
                         break;
                     case chart::ChartLegendPosition_RIGHT:
-//                                             msString = GetXMLToken(XML_RIGHT);
                         // #i35421# change right->end (not clear why this was done)
                         msString = GetXMLToken(XML_END);
                         break;
@@ -1562,8 +1556,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument 
> &
 
                     rShapeExport->collectShapeAutoStyles( xShape );
                 }
-                // this would be the easier way if it worked:
-                // mrExport.GetShapeExport()->collectShapesAutoStyles( mxAdditionalShapes );
             }
         }
     }
@@ -3196,7 +3188,6 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
     sal_Bool bJapaneseCandleSticks,
     sal_Bool bExportContent )
 {
-//     std::vector< XMLPropertyState > aPropertyStates;
 
     for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeriesSeq.getLength(); ++nSeriesIdx )
     {
@@ -3286,12 +3277,6 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, 
XML_SECONDARY_Y );
                     else
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, 
XML_PRIMARY_Y );
-                    // write style name
-//                     AddAutoStyleAttribute( aPropertyStates );
-                    // chart type
-//                     mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS,
-//                                            mrExport.GetNamespaceMap().GetQNameByKey(
-//                                                XML_NAMESPACE_CHART, GetXMLToken( XML_STOCK )));
                     SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, 
sal_True, sal_True );
                     // export empty data points
                     exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent );
@@ -3300,10 +3285,8 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
             else       // autostyles
             {
                 // for close series
-//                 CollectAutoStyle( aPropertyStates );
             }
             // remove property states for autostyles
-//             aPropertyStates.clear();
         }
     }
 }
@@ -3865,7 +3848,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const 
Referenc
 {
     // #110680#
     // #103997# removed some flags from EXPORT_ALL
-    // return (cppu::OWeakObject*)new SchXMLExport( EXPORT_ALL ^ ( EXPORT_SETTINGS | 
EXPORT_MASTERSTYLES | EXPORT_SCRIPTS ));
     return (cppu::OWeakObject*)new SchXMLExport( rSMgr, EXPORT_ALL ^ ( EXPORT_SETTINGS | 
EXPORT_MASTERSTYLES | EXPORT_SCRIPTS ));
 }
 
@@ -3908,7 +3890,6 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< 
lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLExport( EXPORT_STYLES );
     return (cppu::OWeakObject*)new SchXMLExport( rSMgr, EXPORT_STYLES );
 }
 
@@ -3947,7 +3928,6 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLExport( EXPORT_AUTOSTYLES | EXPORT_CONTENT | 
EXPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SchXMLExport( rSMgr, EXPORT_AUTOSTYLES | EXPORT_CONTENT | 
EXPORT_FONTDECLS );
 }
 
@@ -3971,23 +3951,6 @@ Reference< uno::XInterface > SAL_CALL 
SchXMLExport_Oasis_Content_createInstance(
 
 // ------------------------------------------------------------
 
-// Sequence< OUString > SAL_CALL SchXMLExport_Meta_getSupportedServiceNames() throw()
-// {
-//     const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.comp.Chart.XMLMetaExporter" ));
-//     const Sequence< OUString > aSeq( &aServiceName, 1 );
-//     return aSeq;
-// }
-
-// OUString SAL_CALL SchXMLExport_Meta_getImplementationName() throw()
-// {
-//     return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Meta" ));
-// }
-
-// Reference< uno::XInterface > SAL_CALL SchXMLExport_Meta_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
-// {
-//     return (cppu::OWeakObject*)new SchXMLExport( EXPORT_META );
-// }
-
 // Oasis format
 Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw()
 {
@@ -4018,8 +3981,6 @@ OUString SAL_CALL SchXMLExport::getImplementationName() throw( 
uno::RuntimeExcep
             return SchXMLExport_Styles_getImplementationName();
         case ( EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_FONTDECLS ):
             return SchXMLExport_Content_getImplementationName();
-//         case EXPORT_META:
-//             return SchXMLExport_Meta_getImplementationName();
 
         // Oasis format
         case ( EXPORT_ALL | EXPORT_OASIS ):
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 52d3646..736894c 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -870,7 +870,6 @@ OUString SAL_CALL SchXMLImport_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLImport();
     return (cppu::OWeakObject*)new SchXMLImport(rSMgr);
 }
 
@@ -893,7 +892,6 @@ OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLImport( IMPORT_STYLES );
     return (cppu::OWeakObject*)new SchXMLImport( rSMgr, IMPORT_STYLES );
 }
 
@@ -914,7 +912,6 @@ OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLImport( IMPORT_CONTENT | IMPORT_AUTOSTYLES | 
IMPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SchXMLImport( rSMgr, IMPORT_CONTENT | IMPORT_AUTOSTYLES | 
IMPORT_FONTDECLS );
 }
 
@@ -935,7 +932,6 @@ OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SchXMLImport( IMPORT_META );
     return (cppu::OWeakObject*)new SchXMLImport( rSMgr, IMPORT_META );
 }
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 617d59a..d8606cf 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -733,7 +733,6 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
                 {
                     Reference< chart2::XAxis > xMainXAxis = lcl_getAxis( xCooSys, 0, 0 );
                     Reference< chart2::XAxis > xMainYAxis = lcl_getAxis( xCooSys, 1, 0 );
-                    //Reference< chart2::XAxis > xMajorZAxis = lcl_getAxis( xCooSys, 2, 0 );
                     Reference< chart2::XAxis > xSecondaryXAxis = lcl_getAxis( xCooSys, 0, 1 );
                     Reference< chart2::XAxis > xSecondaryYAxis = lcl_getAxis( xCooSys, 1, 1 );
                     
@@ -1668,7 +1667,6 @@ void SchXMLCategoriesContext::StartElement( const uno::Reference< 
xml::sax::XAtt
         {
             uno::Reference< chart2::XChartDocument > xNewDoc( GetImport().GetModel(), 
uno::UNO_QUERY );
             mrAddress = xAttrList->getValueByIndex( i );
-            // lcl_ConvertRange( xAttrList->getValueByIndex( i ), xNewDoc );
         }
     }
 }
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index c7cd6e5..3937776 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -31,9 +31,6 @@
 
 #include "SchXMLTools.hxx"
 
-/*
-#include <tools/debug.hxx>
-*/
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/InlineContainer.hxx>
 // header for class SvXMLUnitConverter
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx 
b/xmloff/source/core/DocumentSettingsContext.cxx
index 28dcafb..f30ec61 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -115,8 +115,6 @@ uno::Reference<container::XNameContainer> XMLMyList::GetNameContainer()
     uno::Reference<container::XNameContainer> xNameContainer;
 
     // #110680#
-    // uno::Reference<lang::XMultiServiceFactory> xServiceFactory = 
comphelper::getProcessServiceFactory();
-    // DBG_ASSERT( xServiceFactory.is(), "got no service manager" );
 
     if( mxServiceFactory.is() )
     {
@@ -139,8 +137,6 @@ uno::Reference<container::XIndexContainer> XMLMyList::GetIndexContainer()
 {
     uno::Reference<container::XIndexContainer> xIndexContainer;
     // #110680#
-    // uno::Reference<lang::XMultiServiceFactory> xServiceFactory = 
comphelper::getProcessServiceFactory();
-    // DBG_ASSERT( xServiceFactory.is(), "got no service manager" );
 
     if( mxServiceFactory.is() )
     {
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index ffdac30..a9e64cc 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -102,8 +102,6 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
                     nValue = nReference;
                 else
                 {
-//                    xStatusIndicator->end();
-//                    xStatusIndicator->start();
                     xStatusIndicator->reset();
                     nValue = 0;
                 }
@@ -121,12 +119,6 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
             xmloff::token::DecRescheduleCount();
 
             // #95181# disabled, because we want to call setValue very often to enable a good 
reschedule
-//                     double fPercent ((fNewValue * 100) / nRange);
-//                     if (fPercent >= (fOldPercent + fProgressStep))
-//                     {
-//                             xStatusIndicator->setValue((sal_Int32)fNewValue);
-//                             fOldPercent = fPercent;
-//                     }
         }
 #ifdef DBG_UTIL
         else if (!bFailure)
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index ca7d240..a31f9df 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -209,7 +209,6 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const
             {
                 // N.B.: empty LocalName is valid!
                 const ::rtl::OUString URI(Namespace + LocalName);
-//                return GetImport().GetAbsoluteReference(URI);
                 return GetAbsoluteReference(URI);
             }
             else
@@ -275,7 +274,6 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const
         }
         else
         {
-//            return GetImport().GetAbsoluteReference(i_rURIOrSafeCURIE);
             return GetAbsoluteReference(i_rURIOrSafeCURIE);
         }
     }
diff --git a/xmloff/source/core/SettingsExportHelper.cxx 
b/xmloff/source/core/SettingsExportHelper.cxx
index 6f0ff60..a073361 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -303,7 +303,6 @@ void XMLSettingsExportHelper::exportSymbolDescriptors(
                     const rtl::OUString rName) const
 {
     // #110680#
-    // uno::Reference< lang::XMultiServiceFactory > xServiceFactory( 
comphelper::getProcessServiceFactory() );
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory( m_rContext.GetServiceFactory() );
     DBG_ASSERT( xServiceFactory.is(), "XMLSettingsExportHelper::exportSymbolDescriptors: got no 
service manager" );
 
@@ -423,7 +422,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
     DBG_ASSERT(rName.getLength(), "no name");
     DBG_ASSERT(aIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> 
*)0 ) ),
                 "wrong IndexAccess" );
-    rtl::OUString sEmpty;// ( RTLCONSTASCII_USTRINGPARAM( "View" ) );
+    rtl::OUString sEmpty;
     if(aIndexed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
@@ -453,7 +452,6 @@ void XMLSettingsExportHelper::exportForbiddenCharacters(
         return;
 
     // #110680#
-    // uno::Reference< lang::XMultiServiceFactory > xServiceFactory( 
comphelper::getProcessServiceFactory() );
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory( m_rContext.GetServiceFactory() );
     DBG_ASSERT( xServiceFactory.is(), "XMLSettingsExportHelper::exportForbiddenCharacters: got no 
service manager" );
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index c065de2..bc9a2d5 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1163,7 +1163,6 @@ void SvXMLExport::ImplExportStyles( sal_Bool )
 {
     CheckAttrList();
 
-//     AddAttribute( XML_NAMESPACE_NONE, XML_ID, XML_STYLES_ID );
     {
         // <style:styles>
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_STYLES,
@@ -1207,7 +1206,6 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool )
         mxAutoStylePool->RegisterNames( aStyleFamilies, aStyleNames );
     }
 
-//     AddAttributeASCII( XML_NAMESPACE_NONE, XML_ID, XML_AUTO_STYLES_ID );
     {
         // <style:automatic-styles>
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
@@ -1448,20 +1446,6 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass 
)
             }
         }
 
-//             if( (getExportFlags() & EXPORT_NODOCTYPE) == 0 &&
-//                     xExtHandler.is() )
-//             {
-//                     OUStringBuffer aDocType(
-//               GetXMLToken(XML_XML_DOCTYPE_PREFIX).getLength() +
-//                             GetXMLToken(XML_XML_DOCTYPE_SUFFIX).getLength() + 30 );
-//
-//                     aDocType.append( GetXMLToken(XML_XML_DOCTYPE_PREFIX) );
-//                     aDocType.append( GetNamespaceMap().GetQNameByKey(
-//                                                XML_NAMESPACE_OFFICE, GetXMLToken(eRootService) 
) );
-//                     aDocType.append( GetXMLToken(XML_XML_DOCTYPE_SUFFIX) );
-//                     xExtHandler->unknown( aDocType.makeStringAndClear() );
-//             }
-
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, sal_True, sal_True );
 
         // meta information
@@ -2505,7 +2489,6 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
     const uno::Reference<rdf::XMetadatable> xMeta(i_xIfc,
         uno::UNO_QUERY);
 //FIXME not yet...
-//    OSL_ENSURE(xMeta.is(), "xml:id: not XMetadatable");
     if ( xMeta.is() )
     {
         const beans::StringPair mdref( xMeta->getMetadataReference() );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 80fa84e..9b10cdd 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -351,7 +351,6 @@ SvXMLImport::SvXMLImport(
     mpNamespaceMap( new SvXMLNamespaceMap ),
 
     // #110680#
-    // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM ) ),
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM, xServiceFactory ) ),
 
     mpContexts( new SvXMLImportContexts_Impl ),
@@ -381,7 +380,6 @@ SvXMLImport::SvXMLImport(
     mpImpl( new SvXMLImport_Impl() ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
     // #110680#
-    // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM ) ),
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM, xServiceFactory ) ),
     mpContexts( new SvXMLImportContexts_Impl ),
     mpNumImport( NULL ),
@@ -412,7 +410,6 @@ SvXMLImport::SvXMLImport(
     mpImpl( new SvXMLImport_Impl() ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
     // #110680#
-    // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM ) ),
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM, xServiceFactory ) ),
     mpContexts( new SvXMLImportContexts_Impl ),
     mpNumImport( NULL ),
@@ -450,8 +447,6 @@ SvXMLImport::~SvXMLImport() throw ()
         delete mpContexts;
     }
 
-    // delete pImageMapImportHelper;
-
     // #i9518# the import component might not be deleted until after the document has been closed,
     // so the stuff that accesses the document has been moved to endDocument.
 
@@ -1969,7 +1964,6 @@ void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc,
             const uno::Reference<rdf::XMetadatable> xMeta(i_xIfc,
                 uno::UNO_QUERY);
 //FIXME: not yet
-//            OSL_ENSURE(xMeta.is(), "xml:id: not XMetadatable");
             if (xMeta.is()) {
                 const beans::StringPair mdref( GetStreamName(), i_rXmlId );
                 try {
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index b2977bb..c3013cc 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -78,7 +78,6 @@ namespace xmloff { namespace token {
         TOKEN( " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">",      
XML_XML_DOCTYPE_SUFFIX ),
 
         // namespace prefixes and names
-//        TOKEN( "xml",                   XML_NP_XML ),
         TOKEN( "http://www.w3.org/XML/1998/namespace";,      XML_N_XML ),
         TOKEN( "office",                XML_NP_OFFICE ),
         TOKEN( "urn:oasis:names:tc:opendocument:xmlns:office:1.0",      XML_N_OFFICE ),
-- 
1.7.1