Skip to content

C
core
Kaydet (Commit) ee025b74 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:returnconstant in tools,comphelper,unotools 

Change-Id: Iabc3c67b4cdcd0344a37c533bf92dd00cd4700d8
Reviewed-on: https://gerrit.libreoffice.org/57974
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 1c56d5fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 39 deletions
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
Dosyayı görüntüle @ ee025b74
......@@ -115,12 +115,10 @@ DrawViewWrapper::DrawViewWrapper(
{
SvtLinguConfig aLinguConfig;
SvtLinguOptions aLinguOptions;
if ( aLinguConfig.GetOptions( aLinguOptions ) )
{
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage, EE_CHAR_LANGUAGE ) );
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK ) );
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL ) );
}
aLinguConfig.GetOptions( aLinguOptions );
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage, EE_CHAR_LANGUAGE ) );
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK ) );
pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL ) );
// set font height without changing SdrEngineDefaults
pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt
......
comphelper/source/misc/logging.cxx
Dosyayı görüntüle @ ee025b74
......@@ -110,7 +110,7 @@ namespace comphelper
}
bool EventLogger::impl_log( const sal_Int32 _nLogLevel,
void EventLogger::impl_log( const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage,
const OptionalString& _rArgument1, const OptionalString& _rArgument2,
const OptionalString& _rArgument3, const OptionalString& _rArgument4,
......@@ -157,8 +157,6 @@ namespace comphelper
{
OSL_FAIL( "EventLogger::impl_log: caught an exception!" );
}
return false;
}
} // namespace comphelper
......
connectivity/source/inc/java/sql/ConnectionLog.hxx
Dosyayı görüntüle @ ee025b74
......@@ -85,39 +85,39 @@ namespace connectivity { namespace java { namespace sql {
sal_Int32 getObjectID() const { return m_nObjectID; }
/// logs a given message, without any arguments, or source class/method names
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage )
void log( const sal_Int32 _nLogLevel, const OUString& rMessage )
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID );
}
template< typename ARGTYPE1 >
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1 ) const
void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1 ) const
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1 );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1 );
}
template< typename ARGTYPE1, typename ARGTYPE2 >
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2 );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3 );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
}
};
......
include/comphelper/logging.hxx
Dosyayı görüntüle @ ee025b74
This diff is collapsed.
include/tools/b3dtrans.hxx
Dosyayı görüntüle @ ee025b74
......@@ -190,7 +190,7 @@ public:
private:
void CalcNewViewportValues();
bool CalcFocalLength();
void CalcFocalLength();
virtual void DeviceRectangleChange() override;
......
include/tools/stream.hxx
Dosyayı görüntüle @ ee025b74
......@@ -195,7 +195,7 @@ protected:
// encrypt and write in blocks
std::size_t CryptAndWriteBuffer( const void* pStart, std::size_t nLen );
bool EncryptBuffer( void* pStart, std::size_t nLen ) const;
void EncryptBuffer( void* pStart, std::size_t nLen ) const;
public:
SvStream();
......
include/tools/urlobj.hxx
Dosyayı görüntüle @ ee025b74
......@@ -1102,7 +1102,7 @@ private:
// Query:
bool clearQuery();
void clearQuery();
bool setQuery(
OUString const & rTheQuery,
......@@ -1298,9 +1298,12 @@ inline bool INetURLObject::SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
return rTheQuery.isEmpty() ?
clearQuery() :
setQuery(rTheQuery, eMechanism, eCharset);
if (rTheQuery.isEmpty())
{
clearQuery();
return false;
}
return setQuery(rTheQuery, eMechanism, eCharset);
}
inline bool INetURLObject::SetMark(OUString const & rTheFragment,
......
include/unotools/lingucfg.hxx
Dosyayı görüntüle @ ee025b74
......@@ -179,7 +179,7 @@ public:
bool SetProperty( sal_Int32 nPropertyHandle,
const css::uno::Any &rValue );
bool GetOptions( SvtLinguOptions &rOptions ) const;
void GetOptions( SvtLinguOptions &rOptions ) const;
bool IsReadOnly( const OUString &rPropertyName ) const;
......
tools/source/fsys/urlobj.cxx
Dosyayı görüntüle @ ee025b74
......@@ -3304,17 +3304,16 @@ bool INetURLObject::insertName(OUString const & rTheName,
RTL_TEXTENCODING_UTF8);
}
bool INetURLObject::clearQuery()
void INetURLObject::clearQuery()
{
if (HasError())
return false;
return;
if (m_aQuery.isPresent())
{
lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1,
m_aQuery.getLength() + 1);
m_aFragment += m_aQuery.clear() - 1;
}
return false;
}
bool INetURLObject::setQuery(OUString const & rTheQuery,
......
tools/source/generic/b3dtrans.cxx
Dosyayı görüntüle @ ee025b74
......@@ -429,8 +429,7 @@ void B3dCamera::CalcNewViewportValues()
aNewVUV.normalize();
SetViewportValues(aPosition, aNewVPN, aNewVUV);
if(CalcFocalLength())
SetViewportValues(aCorrectedPosition, aNewVPN, aNewVUV);
CalcFocalLength();
if(fBankAngle != 0.0)
{
......@@ -444,7 +443,7 @@ void B3dCamera::CalcNewViewportValues()
}
}
bool B3dCamera::CalcFocalLength()
void B3dCamera::CalcFocalLength()
{
double fWidth = GetDeviceRectangleWidth();
......@@ -455,7 +454,6 @@ bool B3dCamera::CalcFocalLength()
fFocalLength = aOldPosition.getZ() / fWidth * 35.0;
if(fFocalLength < 5.0)
fFocalLength = 5.0;
return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
tools/source/stream/stream.cxx
Dosyayı görüntüle @ ee025b74
......@@ -1500,7 +1500,7 @@ std::size_t SvStream::CryptAndWriteBuffer( const void* pStart, std::size_t nLen)
return nCount;
}
bool SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
void SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
{
unsigned char* pTemp = static_cast<unsigned char*>(pStart);
unsigned char nMask = m_nCryptMask;
......@@ -1512,7 +1512,6 @@ bool SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
aCh ^= nMask;
*pTemp = aCh;
}
return true;
}
static unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersion)
......
unotools/source/config/lingucfg.cxx
Dosyayı görüntüle @ ee025b74
......@@ -867,10 +867,9 @@ bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rVa
return GetConfigItem().SetProperty( nPropertyHandle, rValue );
}
bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
void SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
rOptions = GetConfigItem().GetOptions();
return true;
}
bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment