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 /cui/source/options | |
| 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 'cui/source/options')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optmemory.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index a024162675bc..8e2bd660b9dc 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -214,7 +214,7 @@ namespace return OUString(); #endif } - #if defined WNT + #if defined(_WIN32) return OUString("com.sun.star.ui.dialogs.SystemFilePicker"); #elif defined MACOSX return OUString("com.sun.star.ui.dialogs.AquaFilePicker"); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 20be147715ca..344a66cefd7c 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -130,7 +130,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe m_pQuickLaunchCB->Show(); //Only available in Win or if building the gtk systray -#if !defined(WNT) && ! ENABLE_GTK +#if !defined(_WIN32) && ! ENABLE_GTK m_pQuickStarterFrame->Hide(); #endif diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 160f0a315463..0bbd5c7ffbe9 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1768,7 +1768,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) nPageId = (sal_uInt16)rInetArray.GetValue(i); if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; -#if defined WNT +#if defined(_WIN32) // Disable E-mail tab-page on Windows if ( nPageId == RID_SVXPAGE_INET_MAIL ) continue; |