diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-10 09:51:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-10 10:09:59 +0200 |
commit | 3915ffc46fc063fa1f9be68c29a4157984f1bdb3 (patch) | |
tree | abbd427b68c7d683125e60b26340c2e5e83b852c /tools/source | |
parent | 4358dc795cbd2b49aa87c89795cf63413b82400c (diff) |
loplugin:constantparam in tools
Change-Id: Ibd093ba4e8140ed3fda87ef340280433302f82a5
Diffstat (limited to 'tools/source')
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 7 | ||||
-rw-r--r-- | tools/source/ref/pstm.cxx | 29 |
2 files changed, 9 insertions, 27 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 1756bff71880..e8b026012705 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -3656,8 +3656,8 @@ bool INetURLObject::operator ==(INetURLObject const & rObject) const rObject.GetHost(NO_DECODE)) || GetPort() != rObject.GetPort() || HasParam() != rObject.HasParam() - || GetParam(NO_DECODE) != rObject.GetParam(NO_DECODE) - || GetMsgId(NO_DECODE) != INetURLObject::GetMsgId(NO_DECODE)) + || GetParam() != rObject.GetParam() + || GetMsgId() != INetURLObject::GetMsgId(NO_DECODE)) return false; OUString aPath1(GetURLPath(NO_DECODE)); OUString aPath2(rObject.GetURLPath(NO_DECODE)); @@ -4528,8 +4528,7 @@ OUString INetURLObject::getFSysPath(FSysStyle eStyle, } } -OUString INetURLObject::GetMsgId(DecodeMechanism, - rtl_TextEncoding) +OUString INetURLObject::GetMsgId(rtl_TextEncoding) { return OUString(); } diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 47dc22e40949..6c10aaace559 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -70,33 +70,16 @@ SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream, Ind SvPersistStream::~SvPersistStream() { - SetStream( nullptr ); + ClearStream(); } -/** - - @param pStream This stream is used as the medium for PersistStream - - @warning pStream is used as the medium for PersistStream. - It must not be manipulated while used in SvPersistStream. - An Exception to this is pvStream (cf. <SvPersistStream::SetStream>). -*/ -void SvPersistStream::SetStream( SvStream * pStream ) +void SvPersistStream::ClearStream() { - if( pStm != pStream ) - { - if( pStm ) - { - SyncSysStream(); - pStm->SetError( GetError() ); - } - pStm = pStream; - } - if( pStm ) + if( pStm != nullptr ) { - SetVersion( pStm->GetVersion() ); - SetError( pStm->GetError() ); - SyncSvStream( pStm->Tell() ); + SyncSysStream(); + pStm->SetError( GetError() ); + pStm = nullptr; } } |