From e8260df1d67baf807771cd5c740164a227856515 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 20 Oct 2016 11:42:50 +0200 Subject: loplugin:expandablemethodds in sw(part2) Change-Id: Idc2118899a8063099b66c0f5db40d8402db063d1 Reviewed-on: https://gerrit.libreoffice.org/30083 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/source/filter/html/parcss1.cxx | 6 +++--- sw/source/filter/html/parcss1.hxx | 9 --------- sw/source/filter/html/swhtml.cxx | 2 +- sw/source/filter/html/swhtml.hxx | 1 - 4 files changed, 4 insertions(+), 14 deletions(-) (limited to 'sw/source/filter/html') diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 4ba013d8848d..b3d76b369a4b 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -84,11 +84,11 @@ sal_Unicode CSS1Parser::GetNextChar() if( c == '\n' ) { - IncLineNr(); - SetLinePos( 1L ); + ++nlLineNr; + nlLinePos = 1; } else - IncLinePos(); + ++nlLinePos; return c; } diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 51be36105fca..30b24ddbeb00 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -205,10 +205,6 @@ class CSS1Parser bool IsEOF() const { return bEOF; } - void IncLineNr() { ++nlLineNr; } - sal_uInt32 IncLinePos() { return ++nlLinePos; } - inline void SetLinePos( sal_uInt32 nlPos ); // inline declaration below - // parse parts of the grammar void ParseRule(); CSS1Selector *ParseSelector(); @@ -259,11 +255,6 @@ public: virtual ~CSS1Parser(); }; -inline void CSS1Parser::SetLinePos( sal_uInt32 nlPos ) -{ - nlLinePos = nlPos; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 81b6417e6db4..c790123b3b24 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1055,7 +1055,7 @@ void SwHTMLParser::NextToken( int nToken ) if( HTML_IFRAME_OFF == nToken ) { m_bCallNextToken = false; - EndFloatingFrame(); + m_bInFloatingFrame = false; } return; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 386f11fb6988..6ef39ce7dd88 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -715,7 +715,6 @@ private: void InsertParam(); // htmlplug.cxx void InsertFloatingFrame(); - void EndFloatingFrame() { m_bInFloatingFrame = false; } // -Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx) void InsertBodyOptions(); -- cgit v1.2.3