diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
tree | 1f335918a854319df9269329d165a91d711d2108 /lingucomponent | |
parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'lingucomponent')
6 files changed, 10 insertions, 10 deletions
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 5f2c768e09d7..4f784cab48d9 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(WNT) +#if defined(_WIN32) #include <prewin.h> #include <postwin.h> #endif @@ -290,7 +290,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); -#if defined(WNT) +#if defined(_WIN32) // Hyphen waits UTF-8 encoded paths with \\?\ long path prefix. OString sTmp = Win_AddLongPathPrefix(OUStringToOString(dictpath, RTL_TEXTENCODING_UTF8)); #else @@ -511,7 +511,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( return nullptr; } -#if defined(WNT) +#if defined(_WIN32) static OString Win_GetShortPathName( const OUString &rLongPathName ) { OString aRes; @@ -572,7 +572,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); -#if defined(WNT) +#if defined(_WIN32) // workaround for Windows specific problem that the // path length in calls to 'fopen' is limited to somewhat // about 120+ characters which will usually be exceed when diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 2ccea80002d2..c1df022e11e3 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -122,7 +122,7 @@ void LangGuess_Impl::EnsureInitialized() OUString aPhysPath; OUString aURL( SvtPathOptions().GetFingerprintPath() ); osl::FileBase::getSystemPathFromFileURL( aURL, aPhysPath ); -#ifdef WNT +#ifdef _WIN32 aPhysPath += "\\"; #else aPhysPath += "/"; diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index d0da501e22e4..e187ad542b53 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(WNT) +#if defined(_WIN32) #include <windows.h> #endif @@ -45,7 +45,7 @@ using ::com::sun::star::lang::Locale; using namespace ::com::sun::star; -#if defined(WNT) +#if defined(_WIN32) OString Win_AddLongPathPrefix( const OString &rPathName ) { #define WIN32_LONG_PATH_PREFIX "\\\\?\\" diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index a6d396277bc9..299762d7072c 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -41,7 +41,7 @@ struct lt_rtl_OUString } }; -#if defined(WNT) +#if defined(_WIN32) // to be use to get a path name with long path prefix // under Windows for Hunspell, Hyphen and MyThes libraries diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 51166e6d2cad..e5c6a3d0bc04 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -321,7 +321,7 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rL OUString aff; osl::FileBase::getSystemPathFromFileURL(dicpath,dict); osl::FileBase::getSystemPathFromFileURL(affpath,aff); -#if defined(WNT) +#if defined(_WIN32) // workaround for Windows specific problem that the // path length in calls to 'fopen' is limited to somewhat // about 120+ characters which will usually be exceed when diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 3365b69c1585..4bbd7a012165 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -329,7 +329,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM osl::FileBase::getSystemPathFromFileURL(datpath,ndat); osl::FileBase::getSystemPathFromFileURL(idxpath,nidx); -#if defined(WNT) +#if defined(_WIN32) // MyThes waits UTF-8 encoded paths with \\?\ long path prefix. OString aTmpidx = Win_AddLongPathPrefix(OUStringToOString(nidx, RTL_TEXTENCODING_UTF8)); OString aTmpdat = Win_AddLongPathPrefix(OUStringToOString(ndat, RTL_TEXTENCODING_UTF8)); |