summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-17 10:36:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-17 10:36:13 +0100
commit61f168d98750549107a65e846fbe5c49f277295e (patch)
tree0748b88eefa9bb49285270ac5a7bbce3d10b4ef6 /cppcanvas/source
parent4f76e46290b26deeb4f9660c580a5ffef58a557e (diff)
Add SvStream::ReadUtf16 (don't assume sal_Unicode is unsigned short)
Change-Id: I74f34e3389582617fa83f8f4a3d6867cf87189e1
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 1438c18c50ed..56370f11ba04 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1185,7 +1185,7 @@ namespace cppcanvas
sal_Unicode *chars = static_cast<sal_Unicode *>(alloca( sizeof( sal_Unicode ) * length ));
for( sal_uInt32 i = 0; i < length; i++ )
- s.ReadUInt16( chars[ i ] );
+ s.ReadUtf16( chars[ i ] );
family = OUString( chars, length );
SAL_INFO("cppcanvas.emf", "EMF+\tfamily: " << OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()); // TODO: can we just use family?