editeng/source/rtf/svxrtf.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 3c5addae5c1bb88c308dbacd545ca52d597e39fb
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 11 21:12:34 2017 +0000
ofz: Timeout give up earlier on SvParserState::Error
Change-Id: I191f935c11bc59e0b1a990ac5d3c38a49390afd1
Reviewed-on: https://gerrit.libreoffice.org/44644
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 568abc078757..b62940dfc8b3 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -127,12 +127,13 @@ void SvxRTFParser::Continue( int nToken )
{
SvRTFParser::Continue( nToken );
- if( SvParserState::Pending != GetStatus() )
+ SvParserState eStatus = GetStatus();
+ if (eStatus != SvParserState::Pending && eStatus != SvParserState::Error)
{
SetAllAttrOfStk();
//Regardless of what "color 0" is, word defaults to auto as the default
colour.
//e.g. see #i7713#
- }
+ }
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
