diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-05-04 08:01:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-01 13:29:54 +0000 |
| commit | 6840ba613cc46ee65d58612ecabe748d539de9f5 (patch) | |
| tree | 68ae808ad3bba41a078076706462c1d79babebe6 | |
| parent | b93b23fe10917881e185750d294fc42fe2c92424 (diff) | |
#i103131# in doubt treat unicode variation selectors as invisible(cherry picked from commit 179f88dfe5a1eb2ebd051d73b50f1e0af9c12fd9)
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 7171f59a795b..695256ca3990 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -253,6 +253,11 @@ inline bool IsControlChar( sal_UCS4 cChar ) // byte order markers and invalid unicode if( (cChar == 0xFEFF) || (cChar == 0xFFFE) || (cChar == 0xFFFF) ) return true; + // variation selectors + if( (0xFE00 <= cChar) && (cChar <= 0xFE0F) ) + return true; + if( (0xE0100 <= cChar) && (cChar <= 0xE01EF) ) + return true; return false; } |