diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
| commit | 11c71842f6d73f80cc40d2752421eec9af40bb51 (patch) | |
| tree | d6de27d1d9e96bae92a6b7e7db3ce661b1582afb /shell/source/unix/exec | |
| parent | 15083950a5c814dd5765ef49751a2700052a5a99 (diff) | |
Drop OS2
Diffstat (limited to 'shell/source/unix/exec')
| -rwxr-xr-x | shell/source/unix/exec/makefile.mk | 10 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 15 |
2 files changed, 3 insertions, 22 deletions
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); |