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 | |
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')
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
-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 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index dfb8297db435..a2abaaddcbce 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -961,7 +961,7 @@ void TPGalleryThemeProperties::FillFilterList() } } -#if defined(WNT) +#if defined(_WIN32) if (aExtensions.getLength() > 240) aExtensions = "*.*"; #endif 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; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index db26ba4d6aa9..66a7fa4c924b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2411,7 +2411,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const OStringBuffer sData; const sal_Char aLineEnd[] = -#if defined(WNT) +#if defined(_WIN32) "\015\012"; #else "\012"; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 99e3382b08ec..38527176a933 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -330,7 +330,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet //Family, Style //In Windows the standard dialogs name font-name, font-style as //Font, Style -#ifdef WNT +#ifdef _WIN32 OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FONT)); #else OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FAMILY)); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 21cd0b3604f6..b7fee0d412ed 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -505,7 +505,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) m_pLbGradients->SelectEntryPos( m_pLbGradients->GetEntryCount() - 1 ); -#ifdef WNT +#ifdef _WIN32 // hack: #31355# W.P. Rectangle aRect( m_pLbGradients->GetPosPixel(), m_pLbGradients->GetSizePixel() ); if( sal_True ) { // ??? overlapped with pDlg diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index a12478f80789..6700093b6400 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -539,7 +539,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) m_pLbHatchings->SelectEntryPos( m_pLbHatchings->GetEntryCount() - 1 ); -#ifdef WNT +#ifdef _WIN32 // hack: #31355# W.P. Rectangle aRect( m_pLbHatchings->GetPosPixel(), m_pLbHatchings->GetSizePixel() ); if( sal_True ) { // ??? overlapped with pDlg |