summaryrefslogtreecommitdiff
path: root/sal/test
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 11:39:07 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 10:48:30 +0000
commit39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch)
treeac4b224a66a18429cd4722a61ee3d401f8e9951c /sal/test
parent5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff)
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sal/test')
-rw-r--r--sal/test/testbootstrap.cxx4
-rw-r--r--sal/test/unloading/unloadTest.cxx16
2 files changed, 10 insertions, 10 deletions
diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx
index 5de39f01de26..151b03a33cb1 100644
--- a/sal/test/testbootstrap.cxx
+++ b/sal/test/testbootstrap.cxx
@@ -69,8 +69,8 @@ int main( int argc, char *argv[] )
Bootstrap bootstrap(iniName);
- OUString name( RTL_CONSTASCII_USTRINGPARAM( "MYBOOTSTRAPTESTVALUE" ));
- OUString myDefault( RTL_CONSTASCII_USTRINGPARAM("$Default"));
+ OUString name( "MYBOOTSTRAPTESTVALUE" );
+ OUString myDefault("$Default");
OUString value;
sal_Bool useDefault;
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index 39ced7a05af9..b822f8ecba06 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -198,7 +198,7 @@ sal_Bool test1()
rtl_unloadUnusedModules( NULL);
// Try to get a symbol, must fail
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData);
if( !pSymbol)
@@ -242,7 +242,7 @@ sal_Bool test2()
rtl_unloadUnusedModules( NULL);
// Try to get a symbol, must fail
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData);
if( !pSymbol)
@@ -286,7 +286,7 @@ sal_Bool test3()
rtl_unloadUnusedModules( NULL);
// Try to get a symbol, must succeed
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData);
if( pSymbol)
@@ -334,7 +334,7 @@ sal_Bool test4()
rtl_unloadUnusedModules( NULL);
// Try to get a symbol, must fail
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
void* pSymbol= osl_getSymbol( handleMod1, sSymbol.pData);
void* pSymbol2= osl_getSymbol( handleMod2, sSymbol.pData);
@@ -354,7 +354,7 @@ sal_Bool test5()
sal_Bool btest1= sal_False;
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
OUString("applicat.rdb"));
@@ -423,7 +423,7 @@ sal_Bool test6()
oslModule handleMod2=0;
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
OUString("applicat.rdb"));
@@ -520,7 +520,7 @@ sal_Bool test8()
printf("Test 8 ####################################################\n");
oslModule handleMod1=0;
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
sal_Bool b_ifaceSupported=sal_False;
sal_Bool b_instances_identical= sal_False;
@@ -630,7 +630,7 @@ sal_Bool test9()
// the service manager is still alive
rtl_unloadUnusedModules( NULL);
// Try to get a symbol, must fail
- OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+ OUString sSymbol("component_getFactory");
void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData);
if( pSymbol)