sw/source/filter/html/htmlfly.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d63f42bd2a5827a47e7aeae78dfb53da8c718934
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Nov 25 12:11:24 2016 +0200
declaration of nAllFlags shadows a member of 'this' [-Werror=shadow]
Change-Id: Ifb5adba642e777e5d515c6088c128d31778ecaff
diff --git a/sw/source/filter/html/htmlfly.cxx
b/sw/source/filter/html/htmlfly.cxx
index 14cd01e..700c7d7 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -37,13 +37,13 @@ using namespace css;
SwHTMLPosFlyFrame::SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly,
const SdrObject *pSdrObj,
- AllHtmlFlags nAllFlags ) :
+ AllHtmlFlags nFlags ) :
pFrameFormat( &rPosFly.GetFormat() ),
pSdrObject( pSdrObj ),
pNdIdx( new SwNodeIndex( rPosFly.GetNdIndex() ) ),
nOrdNum( rPosFly.GetOrdNum() ),
nContentIdx( 0 ),
- nAllFlags( nAllFlags )
+ nAllFlags( nFlags )
{
const SwFormatAnchor& rAnchor = rPosFly.GetFormat().GetAnchor();
if ((FLY_AT_CHAR == rAnchor.GetAnchorId()) &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
