summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-27 12:08:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-03-27 15:49:23 +0200
commit19ca4e8a5eb40f3c776a8089a4a043e7fe4a9247 (patch)
tree55cec71f8035471f350f4b439b7f4202f224e1af /editeng
parent41282255d94bfea01c7f1f5feded9c9e2dc4b178 (diff)
Resolves: tdf#116540 Revert "ofz infinite loop"
This reverts commit e4551b905e12aa92b7509d9b994bfae5dec3d8e0. Change-Id: I95634dd166c51586b5da47b996993a098823ca32 Reviewed-on: https://gerrit.libreoffice.org/51941 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
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 6c4ff8b887df..1b0efa0617b0 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -288,11 +288,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 )
{
@@ -375,7 +372,6 @@ void SvxRTFParser::ReadStyleTable()
}
break;
}
- bLooping = nCurrentTokenIndex == m_nTokenIndex;
}
pStyle.reset(); // Delete the Last Style
SkipToken(); // the closing brace is evaluated "above"