diff options
author | jp <jp@openoffice.org> | 2000-11-08 15:00:25 +0000 |
---|---|---|
committer | jp <jp@openoffice.org> | 2000-11-08 15:00:25 +0000 |
commit | bc15a7d1d0394657362e898584997178be50bd20 (patch) | |
tree | 696f4119dfd66aa18481b740efb5cc0d39dc31fc /svx/source/svrtf/svxrtf.cxx | |
parent | 9574dc9061931fec2f35613069e5c6a45491cfb3 (diff) |
ReadInfo: brackets in text are allowed
Diffstat (limited to 'svx/source/svrtf/svxrtf.cxx')
-rw-r--r-- | svx/source/svrtf/svxrtf.cxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx index 73025447c204..09ccdb3b885c 100644 --- a/svx/source/svrtf/svxrtf.cxx +++ b/svx/source/svrtf/svxrtf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svxrtf.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:01:26 $ + * last change: $Author: jp $ $Date: 2000-11-08 16:00:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -623,11 +623,20 @@ String& SvxRTFParser::GetTextToEndGroup( String& rStr ) case '}': --nOpenBrakets; break; case '{': { - // gleich herausfiltern - ReadUnknownData(); - nToken = GetNextToken(); - if( '}' != nToken ) - eState = SVPAR_ERROR; + if( RTF_IGNOREFLAG != GetNextToken() ) + nToken = SkipToken( -1 ); + else if( RTF_UNKNOWNCONTROL != GetNextToken() ) + nToken = SkipToken( -2 ); + else + { + // gleich herausfiltern + ReadUnknownData(); + nToken = GetNextToken(); + if( '}' != nToken ) + eState = SVPAR_ERROR; + break; + } + ++nOpenBrakets; } break; |