diff options
| author | Tino Rachui <tra@openoffice.org> | 2001-05-07 13:43:08 +0000 |
|---|---|---|
| committer | Tino Rachui <tra@openoffice.org> | 2001-05-07 13:43:08 +0000 |
| commit | 2d71e8837d29da6944133f87e9a46e1100c5f3f2 (patch) | |
| tree | 4958c3923bcc165d7a0d10abaded757d015b7925 /shell | |
| parent | 6bf62d1f26133b81a6762261fee87766375eb792 (diff) | |
*** empty log message ***
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/SysShExec.cxx | 8 | ||||
| -rw-r--r-- | shell/source/win32/makefile.mk | 7 | ||||
| -rw-r--r-- | shell/source/win32/syssh.xml | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 78c98279b0cd..60b46ae4f083 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SysShExec.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: tra $ $Date: 2001-04-27 13:54:12 $ + * last change: $Author: tra $ $Date: 2001-05-07 14:43:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -242,7 +242,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa static_cast< XSystemShellExecute* >( this ), 1 ); - if ( !( nFlags >= SSEF_DEFAULTS && nFlags <= SSEF_NO_SYSTEM_ERROR_MESSAGE ) ) + if ( !( nFlags >= DEFAULTS && nFlags <= NO_SYSTEM_ERROR_MESSAGE ) ) throw IllegalArgumentException( OUString::createFromAscii( "Invalid Flags specified" ), static_cast< XSystemShellExecute* >( this ), @@ -256,7 +256,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa sei.lpParameters = aParameter.getStr(); sei.nShow = SW_SHOWNORMAL; - if ( SSEF_NO_SYSTEM_ERROR_MESSAGE & nFlags ) + if ( NO_SYSTEM_ERROR_MESSAGE & nFlags ) sei.fMask = SEE_MASK_FLAG_NO_UI; SetLastError( 0 ); diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk index 2862dbc3d8af..5bb1c3c40802 100644 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: tra $ $Date: 2001-04-27 13:54:19 $ +# last change: $Author: tra $ $Date: 2001-05-07 14:43:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,7 +74,7 @@ COMPRDB=$(SOLARBINDIR)$/applicat.rdb # --- Files -------------------------------------------------------- -.INCLUDE : ..$/cppumaker.mk +#.INCLUDE : ..$/cppumaker.mk SLOFILES=$(SLO)$/SysShentry.obj\ $(SLO)$/SysShExec.obj @@ -101,3 +101,4 @@ DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml index b4f44fadfc8d..d2355f211545 100644 --- a/shell/source/win32/syssh.xml +++ b/shell/source/win32/syssh.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name>syssh</module-name> + <module-name> syssh </module-name> <component-description> <author> Tino Rachui </author> <name>com.sun.star.comp.system.SystemShellExecute</name> @@ -14,6 +14,8 @@ <supported-service> com.sun.star.system.SystemShellExecute </supported-service> <service-dependency>...</service-dependency> <type> com.sun.star.system.XSystemShellExecute </type> + <type> com.sun.star.system.SystemShellExecuteException </type> + <type> com.sun.star.system.SystemShellExecuteFlags </type> <type> com.sun.star.lang.XMultiServiceFactory </type> <type> com.sun.star.lang.XSingleServiceFactory </type> <type> com.sun.star.lang.XServiceInfo </type> |