[Libreoffice-commits] .: basic/source configmgr/qa connectivity/source connectivity/workben desktop/source desktop/util embeddedobj/source embeddedobj/test fpicker/source fpicker/test framework/source idl/source sfx2/Library_sfx.mk sfx2/source shell/inc shell/source
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 21 07:07:50 PDT 2011
basic/source/classes/propacc.cxx | 2
basic/source/classes/sbxmod.cxx | 2
basic/source/runtime/methods.cxx | 8 -
basic/source/runtime/methods1.cxx | 8 -
configmgr/qa/unit/makefile.mk | 2
connectivity/source/dbtools/makefile.mk | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 6
connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx | 6
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 5
connectivity/source/drivers/mozab/makefile.mk | 2
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 2
connectivity/source/drivers/odbc/OFunctions.cxx | 13 -
connectivity/source/inc/java/lang/Object.hxx | 5
connectivity/source/inc/odbc/OFunctiondefs.hxx | 8 -
connectivity/workben/iniParser/main.cxx | 2
connectivity/workben/little/main.cxx | 2
connectivity/workben/testmoz/main.cxx | 2
connectivity/workben/testmoz/mozthread.cxx | 2
desktop/source/app/app.cxx | 4
desktop/source/app/makefile.mk | 9 -
desktop/source/app/officeipcthread.cxx | 4
desktop/source/deployment/gui/makefile.mk | 4
desktop/source/deployment/inc/dp_misc.mk | 2
desktop/source/deployment/makefile.mk | 8 -
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/misc/dp_platform.cxx | 3
desktop/source/deployment/misc/makefile.mk | 15 --
desktop/source/migration/migration.cxx | 5
desktop/source/migration/wizard.cxx | 2
desktop/source/pkgchk/unopkg/makefile.mk | 4
desktop/util/makefile.mk | 25 ---
embeddedobj/source/msole/makefile.mk | 6
embeddedobj/test/Container1/nativelib/nativeview.c | 1
fpicker/source/office/iodlg.cxx | 12 -
fpicker/test/makefile.mk | 4
framework/source/services/license.cxx | 4
idl/source/prj/svidl.cxx | 2
sfx2/Library_sfx.mk | 5
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 21 ---
sfx2/source/appl/shutdownicon.hxx | 4
sfx2/source/bastyp/misc.cxx | 2
sfx2/source/dialog/basedlgs.cxx | 4
sfx2/source/dialog/tabdlg.cxx | 4
sfx2/source/doc/objstor.cxx | 66 ----------
sfx2/source/inc/sfxtypes.hxx | 2
shell/inc/internal/config.hxx | 2
shell/inc/internal/global.hxx | 2
shell/inc/internal/utilities.hxx | 4
shell/source/all/makefile.mk | 5
shell/source/all/ooofilereader/makefile.mk | 5
shell/source/all/zipfile/zipexcptn.cxx | 6
shell/source/all/zipfile/zipfile.cxx | 6
shell/source/unix/exec/makefile.mk | 10 -
shell/source/unix/exec/shellexec.cxx | 15 --
shell/source/unix/misc/makefile.mk | 18 --
shell/source/unix/sysshell/makefile.mk | 5
57 files changed, 31 insertions(+), 352 deletions(-)
New commits:
commit 0daf6763cc13d7097cde84b2ab4617a48462382f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 21 16:26:08 2011 +0300
Drop OS2
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 1105584..249b9e9 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -54,7 +54,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
#ifdef WNT
#define CDECL _cdecl
#endif
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
#define CDECL
#endif
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 15c6989..d503cef 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -69,7 +69,7 @@ using namespace com::sun::star;
#ifdef WNT
#define CDECL _cdecl
#endif
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
#define CDECL
#endif
#ifdef UNX
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index a7218d2..b120088 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -98,7 +98,7 @@ using namespace com::sun::star::script;
SbxVariable* getDefaultProp( SbxVariable* pRef );
-#if defined (WNT) || defined (OS2)
+#if defined (WNT)
#include <direct.h> // _getdcwd get current work directory, _chdrive
#endif
@@ -415,7 +415,7 @@ RTLFUNC(CurDir)
// DirEntry-Funktionalitaet keine Moeglichkeit besteht, das aktuelle so
// zu ermitteln, dass eine virtuelle URL geliefert werden koennte.
-#if defined (WNT) || defined (OS2)
+#if defined (WNT)
int nCurDir = 0; // Current dir // JSM
if ( rPar.Count() == 2 )
{
@@ -438,10 +438,6 @@ RTLFUNC(CurDir)
}
}
char* pBuffer = new char[ _MAX_PATH ];
-#ifdef OS2
- if( !nCurDir )
- nCurDir = _getdrive();
-#endif
if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 )
rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) );
else
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 907a301..fc30f5f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -41,12 +41,6 @@
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
-#ifdef OS2
-#define INCL_DOS
-#define INCL_DOSPROCESS
-#include <svpm.h>
-#endif
-
#ifndef CLK_TCK
#define CLK_TCK CLOCKS_PER_SEC
#endif
@@ -509,8 +503,6 @@ RTLFUNC(GetGUIType)
// 17.7.2000 Make simple solution for testtool / fat office
#if defined (WNT)
rPar.Get(0)->PutInteger( 1 );
-#elif defined OS2
- rPar.Get(0)->PutInteger( 2 );
#elif defined UNX
rPar.Get(0)->PutInteger( 4 );
#else
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index fdb82f1..7847978 100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -52,7 +52,7 @@ DEF1NAME = $(SHL1TARGET)
ALLTAR: TEST
-.IF "$(OS)" == "OS2" || "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
MY_INI = .ini
.ELSE
MY_INI = rc
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 9023715..3e67ada 100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -68,7 +68,7 @@ SHL1STDLIBS=\
# NETBSD: somewhere we have to instantiate the static data members.
# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
# MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX"
SHL1STDLIBS+=$(UCBHELPERLIB)
.ENDIF
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 5a9e61e..a99f335 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -44,12 +44,6 @@
#include <vector>
#include <map>
-#ifdef XP_OS2
-#define INCL_DOSERRORS
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
-
using namespace com::sun::star::mozilla;
namespace connectivity
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 5cbc352..f7ff7e6 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -42,12 +42,6 @@
#include <vector>
#include <map>
-#ifdef XP_OS2
-#define INCL_DOSERRORS
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
-
using namespace com::sun::star::mozilla;
class nsProfile;
namespace connectivity
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index b44436e..c4c1d21 100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -31,11 +31,6 @@ PRJINC=..$/..$/..
PRJNAME=connectivity
TARGET=mozbootstrap
-.IF "$(OS)" == "OS2"
-all:
- @echo " Not building under OS/2"
-.ENDIF
-
# --- Settings ----------------------------------
USE_DEFFILE=TRUE
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 1928961..cefb6f9 100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -31,7 +31,7 @@ TARGET=mozab
TARGET2=$(TARGET)drv
VISIBILITY_HIDDEN=TRUE
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
+.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" )
all:
@echo " Not building the mozilla address book driver"
@echo " dependency to Mozilla developer snapshots not feasable at the moment"
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index 49c0bd8..810be9b 100755
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE
.INCLUDE : settings.mk
-.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2"
+.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
dummy:
@echo " Not building the mozillasrc stuff in LibreOffice build"
@echo " dependency to Mozilla developer snapshots not feasable at the moment"
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index bc7f21f..e36062f 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -123,24 +123,11 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
_rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodbc.so"));
#endif /* MACOSX */
#endif
-#ifdef OS2
- _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC"));
-#endif
if ( !pODBCso )
pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
if( !pODBCso)
-#ifdef OS2
- {
- delete pODBCso;
- _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WOD402"));
- pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
- if( !pODBCso)
- return sal_False;
- }
-#else
return sal_False;
-#endif
return bLoaded = LoadFunctions(pODBCso);
}
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index fe3fa4c..6aa83ee 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -42,11 +42,6 @@
#ifdef HAVE_64BIT_POINTERS
#error "no 64 bit pointer"
-#else
-#ifdef OS2
-#define PVOID_TO_INT64(x) (jlong)(sal_Int32)x
-#define INT64_TO_PVOID(x) (void *)x
-#endif // OS2
#endif //HAVE_64BIT_POINTERS
namespace comphelper
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index eefbd7b..8738492 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -61,14 +61,6 @@
//--------------------------------------------------------------------------
-#ifdef OS2
-#define ALLREADY_HAVE_OS2_TYPES
-#define DONT_TD_VOID
-#include <svpm.h>
-#include <odbc/sqlext.h>
-#define SDB_ODBC_CHAR UCHAR
-#endif // OS2
-
#ifdef OS2__00
#ifdef ODBCIMP
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index cc7dccb..868ccde 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -180,7 +180,7 @@ public:
};
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
int main( int argc, char * argv[] )
#else
int _cdecl main( int argc, char * argv[] )
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 53cf1c6..60b7c1b 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -55,7 +55,7 @@ using namespace cppu;
using ::rtl::OUString;
-#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/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index cb55312..bc8a662 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -634,7 +634,7 @@ void menuMain()
PRINTSTR("4 Open OE Address Book\n")
PRINTSTR("Please Input your choice:")
}
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
int main( int argc, char * argv[] )
#else
int _cdecl main( int argc, char * argv[] )
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 521ce5d..880ce3d 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -406,7 +406,7 @@ void usage()
PRINTLN("-e test outlook express");
PRINTLN("0 < threadcount <= 100, default 100");
}
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
int main( int argc, char * argv[] )
#else
int _cdecl main( int argc, char * argv[] )
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d0443f9..e8bda45 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2637,8 +2637,6 @@ void Desktop::OpenClients()
aHelpURLBuffer.appendAscii("&System=UNX");
#elif defined WNT
aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined OS2
- aHelpURLBuffer.appendAscii("&System=OS2");
#endif
pHelp->Start(aHelpURLBuffer.makeStringAndClear(), NULL);
return;
@@ -2654,7 +2652,7 @@ void Desktop::OpenClients()
{
aIniName = aIniName.copy( 0, lastIndex+1 );
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "perftune" ));
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" ));
#else
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" ));
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index e7c30a2..4a3d084 100755
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -47,13 +47,11 @@ CFLAGS+=-DGNOME_VFS_ENABLED
# .ELSE
# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
# .ENDIF
-# .ELIF "$(OS)" == "OS2"
-# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
# .ELSE
# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
# .ENDIF
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
+.IF "$(GUI)"=="WNT" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
CFLAGS+=-DENABLE_QUICKSTART_APPLET
.ENDIF
@@ -102,11 +100,8 @@ DEF1NAME = $(SHL1TARGET)
OBJFILES = \
$(OBJ)$/copyright_ascii_ooo.obj \
- $(OBJ)$/main.obj
-.IF "$(GUI)" != "OS2"
-OBJFILES += \
+ $(OBJ)$/main.obj \
$(OBJ)$/copyright_ascii_sun.obj
-.ENDIF
SLOFILES = $(SHL1OBJS)
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 2457796..dcde366 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -465,7 +465,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
{
aIniName = aIniName.copy( 0, lastIndex+1 );
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "perftune" ));
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" ));
#else
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" ));
@@ -836,8 +836,6 @@ void SAL_CALL OfficeIPCThread::run()
aHelpURLBuffer.appendAscii("&System=UNX");
#elif defined WNT
aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined OS2
- aHelpURLBuffer.appendAscii("&System=OS2");
#endif
ApplicationEvent* pAppEvent =
new ApplicationEvent( aEmpty, aEmpty,
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 73ca837..eed15ac 100755
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -35,10 +35,6 @@ USE_PCH :=
ENABLE_PCH :=
PRJINC:=..$/..
-.IF "$(GUI)"=="OS2"
-TARGET = deplgui
-.ENDIF
-
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
DLLPRE =
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 829a6bb..a2d3d6e 100755
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
@@ -35,8 +35,6 @@ DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
.ELSE
DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
.ENDIF
-.ELIF "$(OS)" == "OS2"
-DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
.ELSE
DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
.ENDIF
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index a010e89..bffc824 100755
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -32,10 +32,6 @@ TARGET = deployment
ENABLE_EXCEPTIONS = TRUE
NO_BSYMBOLIC = TRUE
-.IF "$(GUI)"=="OS2"
-TARGET = deploy
-.ENDIF
-
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
@@ -99,11 +95,7 @@ RESLIB1SRSFILES = \
$(SRS)$/deployment_manager.srs \
$(SRS)$/deployment_unopkg.srs
-.IF "$(GUI)"=="OS2"
-RESLIB1SRSFILES += $(SRS)$/deplmisc.srs
-.ELSE
RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs
-.ENDIF
.INCLUDE : target.mk
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 916a201..a0c2a20 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -382,7 +382,7 @@ bool office_is_running()
if (
#if defined UNIX
sFile.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(SOFFICE2)))
-#elif defined WNT || defined OS2
+#elif defined WNT
//osl_getExecutableFile should deliver "soffice.bin" on windows
//even if swriter.exe, scalc.exe etc. was started. This is a bug
//in osl_getExecutableFile
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 8bf9d17..6217be2 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -68,7 +68,6 @@
#define PLATFORM_NETBSD_X86_64 "netbsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
-#define PLATFORM_OS2_X86 "os2_x86"
#define PLATFORM_OPENBSD_X86 "openbsd_x86"
#define PLATFORM_OPENBSD_X86_64 "openbsd_x86_64"
#define PLATFORM_DRAGONFLY_X86 "dragonfly_x86"
@@ -188,8 +187,6 @@ namespace
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
- else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
- ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC)))
ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86)))
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index 2a9d385..9c0b33d 100755
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
@@ -33,10 +33,6 @@ USE_DEFFILE = TRUE
ENABLE_EXCEPTIONS = TRUE
VISIBILITY_HIDDEN=TRUE
-.IF "$(GUI)"=="OS2"
-TARGET = deplmisc
-.ENDIF
-
.INCLUDE : settings.mk
# Reduction of exported symbols:
@@ -48,11 +44,7 @@ SRS1NAME = $(TARGET)
SRC1FILES = \
dp_misc.src
-.IF "$(GUI)"=="OS2"
-SHL1TARGET = $(TARGET)
-.ELSE
SHL1TARGET = deploymentmisc$(DLLPOSTFIX)
-.ENDIF
SHL1OBJS = \
$(SLO)$/dp_misc.obj \
$(SLO)$/dp_resource.obj \
@@ -76,14 +68,7 @@ SHL1STDLIBS = \
$(UNOTOOLSLIB) \
$(XMLSCRIPTLIB) \
$(COMPHELPERLIB)
-.IF "$(GUI)"=="OS2"
-SHL1IMPLIB = ideploymentmisc$(DLLPOSTFIX)
-LIB1TARGET = $(SLB)$/_deplmisc.lib
-LIB1OBJFILES = $(SHL1OBJS)
-DEFLIB1NAME = _deplmisc
-.ELSE
SHL1IMPLIB = i$(SHL1TARGET)
-.ENDIF
DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 534df3d..8248af0 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -676,11 +676,6 @@ strings_vr MigrationImpl::compileFileList()
strings_vr vrExclude;
strings_vr vrTemp;
-#ifdef SAL_OS2
- if (m_aInfo.userdata.getLength() == 0)
- return vrResult;
-#endif
-
// get a list of all files:
strings_vr vrFiles = getAllFiles(m_aInfo.userdata);
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index b8931bb..34e2fdd 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -388,9 +388,7 @@ sal_Bool FirstStartWizard::onFinish()
// return sal_True;
if ( svt::RoadmapWizard::onFinish() )
{
-#ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments.
enableQuickstart();
-#endif
disableWizard();
return sal_True;
}
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 60db925..e96cf60 100755
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -29,11 +29,7 @@ PRJ = ..$/..$/..
PRJNAME = desktop
TARGET = unopkg
-.IF "$(GUI)" == "OS2"
-TARGETTYPE = CUI
-.ELSE
TARGETTYPE = GUI
-.ENDIF
ENABLE_EXCEPTIONS = TRUE
LIBTARGET=NO
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index df2fe68..1c6fb2e 100755
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -47,9 +47,6 @@ VERINFONAME=verinfo
.IF "$(GUI)" == "WNT"
RCFILES=verinfo.rc
.ENDIF
-.IF "$(GUI)" == "OS2"
-RCFILES=ooverinfo2.rc
-.ENDIF
# --- Linken der Applikation ---------------------------------------
@@ -63,7 +60,6 @@ RESLIB1SRSFILES= $(SRS)$/desktop.srs
.IF "$(L10N_framework)"==""
.IF "$(LINK_SO)"=="TRUE"
-.IF "$(GUI)" != "OS2"
APP1TARGET=so$/$(TARGET)
APP1NOSAL=TRUE
APP1RPATH=BRAND
@@ -80,8 +76,6 @@ APP1STACK=10000000
.ENDIF # WNT
-.ENDIF # "$(GUI)" != "OS2"
-
.ENDIF # "$(LINK_SO)"=="TRUE"
APP5TARGET=soffice
@@ -104,14 +98,6 @@ APP5LINKRES=$(MISC)$/ooffice5.res
APP5STACK=10000000
.ENDIF # WNT
-.IF "$(GUI)" == "OS2"
-APP5DEF= # automatic
-APP5RES= $(RES)$/oodesktop.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
-APP5VERINFO=ooverinfo2.rc
-APP5LINKRES=$(MISC)$/ooffice.res
-.ENDIF # OS2
-
.IF "$(GUI)" == "WNT"
.IF "$(LINK_SO)"=="TRUE"
APP6TARGET=so$/officeloader
@@ -179,14 +165,9 @@ ALLTAR: $(BIN)$/so$/$(TARGET).bin
.ENDIF # "$(LINK_SO)"=="TRUE"
.ENDIF # WNT
-.IF "$(GUI)" == "OS2"
-ALLTAR: $(BIN)$/$(TARGET).bin
-.ENDIF # OS2
-
$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
$(COPY) $< $@
-.IF "$(GUI)" != "OS2"
.IF "$(LINK_SO)"=="TRUE"
$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
$(COPY) $< $@
@@ -194,7 +175,6 @@ $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST)
.ENDIF # "$(LINK_SO)"=="TRUE"
ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
-.ENDIF
.IF "$(OS)" == "MACOSX"
.IF "$(LINK_SO)"=="TRUE"
@@ -247,11 +227,6 @@ $(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST)
.ENDIF # WNT
-.IF "$(GUI)" == "OS2"
-$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST)
- $(COPY) $< $@
-.ENDIF # OS2
-
$(MISC)$/binso_created.flg :
@@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index b7f3482..0912147 100755
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -110,12 +110,6 @@ SHL1STDLIBS+=\
$(OLEAUT32LIB)
DEF1EXPORTFILE= exports.dxp
-.ELIF "$(GUI)"=="OS2"
-
-SHL1STDLIBS+=\
- iembobj.lib
-
-DEF1EXPORTFILE= exports.dxp
.ENDIF
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index fada23a..840a4be 100755
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -45,7 +45,6 @@ static LRESULT APIENTRY NativeViewWndProc( HWND , UINT , WPARAM , LPARAM );
#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/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 980d753..f2de0b9 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -329,7 +329,7 @@ namespace
void convertStringListToUrls( const String& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash )
{
const sal_Unicode s_cSeparator =
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
';'
#else
':'
@@ -369,7 +369,7 @@ namespace
void operator()( String& _rURL )
{
INetURLObject aURL( _rURL );
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
if ( aURL.getSegmentCount() > 1 )
#endif
aURL.removeFinalSlash( );
@@ -2563,7 +2563,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt
if ( nPathTokenPos == STRING_NOTFOUND )
{
String aDelim(
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
'\\'
#else
'/'
@@ -2571,12 +2571,6 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt
);
nPathTokenPos = aReversePath.Search( aDelim );
-#if defined(OS2)
- if ( nPathTokenPos == STRING_NOTFOUND )
- {
- nPathTokenPos = aReversePath.Search( '/' );
- }
-#endif
#if !defined( UNX )
if ( nPathTokenPos == STRING_NOTFOUND )
{
diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 4157d33..e497e79 100644
--- a/fpicker/test/makefile.mk
+++ b/fpicker/test/makefile.mk
@@ -31,10 +31,6 @@ PRJNAME=SV
TARGET=svdem
LIBTARGET=NO
-.IF "$(GUI)" == "OS2"
-TARGETTYPE=GUI
-.ENDIF
-
# --- Settings -----------------------------------------------------
.INCLUDE : svpre.mk
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index db9ec90..e79ae4d 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -96,7 +96,7 @@ static const char *szLicensePath = "/share/readme";
#ifdef UNX
static const char *szUNXLicenseName = "/LICENSE";
static const char *szUNXLicenseExt = "";
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
static const char *szWNTLicenseName = "/license";
static const char *szWNTLicenseExt = ".txt";
#endif
@@ -279,7 +279,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aLangString += aLocale.Variant;
}
}
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
::rtl::OUString aLicensePath =
aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
+ ::rtl::OUString::createFromAscii(szWNTLicenseName)
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 6b25826..dfbf7c1 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -90,7 +90,7 @@ sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool b
return 0 == aF2.Kill();
}
-#if defined( UNX ) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || defined (__MINGW32__)
int main ( int argc, char ** argv)
{
#else
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4d2396b..c93efac 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -251,11 +251,6 @@ $(eval $(call gb_Library_set_defs,sfx,\
))
endif
-ifeq ($(OS),OS2)
-$(eval $(call gb_Library_add_exception_objects,sfx,\
- sfx2/source/appl/shutdowniconOs2.ob \
-))
-endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_objcxxobjects,sfx,\
sfx2/source/appl/shutdowniconaqua \
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 5aba2d7..fc6ed19 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -121,7 +121,7 @@
#include <sfx2/mnuitem.hxx>
#endif
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
#define DDE_AVAILABLE
#endif
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 36dd915..c64d497 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -727,19 +727,6 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< :
/* Create a sub-classed instance - foo */
ShutdownIcon::pShutdownIcon = this;
initSystray();
-#ifdef OS2
- // above win32 starts the quickstart thread, but we have
- // quickstart running only when -quickstart is specified
- // on command line (next boot).
- // so if -quickstart was not specified, we cannot issue
- // quickstart veto on shutdown.
- if (bQuickstart)
- {
- // disable shutdown
- ShutdownIcon::getInstance()->SetVeto( true );
- ShutdownIcon::getInstance()->addTerminateListener();
- }
-#endif
}
catch(const ::com::sun::star::lang::IllegalArgumentException&)
{
@@ -774,8 +761,6 @@ void ShutdownIcon::LeaveModalMode()
#ifdef WNT
// defined in shutdowniconw32.cxx
-#elif defined(OS2)
-// defined in shutdowniconOs2.cxx
#elif defined QUARTZ
// defined in shutdowniconaqua.cxx
#else
@@ -856,9 +841,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
bool ShutdownIcon::GetAutostart( )
{
-#if defined(OS2)
- return GetAutostartOs2( );
-#elif defined QUARTZ
+#if defined QUARTZ
return true;
#else
bool bRet = false;
@@ -925,8 +908,6 @@ void ShutdownIcon::SetAutostart( bool bActivate )
}
#endif
}
-#elif defined OS2
- SetAutostartOs2( bActivate );
#else
(void)bActivate; // unused variable
#endif // ENABLE_QUICKSTART_APPLET
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 09fc15f..4066544 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -149,10 +149,6 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
static void EnableAutostartW32( const rtl::OUString &aShortcutName );
static rtl::OUString GetAutostartFolderNameW32();
#endif
-#ifdef OS2
- static void SetAutostartOs2( bool bActivate );
- static bool GetAutostartOs2( );
-#endif
};
extern "C" {
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index f9ce14b..599097b 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -33,7 +33,7 @@
//--------------------------------------------------------------------
-#if defined(DBG_UTIL) && ( defined(WNT) || defined(OS2) )
+#if defined(DBG_UTIL) && defined(WNT)
unsigned SfxStack::nLevel = 0;
#endif
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index dda2366..15f7028 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -990,12 +990,8 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink )
#ifdef WNT
int __cdecl BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
#else
-#if defined(OS2) && defined(ICC)
-int _Optlink BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
-#else
extern "C" int BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
#endif
-#endif
{
return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1b3fa54..a9579d7 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1593,12 +1593,8 @@ int SfxTabDialog::FillOutputItemSet()
#ifdef WNT
int __cdecl TabDlgCmpUS_Impl( const void* p1, const void* p2 )
#else
-#if defined(OS2) && defined(ICC)
-int _Optlink TabDlgCmpUS_Impl( const void* p1, const void* p2 )
-#else
extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 )
#endif
-#endif
/* [Description]
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 7844db9..0e2860e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -131,12 +131,6 @@
#include "appbaslib.hxx"
#include "appdata.hxx"
-#ifdef OS2
-#include <osl/file.hxx>
-#include <stdio.h>
-#include <sys/ea.h>
-#endif
-
#include "../appl/app.hrc"
extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell*, SfxItemPool&, SfxMedium* );
@@ -1714,66 +1708,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
catch( Exception& )
{
}
-
-#ifdef OS2
- {
-#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
- // Header for a single-valued ASCII EA data item
- typedef struct _EA_ASCII_header {
- sal_uInt16 usAttr; /* value: EAT_ASCII */
- sal_uInt16 usLen; /* length of data */
- CHAR szType[_MAX_PATH]; /* ASCII data fits in here ... */
- } EA_ASCII_HEADER;
- char filePath[_MAX_PATH];
- char fileExt[_MAX_PATH];
- char docType[_MAX_PATH];
- int rc;
- oslFileError eRet;
- ::rtl::OUString aSystemFileURL;
- const ::rtl::OUString aFileURL = rMedium.GetName();
- // close medium
- rMedium.Close();
-
- // convert file URL to system path
- if (osl::FileBase::getSystemPathFromFileURL( aFileURL, aSystemFileURL) == osl::FileBase::E_None) {
- EA_ASCII_HEADER eaAscii;
- struct _ea eaType;
- strcpy( filePath, CHAR_POINTER( aSystemFileURL));
- strcpy( docType, CHAR_POINTER( rMedium.GetFilter()->GetServiceName()));
-#if OSL_DEBUG_LEVEL > 1
- printf( "file name: %s\n", filePath);
- printf( "filter name: %s\n", CHAR_POINTER(rMedium.GetFilter()->GetFilterName()));
- printf( "service name: %s\n", docType);
-#endif
- // initialize OS/2 EA data structure
- eaAscii.usAttr = EAT_ASCII;
- _splitpath ( filePath, NULL, NULL, NULL, fileExt);
- if (!stricmp( fileExt, ".pdf"))
- strcpy( eaAscii.szType, "Acrobat Document");
- else if (!strcmp( docType, "com.sun.star.text.TextDocument"))
- strcpy( eaAscii.szType, "OpenOfficeOrg Writer Document");
- else if (!strcmp( docType, "com.sun.star.sheet.SpreadsheetDocument"))
- strcpy( eaAscii.szType, "OpenOfficeOrg Calc Document");
- else if (!strcmp( docType, "com.sun.star.presentation.PresentationDocument"))
- strcpy( eaAscii.szType, "OpenOfficeOrg Impress Document");
- else if (!strcmp( docType, "com.sun.star.drawing.DrawingDocument"))
- strcpy( eaAscii.szType, "OpenOfficeOrg Draw Document");
- else
- strcpy( eaAscii.szType, "OpenOfficeOrg Document");
- eaAscii.usLen = strlen( eaAscii.szType);
- // fill libc EA data structure
- eaType.flags = 0;
- eaType.size = sizeof(sal_uInt16)*2 + eaAscii.usLen;
- eaType.value = &eaAscii;
- // put EA to file
- rc = _ea_put( &eaType, filePath, 0, ".TYPE");
-#if OSL_DEBUG_LEVEL > 1
- printf( "ea name: %s, rc %d, errno %d\n", eaAscii.szType, rc, errno);
-#endif
- }
- }
-#endif
-
}
return bOk;
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 8d10583..52a8157 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -104,7 +104,7 @@ String SfxShellIdent_Impl( const SfxShell *pSh );
//------------------------------------------------------------------------
-#if defined(DBG_UTIL) && ( defined(WNT) || defined(OS2) )
+#if defined(DBG_UTIL) && defined(WNT)
class SfxStack
{
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 873c658..029351a 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -33,9 +33,7 @@
#pragma warning (disable : 4786 4503 4917)
#endif
-#ifndef OS2
#include <tchar.h>
-#endif
#ifdef _AMD64_
#define MODULE_NAME TEXT("shlxthdl_x64.dll")
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index 3b61b82..9ba63bf 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -32,9 +32,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
-#ifndef OS2
#include <windows.h>
-#endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index d9b1978..a271440 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -33,9 +33,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
-#ifndef OS2
#include <windows.h>
-#endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
@@ -91,9 +89,7 @@ bool HasOnlySpaces(const std::wstring& String);
std::wstring getShortPathName( const std::wstring& aLongName );
-#ifndef OS2
LCID LocaleSetToLCID( const LocaleSet_t & Locale );
-#endif
//----------------------------------------------------------
#ifdef DEBUG
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 66b1851..b4cc34a 100755
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -47,9 +47,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS_X64+=-D_WIN32_IE=0x501
.ENDIF # "$(BUILD_X64)"!=""
.ENDIF
-.IF "$(GUI)" == "OS2"
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE
-.ENDIF
# --- Files --------------------------------------------------------
@@ -58,7 +55,7 @@ CFLAGS+=-DSYSTEM_EXPAT
.ENDIF
SLOFILES=$(SLO)$/xml_parser.obj
-
+
.IF "$(BUILD_X64)"!=""
SLOFILES_X64=$(SLO_X64)$/xml_parser.obj
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index bf63655..67d29ac 100755
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
@@ -36,17 +36,12 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)" != "OS2"
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-D_WIN32_IE=0x501
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS_X64+=-D_WIN32_IE=0x501
-.ENDIF
-.IF "$(GUI)" == "OS2"
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE
-.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx
index f9d985c..e907a1d 100644
--- a/shell/source/all/zipfile/zipexcptn.cxx
+++ b/shell/source/all/zipfile/zipexcptn.cxx
@@ -84,10 +84,8 @@ Win32Exception::Win32Exception(int Error) :
*/
Win32Exception::~Win32Exception() throw()
{
-#ifndef OS2
if (m_MsgBuff)
LocalFree(m_MsgBuff);
-#endif
}
//------------------------------------------
@@ -95,9 +93,6 @@ Win32Exception::~Win32Exception() throw()
*/
const char* Win32Exception::what() const throw()
{
-#ifdef OS2
- return "Win32Exception!";
-#else
FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
@@ -110,7 +105,6 @@ const char* Win32Exception::what() const throw()
NULL);
return reinterpret_cast<char*>(m_MsgBuff);
-#endif
}
//------------------------------------------
diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx
index 14941f9..427f75b 100644
--- a/shell/source/all/zipfile/zipfile.cxx
+++ b/shell/source/all/zipfile/zipfile.cxx
@@ -38,12 +38,6 @@
#include <string.h>
-#ifdef OS2
-#include <alloca.h>
-#define _alloca alloca
-#define ERROR_NOT_ENOUGH_MEMORY 8
-#endif
-
namespace internal
{
/* for case in-sensitive string comparison */
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 1a26d37..4f07341 100755
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -46,20 +46,16 @@ DLLPRE=
SLOFILES=$(SLO)$/shellexec.obj\
$(SLO)$/shellexecentry.obj
-
+
SHL1OBJS=$(SLOFILES)
-
+
SHL1TARGET=syssh.uno
-.IF "$(GUI)" == "OS2"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
SHL1IMPLIB=
-.ENDIF
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
-
+
SHL1STDLIBS=$(CPPULIB)\
$(CPPUHELPERLIB)\
$(SALLIB)
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index cf6eec8..1bbc2fd 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -93,10 +93,8 @@ void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL)
{
// escape every non alpha numeric characters (excluding a few "known good") by prepending a '\'
sal_Char c = rURL[n];
-#ifndef OS2 // YD shell does not support escaped chars
if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' )
rBuffer.append( '\\' );
-#endif
rBuffer.append( c );
}
@@ -200,19 +198,6 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
static_cast < XSystemShellExecute * > (this), ENOENT );
}
-#ifdef OS2
- OStringBuffer aProg = OUStringToOString(aProgram, osl_getThreadTextEncoding());
- aProg.append("open-url.exe");
- OString aUrl = OUStringToOString(aURL, osl_getThreadTextEncoding());
- if ( -1 == spawnl(P_NOWAIT, aProg.getStr(), aProg.getStr(), aUrl.getStr() , NULL) )
- {
- int nerr = errno;
- throw SystemShellExecuteException(OUString::createFromAscii( strerror( nerr ) ),
- static_cast < XSystemShellExecute * > (this), nerr );
- }
- return;
-#endif
-
OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding());
escapeForShell(aBuffer, aTmp);
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 6ad3797..be4660d 100755
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -47,23 +47,6 @@ SCRIPTFILES = \
$(BIN)$/gnome-open-url \
$(BIN)$/kde-open-url
-.IF "$(GUI)" == "OS2"
-
-APP1TARGET = open-url
-APP1OBJS = \
- $(OBJ)$/open-url.obj \
- open-url.def
-APP1LIBS =
-
-APP2TARGET = senddoc
-APP2OBJS = \
- $(OBJ)$/senddoc.obj \
- senddoc.def
-APP2LIBS =
-APP2STDLIBS =
-
-.ELSE
-
APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
@@ -79,7 +62,6 @@ APP2LIBS =
APP2STDLIBS =
OBJFILES = $(APP1OBJS) $(APP2OBJS)
-.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 2656fdb..60605ef 100755
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -48,11 +48,6 @@ SLOFILES=$(SLO)$/recently_used_file.obj \
$(SLO)$/recently_used_file_handler.obj
SHL1TARGET=recentfile
-.IF "$(GUI)" == "OS2"
-SHL1IMPLIB=i$(TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-.ENDIF
SHL1STDLIBS=$(EXPATASCII3RDLIB)\
$(SALLIB)
More information about the Libreoffice-commits
mailing list