Remove some OS/2 code

7 files changed, 9 insertions, 27 deletions

diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 510e0b5cdb45..f1f0e2b2cc71 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -58,10 +58,6 @@ class OutputDevice;
 #define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
 #endif
 
-#if defined(OS2)
-#define DEGREE_CHAR ((sal_Unicode)248)   /* 0xF8 = IBM PC (Erw. ASCII) */
-#endif
-
 #ifndef DEGREE_CHAR
 #error unbekannte Plattrorm
 #endif
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index be38cda0c48b..ecdb09c4b8a7 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -2012,7 +2012,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         static ::rtl::OUString GetCrashConfigDir()
         {
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
             OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
 #elif defined( MACOSX )
             OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
@@ -2021,13 +2021,13 @@ void BrokenRecoveryDialog::impl_askForSavePath()
 #endif
             Bootstrap::expandMacros( ustrValue );
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
             ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
 #endif
             return ustrValue;
         }
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #define CHKFILE "crashdat.chk"
 #define STKFILE "crashdat.stk"
 #define PRVFILE "crashdat.prv"
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 1f9f7fde4b49..1708fad29b4f 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -226,13 +226,6 @@ E3dScene::E3dScene(E3dDefaultAttributes& rDefault)
 
 void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/)
 {
-    // For OS/2 turn off the FP-Exceptions
-#if defined(OS2)
-#define SC_FPEXCEPTIONS_ON()    _control87( MCW_EM, 0 )
-#define SC_FPEXCEPTIONS_OFF()   _control87( MCW_EM, MCW_EM )
-    SC_FPEXCEPTIONS_OFF();
-#endif
-
     // For WIN95/NT turn off the FP-Exceptions
 #if defined(WNT)
 #define SC_FPEXCEPTIONS_ON()    _control87( _MCW_EM, 0 )
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 4bef3b83af9e..9b6dfd688eac 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -62,9 +62,6 @@ extern "C" int
 #if defined( WNT )
  __cdecl
 #endif
-#if defined( ICC ) && defined( OS2 )
-_Optlink
-#endif
     NameCompare(const void* pFirst, const void* pSecond)
 {
     return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond);
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
index f3e119a8a7fd..82e482283f58 100755
--- a/svx/source/gengal/makefile.mk
+++ b/svx/source/gengal/makefile.mk
@@ -45,11 +45,11 @@ SCRIPTFILES =	$(BIN)$/gengal
 
 OBJFILES=	$(OBJ)$/gengal.obj
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 APP1TARGET= $(TARGET)
-.ELSE			# .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ELSE			# .IF "$(GUI)"=="WNT"
 APP1TARGET= $(TARGET).bin
-.ENDIF			# .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ENDIF			# .IF "$(GUI)"=="WNT"
 
 APP1OBJS=   $(OBJFILES)
 
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 3c5632dd6b89..c763468151a4 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -497,10 +497,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef OS2
-#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16)))
-#endif
-
 void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor)
 {
     if (GetPage()==NULL)
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 649cc8d772b5..83b0295c663b 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -190,7 +190,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL RecoveryUI::st_createInstan
 static OUString GetCrashConfigDir()
 {
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
 #elif defined(MACOSX)
     OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
@@ -199,7 +199,7 @@ static OUString GetCrashConfigDir()
 #endif
     Bootstrap::expandMacros( ustrValue );
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
 #endif
     return ustrValue;
@@ -207,7 +207,7 @@ static OUString GetCrashConfigDir()
 
 //===============================================
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 #define LCKFILE "crashdat.lck"
 #else
 #define LCKFILE ".crash_report_unsent"