diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-27 13:38:11 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-27 13:38:11 +0000 |
commit | 887738493850be9a6607d15841045f5531d3d2b9 (patch) | |
tree | fcb3f444ec10d2b8a1134dbb80461ff73005e120 /sw/source/core/text/porfld.cxx | |
parent | 59120af8fe98ffcc41899d66050cca7b036771be (diff) |
INTEGRATION: CWS swqbf50 (1.52.140); FILE MERGED
2006/01/11 09:58:13 fme 1.52.140.1: #i59759 Erase control characters from field string
Diffstat (limited to 'sw/source/core/text/porfld.cxx')
-rw-r--r-- | sw/source/core/text/porfld.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 7771ed62be09..7e4f498324fd 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -4,9 +4,9 @@ * * $RCSfile: porfld.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: hr $ $Date: 2005-09-28 11:19:12 $ + * last change: $Author: hr $ $Date: 2006-01-27 14:38:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -421,6 +421,14 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf ) case CHAR_HARDHYPHEN: // non-breaking hyphen case CHAR_SOFTHYPHEN: case CHAR_HARDBLANK: + // --> FME 2006-01-11 #i59759# Erase additional control + // characters from field string, otherwise we get stuck in + // a loop. + case CHAR_ZWSP : + case CHAR_ZWNBSP : + // case CHAR_RLM : + // case CHAR_LRM : + // <-- { aNew.Erase( 0, 1 ); ++nNextOfst; |