diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /sal | |
parent | WaE: Potentially uninitialized local variable (diff) | |
download | core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.tar.gz core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.zip |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sal')
-rw-r--r-- | sal/inc/osl/socket_decl.hxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/math/test-rtl-math.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/strings/test_oustring_compare.cxx | 10 | ||||
-rw-r--r-- | sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 8 | ||||
-rw-r--r-- | sal/qa/rtl/uri/rtl_testuri.cxx | 31 | ||||
-rw-r--r-- | sal/rtl/bootstrap.cxx | 8 | ||||
-rw-r--r-- | sal/rtl/uri.cxx | 6 | ||||
-rw-r--r-- | sal/test/testbootstrap.cxx | 10 | ||||
-rw-r--r-- | sal/test/unloading/unloadTest.cxx | 34 |
11 files changed, 56 insertions, 61 deletions
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx index 822450db8f1c..70f8f8b44ba0 100644 --- a/sal/inc/osl/socket_decl.hxx +++ b/sal/inc/osl/socket_decl.hxx @@ -154,7 +154,7 @@ namespace osl */ static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") ); }; diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index d9505098c382..f233f9179d73 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -42,7 +42,7 @@ inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); } inline const rtl::OUString FPH_PARENT_DIR_ENTRY() - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); } + { return rtl::OUString(".."); } /******************************************* * osl_systemPathRemoveSeparator diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index 70e8107aa79b..c156c37b9393 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -54,7 +54,7 @@ public: rtl_math_ConversionStatus status; sal_Int32 end; double res = rtl::math::stringToDouble( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +1.E01foo")), + rtl::OUString(" +1.E01foo"), sal_Unicode('.'), sal_Unicode(','), &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(" +1.E01")), end); @@ -65,7 +65,7 @@ public: rtl_math_ConversionStatus status; sal_Int32 end; double res = rtl::math::stringToDouble( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +Efoo")), + rtl::OUString(" +Efoo"), sal_Unicode('.'), sal_Unicode(','), &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end); diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx index a3afaef25849..70ed7548e4d9 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx @@ -40,7 +40,7 @@ private: CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString); void test::oustringbuffer::ToString::testToString() { - rtl::OUStringBuffer sb(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test string"))); + rtl::OUStringBuffer sb(rtl::OUString("test string")); rtl::OUString str = sb.toString(); CPPUNIT_ASSERT( str == "test string" ); // returned OUString must be independent from sb diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx index 8b506b78d728..e3ad8dd9d4bf 100644 --- a/sal/qa/rtl/strings/test_oustring_compare.cxx +++ b/sal/qa/rtl/strings/test_oustring_compare.cxx @@ -50,16 +50,16 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii() CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii("abc")); CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("abc"))); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(""))); - CPPUNIT_ASSERT(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("abc")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abcd")). + CPPUNIT_ASSERT(!rtl::OUString("abcd"). equalsIgnoreAsciiCaseAscii("abc")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("abcd")); } diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index 873b5366f6a5..7dc8eb8ea25f 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -96,13 +96,13 @@ void test::oustring::StringLiterals::checkCtors() CPPUNIT_ASSERT( VALID_CONVERSION( bad5[ 1 ] )); // Check that contents are correct and equal to the case when RTL_CONSTASCII_USTRINGPARAM is used. - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ))); - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ab" ))); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( "" )); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( "ab" )); #if 0 // Also check that embedded \0 is included. // In fact, allowing this is probably just trouble, so this now asserts. - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\0" ))); - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "a\0b" ))); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( "\0" )); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( "a\0b" )); #endif } diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index ec29c8097d27..005a7a75388a 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -246,7 +246,7 @@ void Test::test_Uri() { // Check UTF-8 handling: - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%E0%83%BF")); + aText1 = rtl::OUString("%E0%83%BF"); // \U+00FF encoded with three instead of two bytes aText2 = aText1; CPPUNIT_ASSERT_MESSAGE( @@ -256,7 +256,7 @@ void Test::test_Uri() { RTL_TEXTENCODING_UTF8) == aText2)); - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%EF%BF%BF")); + aText1 = rtl::OUString("%EF%BF%BF"); // \U+FFFF is no legal character aText2 = aText1; CPPUNIT_ASSERT_MESSAGE( @@ -268,7 +268,7 @@ void Test::test_Uri() { // Check IURI handling: - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%30%C3%BF")); + aText1 = rtl::OUString("%30%C3%BF"); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%30")); aBuffer.append(static_cast< sal_Unicode >(0x00FF)); aText2 = aBuffer.makeStringAndClear(); @@ -279,8 +279,8 @@ void Test::test_Uri() { // Check modified rtl_UriCharClassUnoParamValue (removed '[' and ']'): - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]%5B%5D")); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%5B%5D%5B%5D")); + aText1 = rtl::OUString("[]%5B%5D"); + aText2 = rtl::OUString("%5B%5D%5B%5D"); CPPUNIT_ASSERT_MESSAGE( "failure 19", (rtl::Uri::encode( @@ -381,7 +381,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x045F, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20!%A1%FF")); + aText2 = rtl::OUString("%20!%A1%FF"); CPPUNIT_ASSERT_MESSAGE( "failure 20", (rtl::Uri::encode( @@ -415,8 +415,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { ' ', '!', 0x028A, 0xD849, 0xDD13, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("%20!%81%30%B1%33%95%39%C5%37")); + aText2 = rtl::OUString("%20!%81%30%B1%33%95%39%C5%37"); CPPUNIT_ASSERT_MESSAGE( "failure 22", (rtl::Uri::encode( @@ -444,7 +443,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20%C4%80%FF")); + aText1 = rtl::OUString("%20%C4%80%FF"); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 24", @@ -453,7 +452,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81 ")); + aText1 = rtl::OUString("%81 "); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 25", @@ -462,7 +461,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%20")); + aText1 = rtl::OUString("%81%20"); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 26", @@ -471,7 +470,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%30%B1%33")); + aText1 = rtl::OUString("%81%30%B1%33"); sal_Unicode const aText2U[] = { 0x028A, 0 }; aText2 = rtl::OUString(aText2U); CPPUNIT_ASSERT_MESSAGE( @@ -481,7 +480,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%810%B13")); + aText1 = rtl::OUString("%810%B13"); sal_Unicode const aText2U[] = { 0x028A, 0 }; aText2 = rtl::OUString(aText2U); CPPUNIT_ASSERT_MESSAGE( @@ -494,8 +493,8 @@ void Test::test_Uri() { // Check rtl_UriEncodeStrictKeepEscapes mode: { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%%ea%c3%aa")); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%25%EA%C3%AA")); + aText1 = rtl::OUString("%%ea%c3%aa"); + aText2 = rtl::OUString("%25%EA%C3%AA"); CPPUNIT_ASSERT_MESSAGE( "failure 29", (rtl::Uri::encode( @@ -506,7 +505,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { 0x00EA, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%C3%AA")); + aText2 = rtl::OUString("%C3%AA"); CPPUNIT_ASSERT_MESSAGE( "failure 30", (rtl::Uri::encode( diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 84d1b58b450b..d3dadcb50d1c 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -105,8 +105,7 @@ rtl::OUString recursivelyExpandMacros( if (requestStack->file == requestFile && requestStack->key == requestKey) { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("***RECURSION DETECTED***")); + return rtl::OUString("***RECURSION DETECTED***"); } } ExpandRequestLink link = { requestStack, requestFile, requestKey }; @@ -267,7 +266,7 @@ static OUString & getIniFileName_Impl() resolvePathnameUrl(&fileName); #else if(getFromCommandLineArgs( - OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")), &fileName)) + OUString("INIFILENAME"), &fileName)) { resolvePathnameUrl(&fileName); } @@ -459,8 +458,7 @@ struct FundamentalIniData { ini = ((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())-> getValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP")), + rtl::OUString("URE_BOOTSTRAP"), &uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) && resolvePathnameUrl(&uri)) ? rtl_bootstrap_args_open(uri.pData) : NULL; diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 02e71829ce0c..9edd087ca335 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -723,8 +723,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - " does not start with a scheme component")); + " does not start with a scheme component"); rtl_uString_assign(pException, const_cast< rtl::OUString & >(aMessage).pData); return false; @@ -734,8 +733,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "path component does not start with slash")); + "path component does not start with slash"); rtl_uString_assign(pException, aMessage.pData); return false; } diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index b77e684138ca..5de39f01de26 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -56,7 +56,7 @@ int main( int argc, char *argv[] ) OUString iniName; - Bootstrap::get(OUString(RTL_CONSTASCII_USTRINGPARAM("iniName")), iniName, OUString()); + Bootstrap::get(OUString("iniName"), iniName, OUString()); #if OSL_DEBUG_LEVEL > 1 if(iniName.getLength()) @@ -76,7 +76,7 @@ int main( int argc, char *argv[] ) sal_Bool useDefault; OUString aDummy; - useDefault = bootstrap.getFrom(OUString(RTL_CONSTASCII_USTRINGPARAM("USEDEFAULT")), aDummy); + useDefault = bootstrap.getFrom(OUString("USEDEFAULT"), aDummy); sal_Bool result = sal_False; sal_Bool found = sal_True; @@ -105,12 +105,12 @@ int main( int argc, char *argv[] ) fprintf(stderr, "bootstrap parameter couldn't be found\n"); // test the default case - name = OUString( RTL_CONSTASCII_USTRINGPARAM( "no_one_has_set_this_name" ) ); + name = OUString( "no_one_has_set_this_name" ); OSL_ASSERT( ! bootstrap.getFrom( name, value ) ); result = result && !bootstrap.getFrom( name, value ); - myDefault = OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ) ); - OUString myDefault2 = OUString( RTL_CONSTASCII_USTRINGPARAM( "2" ) ); + myDefault = OUString( "1" ); + OUString myDefault2 = OUString( "2" ); bootstrap.getFrom( name, value, myDefault ); OSL_ASSERT( value == myDefault ); diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx index 8733eebba23e..39ced7a05af9 100644 --- a/sal/test/unloading/unloadTest.cxx +++ b/sal/test/unloading/unloadTest.cxx @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) // Test if the servicemanager can be created and if the sample libs // can be loaded // Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( -// OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); +// OUString("applicat.rdb")); // if( !serviceManager.is()) // { // printf("\n ####################################################\n" @@ -120,7 +120,7 @@ int main(int argc, char* argv[]) // } // //destroy servicemanager // Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); -// Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); +// Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); // Reference<XComponentContext> xContext; // any_prop >>= xContext; // Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -179,7 +179,7 @@ sal_Bool test1() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -189,7 +189,7 @@ sal_Bool test1() xint=0; Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -216,7 +216,7 @@ sal_Bool test2() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -233,7 +233,7 @@ sal_Bool test2() rtl_registerModuleForUnloading(mod3); // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -261,7 +261,7 @@ sal_Bool test3() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -277,7 +277,7 @@ sal_Bool test3() rtl_registerModuleForUnloading(mod2); // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -309,7 +309,7 @@ sal_Bool test4() OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -325,7 +325,7 @@ sal_Bool test4() //----------------------------------------------------------- // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -357,7 +357,7 @@ sal_Bool test5() OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); //----------------------------------------------------------- Reference<XInterface> xint= serviceManager->createInstance( OUString( @@ -381,7 +381,7 @@ sal_Bool test5() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -426,7 +426,7 @@ sal_Bool test6() OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -436,7 +436,7 @@ sal_Bool test6() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -530,7 +530,7 @@ sal_Bool test8() { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XContentEnumerationAccess> xContent( serviceManager, UNO_QUERY); Reference<XEnumeration> xenum= xContent->createContentEnumeration( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4))); @@ -580,7 +580,7 @@ sal_Bool test8() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -616,7 +616,7 @@ sal_Bool test9() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); |