summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/inc/svx/svdmodel.hxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx6
-rw-r--r--svx/source/engine3d/scene3d.cxx7
-rw-r--r--svx/source/fmcomp/gridcols.cxx3
-rwxr-xr-xsvx/source/gengal/makefile.mk6
-rw-r--r--svx/source/svdraw/svdpagv.cxx4
-rw-r--r--svx/source/unodraw/recoveryui.cxx6
-rwxr-xr-xucb/source/core/makefile.mk4
-rwxr-xr-xucb/source/ucp/file/makefile.mk4
-rw-r--r--ucb/source/ucp/file/prov.cxx2
-rw-r--r--ucb/source/ucp/file/shell.cxx2
-rwxr-xr-xucb/source/ucp/ftp/makefile.mk4
-rw-r--r--ucb/source/ucp/odma/odma_main.cxx2
-rwxr-xr-xucb/source/ucp/webdav/makefile.mk3
14 files changed, 12 insertions, 45 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"
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 6360f82320d2..f13a2cfaff79 100755
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -62,11 +62,7 @@ SHL1LIBS=\
$(SLB)$/regexp.lib
SHL1IMPLIB=i$(TARGET)
-.IF "$(GUI)" == "OS2"
-DEF1EXPORTFILE=exports2.dxp
-.ELSE
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ENDIF
DEF1NAME=$(SHL1TARGET)
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index 3d97cb23873c..222daf0cdda8 100755
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -69,10 +69,6 @@ SHL1STDLIBS=\
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.IF "$(GUI)" == "OS2"
-DEF1EXPORTFILE=exports2.dxp
-.ENDIF
-
DEF1NAME=$(SHL1TARGET)
.ENDIF # L10N_framework
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 6cad3c0fb0eb..d3392ac5ab18 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -514,7 +514,7 @@ void SAL_CALL FileProvider::initProperties( void )
#if defined ( UNX )
m_FileSystemNotation = FileSystemNotation::UNIX_NOTATION;
-#elif defined( WNT ) || defined( OS2 )
+#elif defined( WNT )
m_FileSystemNotation = FileSystemNotation::DOS_NOTATION;
#else
m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION;
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 38df50b92a77..476248420f22 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -300,7 +300,7 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::BOUND
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
));
#else
| beans::PropertyAttribute::READONLY)); // under unix/linux only readable
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 6f55fed25fed..9440d0cd6205 100755
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -77,10 +77,6 @@ SHL1STDLIBS=\
$(UCBHELPERLIB) \
$(CURLLIB)
-.IF "$(GUI)" == "OS2"
-SHL1STDLIBS+=ssl.lib crypto.lib libz.lib
-.ENDIF
-
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS= \
$(LIB1TARGET)
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index a8eb6f83a6bc..15b75ec4bd39 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -44,7 +44,7 @@
/** our main program to convert ODMAIDs to ODMA URLs
*/
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
void main( int argc, char * argv[] )
#else
void _cdecl main( int argc, char * argv[] )
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 162d58266406..339d2b5f01a4 100755
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -135,9 +135,6 @@ SHL1STDLIBS+= $(OPENSSLLIB)
.IF "$(OS)"=="SOLARIS"
SHL1STDLIBS+= -lnsl -lsocket -ldl
.ENDIF # SOLARIS
-.IF "$(OS)"=="OS2"
-SHL1STDLIBS+= pthread.lib libz.lib
-.ENDIF # OS2
.IF "$(SYSTEM_OPENSSL)"=="YES"
SHL1STDLIBS+= $(OPENSSLLIB)
.ELSE
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-11 06:09:45 +0000