From 46c67c43236a8250e56d6af1a1caada73e8abb70 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 4 Mar 2016 12:20:58 +0200 Subject: loplugin:unuseddefaultparam in tools Change-Id: I027f4d53e3aa793bd61bf110899e464a9b6430ec Reviewed-on: https://gerrit.libreoffice.org/22891 Tested-by: Jenkins Reviewed-by: Noel Grandin --- tools/source/fsys/urlobj.cxx | 37 +++++++++++++++++-------------------- tools/source/memtools/multisel.cxx | 22 +++++----------------- tools/source/stream/stream.cxx | 5 +++-- 3 files changed, 25 insertions(+), 39 deletions(-) (limited to 'tools') diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 597ecfdec43a..083c8e2a1b32 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -3700,8 +3700,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, OUString const & rThePassword, OUString const & rTheHost, sal_uInt32 nThePort, - OUString const & rThePath, - EncodeMechanism eMechanism) + OUString const & rThePath) { setInvalid(); m_eScheme = eTheScheme; @@ -3720,7 +3719,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, { m_aUser.set(m_aAbsURIRef, encodeText(rTheUser, false, PART_USER_PASSWORD, - eMechanism, RTL_TEXTENCODING_UTF8, false), + WAS_ENCODED, RTL_TEXTENCODING_UTF8, false), m_aAbsURIRef.getLength()); bUserInfo = true; } @@ -3737,7 +3736,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, m_aAbsURIRef.append(':'); m_aAuth.set(m_aAbsURIRef, encodeText(rThePassword, false, PART_USER_PASSWORD, - eMechanism, RTL_TEXTENCODING_UTF8, false), + WAS_ENCODED, RTL_TEXTENCODING_UTF8, false), m_aAbsURIRef.getLength()); bUserInfo = true; } @@ -3784,7 +3783,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, } if (!parseHostOrNetBiosName( aSynHost.getStr(), aSynHost.getStr() + aSynHost.getLength(), - false, eMechanism, RTL_TEXTENCODING_UTF8, bNetBiosName, &aSynHost)) + false, WAS_ENCODED, RTL_TEXTENCODING_UTF8, bNetBiosName, &aSynHost)) { setInvalid(); return false; @@ -3816,7 +3815,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, OUStringBuffer aSynPath; sal_Unicode const * p = rThePath.getStr(); sal_Unicode const * pEnd = p + rThePath.getLength(); - if (!parsePath(m_eScheme, &p, pEnd, false, eMechanism, RTL_TEXTENCODING_UTF8, false, '/', + if (!parsePath(m_eScheme, &p, pEnd, false, WAS_ENCODED, RTL_TEXTENCODING_UTF8, false, '/', 0x80000000, 0x80000000, 0x80000000, aSynPath) || p != pEnd) { @@ -3854,11 +3853,11 @@ OUString INetURLObject::GetAbsURL(OUString const & rTheBaseURIRef, rTheRelURIRef; } -OUString INetURLObject::getExternalURL(DecodeMechanism eMechanism) const +OUString INetURLObject::getExternalURL() const { OUString aTheExtURIRef; translateToExternal( - m_aAbsURIRef.toString(), aTheExtURIRef, eMechanism); + m_aAbsURIRef.toString(), aTheExtURIRef); return aTheExtURIRef; } @@ -4012,8 +4011,7 @@ OUString INetURLObject::getName(sal_Int32 nIndex, bool bIgnoreFinalSlash, } bool INetURLObject::setName(OUString const & rTheName, sal_Int32 nIndex, - bool bIgnoreFinalSlash, - EncodeMechanism eMechanism) + bool bIgnoreFinalSlash) { SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash)); if (!aSegment.isPresent()) @@ -4035,17 +4033,17 @@ bool INetURLObject::setName(OUString const & rTheName, sal_Int32 nIndex, OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pSegBegin - pPathBegin); aNewPath.append(encodeText(rTheName, false, PART_PCHAR, - eMechanism, RTL_TEXTENCODING_UTF8, true)); + WAS_ENCODED, RTL_TEXTENCODING_UTF8, true)); aNewPath.append(p, pPathEnd - p); return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } -bool INetURLObject::hasExtension(sal_Int32 nIndex) +bool INetURLObject::hasExtension() const { - SubString aSegment(getSegment(nIndex, true/*bIgnoreFinalSlash*/)); + SubString aSegment(getSegment(LAST_SEGMENT, true/*bIgnoreFinalSlash*/)); if (!aSegment.isPresent()) return false; @@ -4862,7 +4860,7 @@ bool INetURLObject::scanIPv6reference(sal_Unicode const *& rBegin, return false; } -OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism) +OUString INetURLObject::GetPartBeforeLastName() const { if (!checkHierarchical()) @@ -4872,7 +4870,7 @@ OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism) aTemp.clearQuery(); aTemp.removeSegment(LAST_SEGMENT, false); aTemp.setFinalSlash(); - return aTemp.GetMainURL(eMechanism); + return aTemp.GetMainURL(DECODE_TO_IURI); } OUString INetURLObject::GetLastName(DecodeMechanism eMechanism, @@ -4948,15 +4946,14 @@ void INetURLObject::SetName(OUString const & rTheName, *this = aTemp; } -void INetURLObject::SetExtension(OUString const & rTheExtension, - EncodeMechanism eMechanism) +void INetURLObject::SetExtension(OUString const & rTheExtension) { - setExtension(rTheExtension, LAST_SEGMENT, false, eMechanism); + setExtension(rTheExtension, LAST_SEGMENT, false); } -OUString INetURLObject::CutExtension(DecodeMechanism eMechanism) +OUString INetURLObject::CutExtension() { - OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism)); + OUString aTheExtension(getExtension(LAST_SEGMENT, false)); return removeExtension(LAST_SEGMENT, false) ? aTheExtension : OUString(); } diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index e0b72076c511..25599212b9a4 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -432,26 +432,14 @@ long MultiSelection::ImplFwdUnselected() return SFX_ENDOFSELECTION; } -long MultiSelection::FirstSelected( bool bInverse ) +long MultiSelection::FirstSelected() { - bInverseCur = bInverse; + bInverseCur = false; nCurSubSel = 0; - if ( bInverseCur ) - { - bCurValid = nSelCount < sal_uIntPtr(aTotRange.Len()); - if ( bCurValid ) - { - nCurIndex = 0; - return ImplFwdUnselected(); - } - } - else - { - bCurValid = !aSels.empty(); - if ( bCurValid ) - return nCurIndex = aSels[ 0 ]->Min(); - } + bCurValid = !aSels.empty(); + if ( bCurValid ) + return nCurIndex = aSels[ 0 ]->Min(); return SFX_ENDOFSELECTION; } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index cdf59a659b85..26b2e2f05a95 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1937,7 +1937,7 @@ void SvMemoryStream::FreeMemory() delete[] pBuf; } -void* SvMemoryStream::SwitchBuffer( sal_Size nInitSize) +void* SvMemoryStream::SwitchBuffer() { Flush(); if( !bOwnsData ) @@ -1955,7 +1955,8 @@ void* SvMemoryStream::SwitchBuffer( sal_Size nInitSize) ResetError(); - if( nInitSize && !AllocateMemory(nInitSize) ) + sal_Size nInitSize = 512; + if( !AllocateMemory(nInitSize) ) { SetError( SVSTREAM_OUTOFMEMORY ); nSize = 0; -- cgit v1.2.3