compilerplugins/clang/virtualdead.unusedparams.results | 3 --- sw/source/core/inc/SwXMLTextBlocks.hxx | 2 +- sw/source/core/inc/swblocks.hxx | 2 +- sw/source/core/swg/SwXMLTextBlocks.cxx | 2 +- sw/source/core/swg/swblocks.cxx | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 4c1ad48b4203f995dd7a7a3ac177e1ca010c252d Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Oct 17 13:49:00 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Oct 18 09:40:38 2019 +0200 loplugin:virtualdead unused param in SwImpBlocks::Rename Change-Id: Ifed3e1e89a2d67b08d96d89424e83c49160cb3fe Reviewed-on: https://gerrit.libreoffice.org/81010 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 1f333031f148..5e0802e4a386 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -328,9 +328,6 @@ sw/source/core/access/acccontext.hxx:348 sw/source/core/inc/flowfrm.hxx:145 _Bool SwFlowFrame::ShouldBwdMoved(class SwLayoutFrame *,_Bool,_Bool &,) 101 -sw/source/core/inc/swblocks.hxx:109 - class ErrCode SwImpBlocks::Rename(unsigned short,const class rtl::OUString &,const class rtl::OUString &,) - 110 sw/source/core/inc/txmsrt.hxx:145 void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwIndex &,unsigned short,const class SwRootFrame *const,)const 1100 diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 47589cc01d91..3d1feb1ec01c 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -57,7 +57,7 @@ public: static OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks() override; virtual ErrCode Delete( sal_uInt16 ) override; - virtual ErrCode Rename( sal_uInt16, const OUString&, const OUString& ) override; + virtual ErrCode Rename( sal_uInt16, const OUString& ) override; virtual void ClearDoc() override; virtual ErrCode GetDoc( sal_uInt16 ) override; virtual ErrCode BeginPutDoc( const OUString&, const OUString& ) override; diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index ae20aac45b82..0d7fdb294aba 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -106,7 +106,7 @@ public: void SetBaseURL( const OUString& rURL ) { m_sBaseURL = rURL; } virtual ErrCode Delete( sal_uInt16 ) = 0; - virtual ErrCode Rename( sal_uInt16, const OUString&, const OUString& ) = 0; + virtual ErrCode Rename( sal_uInt16, const OUString& ) = 0; virtual ErrCode GetDoc( sal_uInt16 ) = 0; virtual ErrCode BeginPutDoc( const OUString&, const OUString& ) = 0; virtual ErrCode PutDoc() = 0; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 2a74d155751d..a46d7d67039d 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -184,7 +184,7 @@ ErrCode SwXMLTextBlocks::Delete( sal_uInt16 n ) return ERRCODE_NONE; } -ErrCode SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const OUString& rNewShort, const OUString& ) +ErrCode SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const OUString& rNewShort ) { OSL_ENSURE( xBlkRoot.is(), "No storage set" ); if(!xBlkRoot.is()) diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index ace092727f1a..8afeecea9432 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -339,7 +339,7 @@ void SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l ) { // Set the new entry in the list before we do that! aNew = GetAppCharClass().uppercase( aNew ); - nErr = pImp->Rename( n, aNew, aLong ); + nErr = pImp->Rename( n, aNew ); if( !nErr ) { bool bOnlyText = pImp->m_aNames[ n ]->bIsOnlyText; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits