[Libreoffice-commits] .: vcl/Library_vcl.mk vcl/win
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 21 07:27:04 PST 2011
vcl/Library_vcl.mk | 2 +-
vcl/win/source/gdi/salgdi3.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c010c77dc3d240413d584d5837de4be1b164517e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 15:26:59 2011 +0000
explicitly write an 8 bit empty string
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f18c18f..95a307f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\
))
$(eval $(call gb_Library_add_defs,vcl,\
- -DVCL_DLLIMPLEMENTATION \
+ -DVCL_DLLIMPLEMENTATION -DNOMINMAX \
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
-DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
))
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 32fd0f3..8d86069 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -210,7 +210,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
++aIter;
}
// EOF Marker
- write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8);
+ write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(aCacheFile, rtl::OString());
}
}
}
More information about the Libreoffice-commits
mailing list