sw/source/filter/html/parcss1.cxx | 6 ++---- sw/source/filter/html/parcss1.hxx | 3 +-- sw/source/filter/html/svxcss1.cxx | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit 73fafa6a6f84c68516e6cbac8832e762b68de924 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Aug 13 13:28:41 2018 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Aug 14 11:15:23 2018 +0200 loplugin:returnconstant in SvxCSS1Parser Change-Id: I890fe1c116c487a6065f4b47d3f9cebe4803ef77 Reviewed-on: https://gerrit.libreoffice.org/58963 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 51bad26ca3ec..49dbbd40a3b7 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -1121,7 +1121,7 @@ CSS1Parser::~CSS1Parser() { } -bool CSS1Parser::ParseStyleSheet( const OUString& rIn ) +void CSS1Parser::ParseStyleSheet( const OUString& rIn ) { OUString aTmp( rIn ); @@ -1144,13 +1144,11 @@ bool CSS1Parser::ParseStyleSheet( const OUString& rIn ) aTmp = aTmp.copy( 0, aTmp.getLength() - 3 ); if( aTmp.isEmpty() ) - return true; + return; InitRead( aTmp ); ParseStyleSheet(); - - return true; } void CSS1Parser::ParseStyleOption( const OUString& rIn ) diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 77db909bdb70..5a737bc4daf0 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -219,9 +219,8 @@ protected: * or DeclarationParsed() need to be called afterwards * * @param rIn the style element as string - * @return true if ??? */ - bool ParseStyleSheet( const OUString& rIn ); + void ParseStyleSheet( const OUString& rIn ); /** parse the content of a HTML style option * diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 6e9d7ab2c92a..676792e75069 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -832,7 +832,7 @@ bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn ) pItemSet = pSheetItemSet.get(); pPropInfo = pSheetPropInfo.get(); - bool bSuccess = CSS1Parser::ParseStyleSheet( rIn ); + CSS1Parser::ParseStyleSheet( rIn ); for (std::unique_ptr<CSS1Selector> & rpSelector : m_Selectors) { @@ -847,7 +847,7 @@ bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn ) pItemSet = nullptr; pPropInfo = nullptr; - return bSuccess; + return true; } void SvxCSS1Parser::ParseStyleOption( const OUString& rIn, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits