diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optinet2.hxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optmemory.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 5 |
4 files changed, 2 insertions, 15 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index f981edef298b..117114da9a66 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -48,12 +48,8 @@ using ::std::vector; #ifdef WNT int __cdecl IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) #else -#if defined(OS2) && defined(ICC) -int _Optlink IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) -#else int IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) #endif -#endif { return *(sal_uInt16*)p1 - *(sal_uInt16*)p2; } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index a7f7816d2e0e..720436953955 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -53,11 +53,7 @@ class SvtInetOptions; #define CACHE_CONTROLS 20 #define INET_SEARCH 19 -#if defined(OS2) -#define TYPE_CONTROLS 20 -#else #define TYPE_CONTROLS 18 -#endif namespace svx { class SecurityOptionsDialog; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index beb0d062d60e..164661a7b773 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -149,8 +149,8 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS #endif FreeResource(); - //quick launch only available in Win and OS/2 -#if !defined(WNT) && !defined(OS2) && !defined(ENABLE_GTK) + //quick launch only available in Win +#if !defined(WNT) && !defined(ENABLE_GTK) aQuickLaunchFL.Hide(); aQuickLaunchCB.Hide(); #endif diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index ef1fff0de271..c6c5ebde3f54 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -560,11 +560,6 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) bool bOrientationSupport = pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION ); -#ifdef OS2 - // unter OS/2 wird bei HasSupport() immer sal_True returned - // aber nur als Dummy, deshalb FALSE - bOrientationSupport = sal_False; -#endif if ( !bOrientationSupport && aPaperSize.Width() > aPaperSize.Height() ) |