summaryrefslogtreecommitdiff
path: root/unotools/Library_utl.mk
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-08-23 00:33:26 +1000
committerStephan Bergmann <sbergman@redhat.com>2016-08-30 05:40:43 +0000
commit20f6a6b159c69771dc0e087f63b6c701908e32e2 (patch)
tree455b03cfe737f212d31810994fba2e91ff54ce56 /unotools/Library_utl.mk
parent965f379b6ed2884f60b7fd6c0aae107fa5fceea7 (diff)
tdf#99402: fix Metafile Font handling
1. For DEFAULT_CHARSET/OEM_CHARSET, use correct encoding based on LibreOffice Default Language for Documents setting (Tools->Options...->Language Settings->Languages). For that, two functions added to tencinfo.h, that map language names to corresponding Windows ANSI/OEM encodings. 2. If charset is DEFAULT_CHARSET/OEM_CHARSET for Symbol font, then always use RTL_TEXTENCODING_SYMBOL. Unit test is included. Change-Id: Ibff63e7a03dec42a9d2a74399936d6bc04f2ff1a Reviewed-on: https://gerrit.libreoffice.org/28322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools/Library_utl.mk')
-rw-r--r--unotools/Library_utl.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index fb0f19f93be7..0d4ea9f2e692 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/misc/sharedunocomponent \
unotools/source/misc/syslocale \
unotools/source/misc/unotoolsservices \
+ unotools/source/misc/wincodepage \
unotools/source/misc/ServiceDocumenter \
unotools/source/streaming/streamhelper \
unotools/source/streaming/streamwrap \