diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:13:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:13:54 +0000 |
| commit | d1b0f7fddf73299d8093c042c558a34814b5adc6 (patch) | |
| tree | 4905c99dfb87a76f0b8709938c251681e5ca01f6 /shell | |
| parent | 7758cc489fdcb0509f40e15af9b9b8317cb8f006 (diff) | |
INTEGRATION: CWS vistaready01 (1.5.22); FILE MERGED
2006/12/08 12:52:19 lla 1.5.22.1: #i72391# bring tests up to date
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/workbench/TestSmplMail.cxx | 12 | ||||
| -rw-r--r-- | shell/source/win32/workbench/TestSysShExec.cxx | 15 |
2 files changed, 15 insertions, 12 deletions
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index 16b50e516ddb..040782785069 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TestSmplMail.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:49:32 $ + * last change: $Author: hr $ $Date: 2007-01-02 16:13:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,8 +61,8 @@ #include <cppuhelper/servicefactory.hxx> #endif -#ifndef _RTL_USTRING_ -#include <rtl/ustring> +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> #endif #ifndef _SAL_TYPES_H_ @@ -112,7 +112,9 @@ Reference< XMultiServiceFactory > g_xFactory; //-------------------------------------------------------------- -int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) +// int SAL_CALL main(int nArgc, char* Argv[], char* pEnv[] ) +// make Warning free, leave out typename +int SAL_CALL main(int , char*, char* ) { //------------------------------------------------- // get the global service-manager diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index db4e233757ee..686eafe3765c 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TestSysShExec.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:49:45 $ + * last change: $Author: hr $ $Date: 2007-01-02 16:13:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,8 +70,8 @@ #include <cppuhelper/servicefactory.hxx> #endif -#ifndef _RTL_USTRING_ -#include <rtl/ustring> +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> #endif #ifndef _SAL_TYPES_H_ @@ -121,7 +121,8 @@ Reference< XMultiServiceFactory > g_xFactory; //-------------------------------------------------------------- -int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) +// int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) +int SAL_CALL main(int nArgc, char* Argv[], char* ) { //------------------------------------------------- // get the global service-manager @@ -164,11 +165,11 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) { xSysShExec->execute( cmd, param, atoi( Argv[3] ) ); } - catch( SystemShellExecuteException& ex ) + catch( SystemShellExecuteException& ) { OSL_ENSURE( sal_False, "Error executing system command" ); } - catch( IllegalArgumentException& ex) + catch( IllegalArgumentException& ) { OSL_ENSURE( sal_False, "Invalid parameter" ); } |