diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 16:12:08 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 16:48:34 -0500 |
commit | acb7bd175abe6c7f793cc673feaab46c90b9a260 (patch) | |
tree | 206be73ecd4a2af07310e8efe348f9647382d331 /sal/workben | |
parent | d29d9399d48f85989cc8040f5ba334c38b40a544 (diff) |
targeted string re-work
Change-Id: I145731d9f28faf0065f5960f2c5a32f27d8c8620
Diffstat (limited to 'sal/workben')
-rw-r--r-- | sal/workben/getlocaleinfotest.cxx | 4 | ||||
-rw-r--r-- | sal/workben/testfile.cxx | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx index 1cb0f446ef4d..d6affcb7aac4 100644 --- a/sal/workben/getlocaleinfotest.cxx +++ b/sal/workben/getlocaleinfotest.cxx @@ -33,8 +33,8 @@ int _cdecl main( int argc, char * argv[] ) { - rtl::OUString lang(RTL_CONSTASCII_USTRINGPARAM("de")); - rtl::OUString country(RTL_CONSTASCII_USTRINGPARAM("DE")); + rtl::OUString lang("de"); + rtl::OUString country("DE"); rtl_TextEncoding rtlTextEnc; rtl_Locale* rtlLocale = diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index 9554c0fa6c9e..0ec2fe9600c3 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -161,7 +161,7 @@ sal_Bool Initialize( void ) iniFileURL=rtl::OUString( rtl_uString_getStr(strExeFileURL) ,(int) (pExeFileCount-rtl_uString_getStr(strExeFileURL)) ); // add "/testfile.ini" to iniFileURL - iniFileURL+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testfile.ini")); + iniFileURL+=rtl::OUString("/testfile.ini"); // Open the ini-File pFile=new File( iniFileURL ); @@ -904,7 +904,7 @@ void FileCopyAndMoveTest( void ) // FileCopyTest //-------------------------------------------------- - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Copy the file "); @@ -938,7 +938,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Copy a file to a not existing directory \n"); @@ -971,7 +971,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir2 ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Move the file "); @@ -1020,7 +1020,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Move a file to a not existing directory: \n"); @@ -2300,15 +2300,15 @@ void AbsolutePathTest(void) printf( "AbsolutePath-Test\n" ); printf( "--------------------------------------------\n\n" ); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); + DoAbsolutePathTest(dir1, rtl::OUString(".")); + DoAbsolutePathTest(dir1, rtl::OUString("..")); + DoAbsolutePathTest(dir1, rtl::OUString("../..")); + DoAbsolutePathTest(dir1, rtl::OUString("../HUHU")); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); + DoAbsolutePathTest(dir_on_server, rtl::OUString(".")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("..")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("../..")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("../HUHU")); PressKey(); return; @@ -2418,7 +2418,7 @@ void SearchPathTest(void) printFileName( file3 ); printf( "\n" ); - rc=FileBase::searchFileURL( file3 , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) , strResultPath ); + rc=FileBase::searchFileURL( file3 , rtl::OUString("") , strResultPath ); if ( rc == FileBase::E_None ) { @@ -2455,7 +2455,7 @@ void SearchPathTest(void) //------------------------------------------------------------ rtl::OUString strSearchPath( dir_not_exist ); - strSearchPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + strSearchPath+=rtl::OUString(";"); strSearchPath+=dir_on_server; printf( "\nsearchFileURL: File : "); |