summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlfly.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-25 12:11:24 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-25 12:11:24 +0200
commitd63f42bd2a5827a47e7aeae78dfb53da8c718934 (patch)
tree07ac58ef23ac9d944c563d7286ffc574349bcc13 /sw/source/filter/html/htmlfly.cxx
parentb19e71231322a6790759135f3aaab6499d6293dd (diff)
declaration of nAllFlags shadows a member of 'this' [-Werror=shadow]
Change-Id: Ifb5adba642e777e5d515c6088c128d31778ecaff
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
-rw-r--r--sw/source/filter/html/htmlfly.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 14cd01e707a2..700c7d7bc81f 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()) &&