From 11c71842f6d73f80cc40d2752421eec9af40bb51 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 21 May 2011 16:26:08 +0300 Subject: Drop OS2 --- 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 ----- 11 files changed, 4 insertions(+), 74 deletions(-) (limited to 'shell') diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 915d26aba006..37de9ca89368 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 -#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 359435a79192..a87510958f08 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 -#endif #if defined _MSC_VER #pragma warning(pop) #endif diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index fd608d6d4870..2697c8002dc6 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 -#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 66b185132fa6..b4cc34a42601 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 bf6365526eec..67d29acaaf85 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 c5501d5b6213..5a5dcefc16ea 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(m_MsgBuff); -#endif } //------------------------------------------ diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx index 0b4ac7fd7fc2..c7ed65e5d177 100644 --- a/shell/source/all/zipfile/zipfile.cxx +++ b/shell/source/all/zipfile/zipfile.cxx @@ -38,12 +38,6 @@ #include -#ifdef OS2 -#include -#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 1a26d377b142..4f07341f4dde 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 29f3a922c499..6629983fb410 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 6ad3797e6521..be4660db3e8c 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 2656fdb8557e..60605ef0f3ff 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) -- cgit