summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-27 12:08:15 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-04-05 16:22:00 +0200
commit35f5f4c1537eadab85cddde5f9fd47a7421ebf3d (patch)
tree4f63d6efde3544f6c6908d6f06e16011e99c67bf /editeng
parent7127598586faf612250129f1914c8a0ee9de5a5a (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>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/rtf/svxrtf.cxx6
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"