Remove dead code

6 files changed, 1 insertions, 119 deletions

diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index 18cb3feaa0..3156041bc0 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 4aa0a6699f..3e150b83e0 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 e8435192e4..c6fae9f753 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -45,13 +45,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;
     }
 }
@@ -390,28 +386,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() 
 {
 }
@@ -441,24 +415,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 fd515111ed..1982ccdf6b 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -211,8 +211,6 @@ namespace berkeleydbproxy {
         Dbt(void *data_arg, u_int32_t size_arg); 
     
         Dbt(); 
-        //Dbt(const Dbt & other);
-        //Dbt & operator=(const Dbt & other);
     
         ~Dbt();
 
@@ -228,19 +226,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 164d1dce85..59d191cf9e 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -543,7 +543,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( '#' ) );
@@ -619,9 +618,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 )
@@ -633,7 +629,6 @@ bool URLParameter::name( bool modulePresent )
         }
     }
 
-//    fprintf(stdout,"id %s\n",(rtl::OUStringToOString(m_aId,RTL_TEXTENCODING_UTF8).getStr()));
     return true;
 }
 
@@ -886,18 +881,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 )
@@ -1065,7 +1048,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 4bdab80ec7..0a2134a25f 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 =