-Werror,-Wunused-private-field (Clang towards 3.2)

Change-Id: I40354853ad44024c342babd3b706ce305a059ff4

10 files changed, 7 insertions, 52 deletions

diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 59cef1c70634..c0546e48beec 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -61,30 +61,9 @@ namespace xmlsearch {
             static RoleFiller roleFiller_;
 
             sal_uInt32     m_nRefcount;
-            sal_uInt8      fixedRole_;
-            sal_Int16      filled_;
-            sal_Int32      begin_,end_,parentContext_,limit_;
 
-            RoleFiller*    next_;
             std::vector< RoleFiller* > fillers_;
         };
-
-
-        class GeneratorHeap
-        {
-        public:
-
-            GeneratorHeap()
-                : heapSize_( 0 ),
-                  free_( 0 )
-            { }
-        private:
-
-            sal_Int32   heapSize_,free_;
-        };
-
-
-
     }
 }
 
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index 9a3eb4810e5f..b34fa76668a1 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -121,10 +121,9 @@ namespace xmlsearch {
         {
         public:
 
-            QueryHitData( double penalty,const rtl::OUString& document,sal_Int32 termsL, rtl::OUString* terms )
+            QueryHitData( double penalty,const rtl::OUString& document, rtl::OUString* terms )
                 : penalty_( penalty ),
                   document_( document ),
-                  termsL_( termsL ),
                   terms_( terms )      { }
 
             ~QueryHitData() { delete[] terms_; }
@@ -140,7 +139,6 @@ namespace xmlsearch {
 
             const rtl::OUString document_;
 
-            sal_Int32      termsL_;
             rtl::OUString* terms_;
 
         };  // end class QueryHitData
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 94b1ce86ddb5..44da18dc8961 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -42,8 +42,7 @@ namespace xmlsearch {
         public:
 
             Decompressor()
-                : toRead_( 0 ),
-                  path_( 0 )
+                : toRead_( 0 )
             {
             }
 
@@ -61,7 +60,7 @@ namespace xmlsearch {
             static const sal_Int32 BitsInByte;
             static const sal_Int32 NBits;
 
-            sal_Int32 readByte_, toRead_, path_;
+            sal_Int32 toRead_;
         };
 
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 69f02c10869d..ba26e5fbedca 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -146,7 +146,6 @@ Databases::Databases( sal_Bool showBasic,
                       Reference< uno::XComponentContext > xContext )
     : m_xContext( xContext ),
       m_bShowBasic(showBasic),
-      m_nErrorDocLength( 0 ),
       m_pErrorDoc( 0 ),
       m_nCustomCSSDocLength( 0 ),
       m_pCustomCSSDoc( 0 ),
@@ -782,7 +781,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
     listAnchor.realloc( id.size() );
     listTitle.realloc( id.size() );
 
-    int nSize = 0;
     Dbt data;
     DBData aDBData;
     const sal_Char* pData = NULL;
@@ -793,7 +791,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
 
-        nSize = 0;
         pData = pEmpty;
         if( pDb )
         {
@@ -804,7 +801,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
                 bool bSuccess = pDBHelp->getValueForKey( idi, aDBData );
                 if( bSuccess )
                 {
-                    nSize = aDBData.getSize();
                     pData = aDBData.getData();
                 }
             }
@@ -813,12 +809,11 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
                 Dbt key_( static_cast< void* >( const_cast< sal_Char* >( idi.getStr() ) ),
                          idi.getLength() );
                 pDb->get( 0,&key_,&data,0 );
-                nSize = data.get_size();
                 pData = static_cast<sal_Char*>( data.get_data() );
             }
         }
 
-        DbtToStringConverter converter( pData, nSize );
+        DbtToStringConverter converter( pData );
 
         rtl::OUString title = converter.getTitle();
         pDatabases->replaceName( title );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index f3153283e136..239896030d98 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -296,7 +296,6 @@ namespace chelp {
         com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 >      m_xSFA;
 
         sal_Bool m_bShowBasic;
-        int    m_nErrorDocLength;
         char*  m_pErrorDoc;
 
         int    m_nCustomCSSDocLength;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 240edffdba20..cd361c8d727d 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -90,7 +90,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                                       URLParameter& aURLParameter,
                                       Databases* pDatabases )
     : ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ),
-      m_pDatabases( pDatabases ),
       m_aURLParameter( aURLParameter )
 {
     Reference< XTransliteration > xTrans(
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index c24ba8dff91d..8f7d7f32d1e1 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -47,7 +47,6 @@ namespace chelp {
 
     private:
 
-        Databases*   m_pDatabases;
         URLParameter m_aURLParameter;
     };
 
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 2060c3dab3cd..39c72815a06e 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -290,7 +290,6 @@ void URLParameter::readBerkeley()
     DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false );
     bool bSuccess = false;
 
-    int nSize = 0;
     const sal_Char* pData = NULL;
 
     Dbt data;
@@ -311,7 +310,6 @@ void URLParameter::readBerkeley()
             bSuccess = pDBHelp->getValueForKey( keyStr, aDBData );
             if( bSuccess )
             {
-                nSize = aDBData.getSize();
                 pData = aDBData.getData();
                 break;
             }
@@ -324,7 +322,6 @@ void URLParameter::readBerkeley()
             if( err == 0 )
             {
                 bSuccess = true;
-                nSize = data.get_size();
                 pData = static_cast<sal_Char*>( data.get_data() );
                 break;
             }
@@ -333,7 +330,7 @@ void URLParameter::readBerkeley()
 
     if( bSuccess )
     {
-        DbtToStringConverter converter( pData, nSize );
+        DbtToStringConverter converter( pData );
         m_aTitle = converter.getTitle();
         m_pDatabases->replaceName( m_aTitle );
         m_aPath  = converter.getFile();
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 63b8dd839865..775e8330bfea 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -48,9 +48,8 @@ namespace chelp {
     {
     public:
 
-        DbtToStringConverter( const sal_Char* ptr,sal_Int32 len )
-            : m_len( len ),
-              m_ptr( ptr )
+        DbtToStringConverter( const sal_Char* ptr )
+            : m_ptr( ptr )
         {
         }
 
@@ -109,8 +108,6 @@ namespace chelp {
 
     private:
 
-        sal_Int32 m_len;
-
         const sal_Char* m_ptr;
 
     };
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index ebbc4575aeee..e64ddc7f817e 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -33,13 +33,6 @@ RoleFiller RoleFiller::roleFiller_;
 
 RoleFiller::RoleFiller()
     : m_nRefcount( 0 ),
-      fixedRole_( 0 ),
-      filled_( 0 ),
-      begin_( 0 ),
-      end_( 0 ),
-      parentContext_( 0 ),
-      limit_( 0 ),
-      next_( 0 ),
       fillers_( 0 )
 {
 }