diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:43:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:43:03 +0100 |
| commit | a3db321ecb1cf9f8c08476ecc699931b6111bc21 (patch) | |
| tree | a24f3cc9f323720b081f804396f9b8ade4bff258 /vcl/quartz/ctlayout.cxx | |
| parent | e625a440a4d17826677608ac430660374d2b7d4f (diff) | |
Don't assume sal_Unicode is unsigned short
Change-Id: I7a741130689721c69fd2879be6bda27fc6ec3646
Diffstat (limited to 'vcl/quartz/ctlayout.cxx')
| -rw-r--r-- | vcl/quartz/ctlayout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index 61ddecc82a80..0eff2a0d17f1 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -135,7 +135,7 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs ) // create the CoreText line layout CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( nullptr, - pStr + mnMinCharPos, + reinterpret_cast<UniChar const *>(pStr + mnMinCharPos), mnCharCount, kCFAllocatorNull ); // CFAttributedStringCreate copies the attribues parameter @@ -213,7 +213,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) CFRelease( mpCTLine ); const sal_Unicode *pStr = rArgs.mrStr.getStr(); CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( nullptr, - pStr + mnMinCharPos, + reinterpret_cast<UniChar const *>(pStr + mnMinCharPos), mnCharCount - mnTrailingSpaceCount, kCFAllocatorNull ); CFAttributedStringRef pAttrStr = CFAttributedStringCreate( nullptr, |