From 3b4b5b3ffaa03919a66aef2ec84dfa6d3267b4e1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 27 Mar 2018 12:08:15 +0100 Subject: Resolves: tdf#116540 Revert "ofz infinite loop" This reverts commit e4551b905e12aa92b7509d9b994bfae5dec3d8e0. Change-Id: I95634dd166c51586b5da47b996993a098823ca32 Reviewed-on: https://gerrit.libreoffice.org/51942 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit 35f5f4c1537eadab85cddde5f9fd47a7421ebf3d) --- editeng/source/rtf/svxrtf.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'editeng') diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index b62940dfc8b3..9a68c79a296c 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -295,11 +295,8 @@ void SvxRTFParser::ReadStyleTable() bIsInReadStyleTab = true; bChkStyleAttr = false; // Do not check Attribute against the Styles - bool bLooping = false; - - while (_nOpenBrakets && IsParserWorking() && !bLooping) + while( _nOpenBrakets && IsParserWorking() ) { - auto nCurrentTokenIndex = m_nTokenIndex; int nToken = GetNextToken(); switch( nToken ) { @@ -382,7 +379,6 @@ void SvxRTFParser::ReadStyleTable() } break; } - bLooping = nCurrentTokenIndex == m_nTokenIndex; } pStyle.reset(); // Delete the Last Style SkipToken(); // the closing brace is evaluated "above" -- cgit v1.2.3