mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedmethods unused return value in idl

Browse Source 
Change-Id: I790fea8b88ca99d17de14f1e91081671422dd8db
This commit is contained in:
Noel Grandin
2016-01-11 13:31:24 +02:00
parent 0980a6207d
commit ea5b48e9da
7 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
idl/inc/basobj.hxx
View File

@@ -128,7 +128,7 @@ public:
void Push( SvMetaObject * pObj ) void Push( SvMetaObject * pObj )
{ aList.push_back( pObj ); } { aList.push_back( pObj ); }
SvMetaObject * Pop() { return aList.pop_back(); } void Pop() { aList.pop_back(); }
SvMetaObject * Get( std::function<bool ( const SvMetaObject* )> isSvMetaObject ) SvMetaObject * Get( std::function<bool ( const SvMetaObject* )> isSvMetaObject )
{ {
for( SvMetaObjectMemberList::reverse_iterator it = aList.rbegin(); it != aList.rend(); ++it ) for( SvMetaObjectMemberList::reverse_iterator it = aList.rbegin(); it != aList.rend(); ++it )
@@ -200,7 +200,7 @@ public:
SvMetaModule * GetModule() const; SvMetaModule * GetModule() const;
const SvGlobalName &GetUUId() const; void GetUUId() const;
void SetModule( SvIdlDataBase & rBase ); void SetModule( SvIdlDataBase & rBase );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;

10
idl/inc/bastype.hxx
View File

@@ -79,8 +79,8 @@ public:
sal_uInt32 GetValue() const { return nValue; } sal_uInt32 GetValue() const { return nValue; }
void SetValue( sal_uInt32 nVal ) { nValue = nVal; } void SetValue( sal_uInt32 nVal ) { nValue = nVal; }
bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName, void ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
SvTokenStream & rInStm ); SvTokenStream & rInStm );
}; };
@@ -112,7 +112,7 @@ class SvHelpText : public SvString
{ {
public: public:
SvHelpText() {} SvHelpText() {}
bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
}; };
@@ -139,10 +139,6 @@ public:
return (r.nMajorVersion == nMajorVersion) return (r.nMajorVersion == nMajorVersion)
&& (r.nMinorVersion == nMinorVersion); && (r.nMinorVersion == nMinorVersion);
} }
bool operator != ( const SvVersion & r )
{
return !(*this == r);
}
bool ReadSvIdl( SvTokenStream & rInStm ); bool ReadSvIdl( SvTokenStream & rInStm );
}; };

2
idl/inc/database.hxx
View File

@@ -126,7 +126,7 @@ public:
SvMetaAttribute * SearchKnownAttr( const SvIdentifier& ); SvMetaAttribute * SearchKnownAttr( const SvIdentifier& );
SvMetaClass * ReadKnownClass( SvTokenStream & rInStm ); SvMetaClass * ReadKnownClass( SvTokenStream & rInStm );
void AddDepFile(OUString const& rFileName); void AddDepFile(OUString const& rFileName);
bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget); void WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
}; };
class SvIdlWorkingBase : public SvIdlDataBase class SvIdlWorkingBase : public SvIdlDataBase

4
idl/inc/hash.hxx
View File

@@ -79,8 +79,6 @@ public:
bool operator == ( const SvStringHashEntry & rRef ) bool operator == ( const SvStringHashEntry & rRef )
{ return nHashId == rRef.nHashId; } { return nHashId == rRef.nHashId; }
bool operator != ( const SvStringHashEntry & rRef )
{ return ! operator == ( rRef ); }
SvStringHashEntry & operator = ( const SvStringHashEntry & rRef ) SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
{ SvRefBase::operator=( rRef ); { SvRefBase::operator=( rRef );
aName = rRef.aName; aName = rRef.aName;
@@ -110,8 +108,6 @@ public:
bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
}; };
#endif // INCLUDED_IDL_INC_HASH_HXX #endif // INCLUDED_IDL_INC_HASH_HXX

3
idl/source/objects/basobj.cxx
View File

@@ -176,11 +176,10 @@ SvMetaModule * SvMetaExtern::GetModule() const
return pModule; return pModule;
} }
const SvGlobalName & SvMetaExtern::GetUUId() const void SvMetaExtern::GetUUId() const
{ {
if( aUUId == SvGlobalName() ) if( aUUId == SvGlobalName() )
GetModule()->FillNextName( &const_cast<SvMetaExtern *>(this)->aUUId ); GetModule()->FillNextName( &const_cast<SvMetaExtern *>(this)->aUUId );
return aUUId;
} }
void SvMetaExtern::SetModule( SvIdlDataBase & rBase ) void SvMetaExtern::SetModule( SvIdlDataBase & rBase )

14
idl/source/objects/bastype.cxx
View File

@@ -115,7 +115,7 @@ bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
return false; return false;
} }
bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase, void SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvStringHashEntry * pName, SvStringHashEntry * pName,
SvTokenStream & rInStm ) SvTokenStream & rInStm )
{ {
@@ -125,7 +125,7 @@ bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
if( rBase.FindId( getString(), &n ) ) if( rBase.FindId( getString(), &n ) )
{ {
nValue = n; nValue = n;
return true; return;
} }
else else
{ {
@@ -135,10 +135,9 @@ bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
rBase.WriteError( rInStm ); rBase.WriteError( rInStm );
} }
} }
return false;
} }
bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase, void SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) SvTokenStream & rInStm )
{ {
sal_uInt32 nTokPos = rInStm.Tell(); sal_uInt32 nTokPos = rInStm.Tell();
@@ -151,7 +150,7 @@ bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
{ {
setString(pTok->GetString()); setString(pTok->GetString());
nValue = n; nValue = n;
return true; return;
} }
else else
{ {
@@ -162,7 +161,6 @@ bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
} }
} }
rInStm.Seek( nTokPos ); rInStm.Seek( nTokPos );
return false;
} }
bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
@@ -192,9 +190,9 @@ bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
return false; return false;
} }
bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) void SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{ {
return SvString::ReadSvIdl( SvHash_HelpText(), rInStm ); SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
} }
bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )

3
idl/source/prj/database.cxx
View File

@@ -674,7 +674,7 @@ struct WriteDummy
} }
}; };
bool SvIdlDataBase::WriteDepFile( void SvIdlDataBase::WriteDepFile(
SvFileStream & rStream, OUString const& rTarget) SvFileStream & rStream, OUString const& rTarget)
{ {
rStream.WriteCharPtr( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr() ); rStream.WriteCharPtr( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr() );
@@ -682,7 +682,6 @@ bool SvIdlDataBase::WriteDepFile(
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream)); ::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream));
rStream.WriteCharPtr( "\n\n" ); rStream.WriteCharPtr( "\n\n" );
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDummy(rStream)); ::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDummy(rStream));
return rStream.GetError() == SVSTREAM_OK;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */