sw/source/core/layout/layact.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a74dab375e894c3b87f5279cd7c43c26e4c79bb4
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jun 8 17:23:30 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jun 9 20:44:38 2021 +0200
-Werror,-Wunused-but-set-variable (Clang 13 trunk)
Since 20e5f64215853bdd32c5f16394ba7f2f36745904 "loplugin:unused-returns in
sw"
removed
> return bChanged || bTabChanged;
from the end of SwLayAction::FormatLayoutFly, bTabChanged is effectively
completely unused (and now gets warned about by Clang), and the update of
bChanged is apparently no longer used, either.
Change-Id: Iab180e83070c45531aecf46d85a030463cf7b22d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116853
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 0ab451c111a0..4e95504f07ef 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1430,16 +1430,15 @@ void SwLayAction::FormatLayoutFly( SwFlyFrame* pFly )
return;
// Now, deal with the lowers that are LayoutFrames
- bool bTabChanged = false;
SwFrame *pLow = pFly->Lower();
while ( pLow )
{
if ( pLow->IsLayoutFrame() )
{
if ( pLow->IsTabFrame() )
- bTabChanged |= FormatLayoutTab(
static_cast<SwTabFrame*>(pLow), bAddRect );
+ FormatLayoutTab( static_cast<SwTabFrame*>(pLow), bAddRect );
else
- bChanged |= FormatLayout( m_pImp->GetShell()->GetOut(),
static_cast<SwLayoutFrame*>(pLow), bAddRect );
+ FormatLayout( m_pImp->GetShell()->GetOut(),
static_cast<SwLayoutFrame*>(pLow), bAddRect );
}
pLow = pLow->GetNext();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
