diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 21:28:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 21:28:57 +0100 |
| commit | 955b1abb77fd2d653f7370d8a474816b4962539f (patch) | |
| tree | a65cfbd18c4371119b5aab7f82f7378ab0153133 /vcl/source/outdev | |
| parent | 4f07175cd03bf0fa42992a06d51aed5b421adcf2 (diff) | |
crashtesting: assert on converting ooo66538-1.ppt to pdf
Change-Id: I6bdb31715a4cb9e895fc169679a7465a8f18fc37
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 1530ab28c937..05062801cf19 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1236,7 +1236,7 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr, bool bIsCJKIdeograph = false; for( ; pStr < pEnd; ++pStr ) { - if (pStr + 1 < pEnd && rtl::isHighSurrogate( *pStr ) ) + if (pStr + 1 < pEnd && rtl::isHighSurrogate(pStr[0]) && rtl::isLowSurrogate(pStr[1])) { sal_uInt32 nCode = rtl::combineSurrogates( pStr[0] , pStr[1] ); if ( !bIsCJKIdeograph && nCode >= 0xE0100 && nCode < 0xE01F0 ) // Variation Selector Supplements |