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

Change-Id: I40354853ad44024c342babd3b706ce305a059ff4
This commit is contained in:
Stephan Bergmann
2012-08-13 14:57:39 +02:00
parent 0e10d1627d
commit 9272ce4e6f
10 changed files with 7 additions and 52 deletions

View File

@@ -61,30 +61,9 @@ namespace xmlsearch {
static RoleFiller roleFiller_; static RoleFiller roleFiller_;
sal_uInt32 m_nRefcount; sal_uInt32 m_nRefcount;
sal_uInt8 fixedRole_;
sal_Int16 filled_;
sal_Int32 begin_,end_,parentContext_,limit_;
RoleFiller* next_;
std::vector< RoleFiller* > fillers_; std::vector< RoleFiller* > fillers_;
}; };
class GeneratorHeap
{
public:
GeneratorHeap()
: heapSize_( 0 ),
free_( 0 )
{ }
private:
sal_Int32 heapSize_,free_;
};
} }
} }

View File

@@ -121,10 +121,9 @@ namespace xmlsearch {
{ {
public: 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 ), : penalty_( penalty ),
document_( document ), document_( document ),
termsL_( termsL ),
terms_( terms ) { } terms_( terms ) { }
~QueryHitData() { delete[] terms_; } ~QueryHitData() { delete[] terms_; }
@@ -140,7 +139,6 @@ namespace xmlsearch {
const rtl::OUString document_; const rtl::OUString document_;
sal_Int32 termsL_;
rtl::OUString* terms_; rtl::OUString* terms_;
}; // end class QueryHitData }; // end class QueryHitData

View File

@@ -42,8 +42,7 @@ namespace xmlsearch {
public: public:
Decompressor() Decompressor()
: toRead_( 0 ), : toRead_( 0 )
path_( 0 )
{ {
} }
@@ -61,7 +60,7 @@ namespace xmlsearch {
static const sal_Int32 BitsInByte; static const sal_Int32 BitsInByte;
static const sal_Int32 NBits; static const sal_Int32 NBits;
sal_Int32 readByte_, toRead_, path_; sal_Int32 toRead_;
}; };

View File

@@ -146,7 +146,6 @@ Databases::Databases( sal_Bool showBasic,
Reference< uno::XComponentContext > xContext ) Reference< uno::XComponentContext > xContext )
: m_xContext( xContext ), : m_xContext( xContext ),
m_bShowBasic(showBasic), m_bShowBasic(showBasic),
m_nErrorDocLength( 0 ),
m_pErrorDoc( 0 ), m_pErrorDoc( 0 ),
m_nCustomCSSDocLength( 0 ), m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ), m_pCustomCSSDoc( 0 ),
@@ -782,7 +781,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
listAnchor.realloc( id.size() ); listAnchor.realloc( id.size() );
listTitle.realloc( id.size() ); listTitle.realloc( id.size() );
int nSize = 0;
Dbt data; Dbt data;
DBData aDBData; DBData aDBData;
const sal_Char* pData = NULL; const sal_Char* pData = NULL;
@@ -793,7 +791,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
listId[i] = id[i]; listId[i] = id[i];
listAnchor[i] = anchor[i]; listAnchor[i] = anchor[i];
nSize = 0;
pData = pEmpty; pData = pEmpty;
if( pDb ) if( pDb )
{ {
@@ -804,7 +801,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
bool bSuccess = pDBHelp->getValueForKey( idi, aDBData ); bool bSuccess = pDBHelp->getValueForKey( idi, aDBData );
if( bSuccess ) if( bSuccess )
{ {
nSize = aDBData.getSize();
pData = aDBData.getData(); 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() ) ), Dbt key_( static_cast< void* >( const_cast< sal_Char* >( idi.getStr() ) ),
idi.getLength() ); idi.getLength() );
pDb->get( 0,&key_,&data,0 ); pDb->get( 0,&key_,&data,0 );
nSize = data.get_size();
pData = static_cast<sal_Char*>( data.get_data() ); pData = static_cast<sal_Char*>( data.get_data() );
} }
} }
DbtToStringConverter converter( pData, nSize ); DbtToStringConverter converter( pData );
rtl::OUString title = converter.getTitle(); rtl::OUString title = converter.getTitle();
pDatabases->replaceName( title ); pDatabases->replaceName( title );

View File

@@ -296,7 +296,6 @@ namespace chelp {
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA; com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA;
sal_Bool m_bShowBasic; sal_Bool m_bShowBasic;
int m_nErrorDocLength;
char* m_pErrorDoc; char* m_pErrorDoc;
int m_nCustomCSSDocLength; int m_nCustomCSSDocLength;

View File

@@ -90,7 +90,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
URLParameter& aURLParameter, URLParameter& aURLParameter,
Databases* pDatabases ) Databases* pDatabases )
: ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ), : ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ),
m_pDatabases( pDatabases ),
m_aURLParameter( aURLParameter ) m_aURLParameter( aURLParameter )
{ {
Reference< XTransliteration > xTrans( Reference< XTransliteration > xTrans(

View File

@@ -47,7 +47,6 @@ namespace chelp {
private: private:
Databases* m_pDatabases;
URLParameter m_aURLParameter; URLParameter m_aURLParameter;
}; };

View File

@@ -290,7 +290,6 @@ void URLParameter::readBerkeley()
DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false ); DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false );
bool bSuccess = false; bool bSuccess = false;
int nSize = 0;
const sal_Char* pData = NULL; const sal_Char* pData = NULL;
Dbt data; Dbt data;
@@ -311,7 +310,6 @@ void URLParameter::readBerkeley()
bSuccess = pDBHelp->getValueForKey( keyStr, aDBData ); bSuccess = pDBHelp->getValueForKey( keyStr, aDBData );
if( bSuccess ) if( bSuccess )
{ {
nSize = aDBData.getSize();
pData = aDBData.getData(); pData = aDBData.getData();
break; break;
} }
@@ -324,7 +322,6 @@ void URLParameter::readBerkeley()
if( err == 0 ) if( err == 0 )
{ {
bSuccess = true; bSuccess = true;
nSize = data.get_size();
pData = static_cast<sal_Char*>( data.get_data() ); pData = static_cast<sal_Char*>( data.get_data() );
break; break;
} }
@@ -333,7 +330,7 @@ void URLParameter::readBerkeley()
if( bSuccess ) if( bSuccess )
{ {
DbtToStringConverter converter( pData, nSize ); DbtToStringConverter converter( pData );
m_aTitle = converter.getTitle(); m_aTitle = converter.getTitle();
m_pDatabases->replaceName( m_aTitle ); m_pDatabases->replaceName( m_aTitle );
m_aPath = converter.getFile(); m_aPath = converter.getFile();

View File

@@ -48,9 +48,8 @@ namespace chelp {
{ {
public: public:
DbtToStringConverter( const sal_Char* ptr,sal_Int32 len ) DbtToStringConverter( const sal_Char* ptr )
: m_len( len ), : m_ptr( ptr )
m_ptr( ptr )
{ {
} }
@@ -109,8 +108,6 @@ namespace chelp {
private: private:
sal_Int32 m_len;
const sal_Char* m_ptr; const sal_Char* m_ptr;
}; };

View File

@@ -33,13 +33,6 @@ RoleFiller RoleFiller::roleFiller_;
RoleFiller::RoleFiller() RoleFiller::RoleFiller()
: m_nRefcount( 0 ), : m_nRefcount( 0 ),
fixedRole_( 0 ),
filled_( 0 ),
begin_( 0 ),
end_( 0 ),
parentContext_( 0 ),
limit_( 0 ),
next_( 0 ),
fillers_( 0 ) fillers_( 0 )
{ {
} }