diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-05-29 14:49:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-05-29 14:49:28 +0000 |
| commit | b06b3b51dce5b2ec1a03cb49ba19412b5a750175 (patch) | |
| tree | 5fa3749c56ccea96c693e04a42b0399f70ef29b9 | |
| parent | 674c0f41b8a19c2a88edd41d0466a6562b8f80c4 (diff) | |
INTEGRATION: CWS os97 (1.30.308); FILE MERGED
2007/05/15 12:17:28 hbrinkm 1.30.308.1: #i76140# applied patch
| -rw-r--r-- | svx/source/svrtf/rtfitem.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx index 3ac0ba3fe10b..025b1e72120d 100644 --- a/svx/source/svrtf/rtfitem.cxx +++ b/svx/source/svrtf/rtfitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: rtfitem.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: kz $ $Date: 2007-05-10 14:59:59 $ + * last change: $Author: rt $ $Date: 2007-05-29 15:49:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1165,6 +1165,19 @@ ATTR_SETEMPHASIS: { nToken = SkipToken( -2 ); ReadTabAttr( nToken, *pSet ); + + /* + cmc: #i76140, he who reads the { must read the } + We rewound to a state of { being the current + token so it is our responsibility to read the } + token. + */ + if (nToken == BRACELEFT) + { + nToken = GetNextToken(); + DBG_ASSERT( nToken == BRACERIGHT, + "} did not follow { as expected\n"); + } } else if( (nToken & ~(0xff| RTF_SWGDEFS)) == RTF_BRDRDEF) { |