diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-27 12:08:15 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-12 10:54:34 +0200 |
| commit | 3b4b5b3ffaa03919a66aef2ec84dfa6d3267b4e1 (patch) | |
| tree | 00795fe5b0a0d2e6cb4fecba618da55a7ffb479b /editeng | |
| parent | c483ed87ec89e17aaebbae0a99c0246be374c1c2 (diff) | |
Resolves: tdf#116540 Revert "ofz infinite loop"
This reverts commit e4551b905e12aa92b7509d9b994bfae5dec3d8e0.
Change-Id: I95634dd166c51586b5da47b996993a098823ca32
Reviewed-on: https://gerrit.libreoffice.org/51942
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 35f5f4c1537eadab85cddde5f9fd47a7421ebf3d)
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
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" |