From 2087484c65a3d5e75a9e8ad116d11a4e13366219 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 14:14:43 +0200 Subject: use consistent #define checks for the Windows platform stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins Reviewed-by: Noel Grandin --- shell/source/backends/localebe/localebackend.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'shell/source/backends') diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 9aea14ea2419..07729f0afa05 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -25,7 +25,7 @@ #include -#ifdef WNT +#ifdef _WIN32 #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -222,7 +222,7 @@ LocaleBackend* LocaleBackend::createInstance() OUString LocaleBackend::getLocale() { -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( GetUserDefaultLCID() ); #elif defined (MACOSX) return ImplGetLocale("AppleLocale"); @@ -234,7 +234,7 @@ OUString LocaleBackend::getLocale() OUString LocaleBackend::getUILocale() { -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) ); #elif defined(MACOSX) return ImplGetLocale("AppleLanguages"); @@ -247,7 +247,7 @@ OUString LocaleBackend::getUILocale() OUString LocaleBackend::getSystemLocale() { // note: the implementation differs from getLocale() only on Windows -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( GetSystemDefaultLCID() ); #else return getLocale(); -- cgit