summaryrefslogtreecommitdiff
path: root/svtools/source/svrtf
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2002-04-16 16:06:23 +0000
committerCaolán McNamara <cmc@openoffice.org>2002-04-16 16:06:23 +0000
commitbc09511f2606567e3f9a351fb023c415e6bbb03e (patch)
tree0b232d452403b1dfbe145f31e290ef2d25b2da76 /svtools/source/svrtf
parent6a00b2b712679ab552c65a43a659db3af6a5f192 (diff)
#i3584# take \uc0 at its word, i.e. skip 0 bytes
Diffstat (limited to 'svtools/source/svrtf')
-rw-r--r--svtools/source/svrtf/parrtf.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index d58fb5537d5e..141db34b45c6 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: parrtf.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2001-11-27 16:22:04 $
+ * last change: $Author: cmc $ $Date: 2002-04-16 17:06:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -205,12 +205,18 @@ int SvRTFParser::_GetNextToken()
if( 0 <= nTokenValue )
{
nUCharOverread = (BYTE)nTokenValue;
+#if 1
+ //cmc: other ifdef breaks #i3584
+ aParserStates[ aParserStates.Count()-1].
+ nUCharOverread = nUCharOverread;
+#else
if( !nUCharOverread )
nUCharOverread = aParserStates[
aParserStates.Count()-1].nUCharOverread;
else
aParserStates[ aParserStates.Count()-1].
nUCharOverread = nUCharOverread;
+#endif
}
// read next token
nRet = 0;