Drop OS2

13 files changed, 4 insertions, 56 deletions

diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index ee885e1429f1..d23069e7821d 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -93,7 +93,7 @@ $(MISC)$/xfilter.pl : filter.pl
 .IF "$(GUI)"=="UNX"
 INIFILESUFFIX=rc
 BRANDPATH=none
-.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ELIF "$(GUI)"=="WNT"
 INIFILESUFFIX=.ini
 BRANDPATH=..
 .END
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index b978c201a5e5..7303b1ee132c 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -29,11 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_automation.hxx"
 
-#ifdef OS2
-#define INCL_DOS
-#include <svpm.h>
-#endif
-
 #include "sysdir_win.hxx"
 #include "registry_win.hxx"
 #include "sttresid.hxx"
@@ -445,8 +440,6 @@ void TestToolObj::LoadIniFile()             // Laden der IniEinstellungen, die d
     abGP.Append( "15" );  // Linux x86-64
 #elif defined LINUX && defined SPARC
     abGP.Append( "16" );  // Linux SPARC
-#elif defined OS2
-    abGP.Append( "17" );
 #elif defined LINUX && defined MIPS
     abGP.Append( "18" );  // Linux MIPS
 #elif defined LINUX && defined ARM
@@ -1142,9 +1135,6 @@ void TestToolObj::WaitForAnswer ()
         while ( !bReturnOK && aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning()
                 && aRun.IsValid() && aRun.IsRun() )
         {
-            #ifdef OS2
-            DosSleep(100);
-            #endif
             GetpApp()->Yield();
             if ( BasicRuntimeAccess::HasRuntime() )
                 aRun = BasicRuntimeAccess::GetRuntime();
@@ -1296,9 +1286,6 @@ void TestToolObj::EndBlock()
             aTimer.Start();
             while ( aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning() )
             {
-                #ifdef OS2
-                DosSleep(100);
-                #endif
                 GetpApp()->Yield();
             }
         }
@@ -2306,14 +2293,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                             osl::FileBase::getSystemPathFromFileURL( aUrl, aPath );
                             pVar->PutString( String( aPath ) );
                         }
-#elif defined OS2
-                        {
-                            char* etc = getenv("ETC");
-                            if (etc)
-                               pVar->PutString( CUniString( etc ) );
-                            else
-                               pVar->PutString( CUniString( "/etc" ) );
-                        }
 #else
 #if UNX
                         pVar->PutString( CUniString( "/etc" ) );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index be5fdc556c59..110bdb89f2c6 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1268,15 +1268,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         lcl_PrintHeader( pPrinter, rTitle );
 
         Bitmap aDlg;
-#ifdef OS2
-        Bitmap* pDlg = new Bitmap;
-        SvMemoryStream* pStrm = new SvMemoryStream;
-        *pStrm << *pDlg;
-        delete pDlg;
-        pStrm->Seek(0);
-        *pStrm >> aDlg;
-        delete pStrm;
-#endif
         Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
         double nPaperSzWidth = aPaperSz.Width();
         double nPaperSzHeight = aPaperSz.Height();
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 944c9ff5a38f..2d8591f336dd 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
@@ -52,7 +52,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index 336b3eb15463..5b3611057016 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -44,7 +44,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index f7f86d8973b3..6d47a924ff52 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -54,7 +54,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 7adb1b7d7317..e86aa6fbdef0 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -47,7 +47,6 @@
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
 #define SYSTEM_JAVA    3
-#define SYSTEM_OS2     4
 #define SYSTEM_MAC     5
 #define SYSTEM_XWINDOW 6
 
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() )
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index bc5d1ae66e93..c09723d52a92 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -32,9 +32,7 @@ TARGET	= hyphen_lib
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
 HNJLIB=-lhyphen
 .ELSE
 HNJLIB=hyphen.lib
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index d204fb2c7c1b..1cbecd32dd83 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -37,9 +37,6 @@ USE_DEFFILE=TRUE
 .IF "$(GUI)"=="UNX"
 MYTHESLIB=-lmythes
 .ENDIF # unx
-.IF "$(GUI)"=="OS2"
-MYTHESLIB=$(SLB)\libmythes.lib
-.ENDIF # os2
 .IF "$(GUI)"=="WNT"
 MYTHESLIB=libmythes.lib
 .ENDIF # wnt