diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 15:26:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 15:26:59 +0000 |
| commit | c010c77dc3d240413d584d5837de4be1b164517e (patch) | |
| tree | 93cc97eda743e7a497dbc49ba86eb8db5bda7b2c /vcl | |
| parent | 2a76860a496a8a624e9e44d20c24252d59f88463 (diff) | |
explicitly write an 8 bit empty string
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f18c18f2ab47..95a307f34b5e 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 32fd0f3be061..8d86069d72af 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()); } } } |