summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2012-05-04 08:01:31 +0000
committerHerbert Dürr <hdu@apache.org>2012-05-04 08:01:31 +0000
commit179f88dfe5a1eb2ebd051d73b50f1e0af9c12fd9 (patch)
tree38a8c84c825c7bd66c0fd8fe78ef3baf91fed92a /vcl
parentc4ce6e92db9e784eed2c0863d4c30bf9eddf3da1 (diff)
#i103131# in doubt treat unicode variation selectors as invisible
Notes
Notes: merged as: 6840ba613cc46ee65d58612ecabe748d539de9f5
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/sallayout.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 0ef06db9cdd5..e8989933b29d 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -403,6 +403,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;
}