diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:32:51 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:32:51 +0100 |
commit | 8c779305bca6b2ca4badadb1ed0c89dc092f287f (patch) | |
tree | 8e5318e2afbd3df93df72c5e8d89374add889f1c /svl | |
parent | bd80ff75a216d6494a1de64896856f4bbccc52ff (diff) |
RTL_CONSTASCII_USTRINGPARAM in libs-gui 07
Diffstat (limited to 'svl')
-rw-r--r-- | svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx | 18 | ||||
-rw-r--r-- | svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx | 76 | ||||
-rw-r--r-- | svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx | 26 | ||||
-rw-r--r-- | svl/qa/complex/ConfigItems/helper/UserOptTest.cxx | 72 | ||||
-rw-r--r-- | svl/source/config/itemholder2.cxx | 2 | ||||
-rw-r--r-- | svl/source/fsstor/fsfactory.cxx | 8 | ||||
-rw-r--r-- | svl/source/fsstor/fsstorage.cxx | 32 | ||||
-rw-r--r-- | svl/source/items/globalnameitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/ilstitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/documentlockfile.cxx | 6 | ||||
-rw-r--r-- | svl/source/misc/fstathelper.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/sharecontrolfile.cxx | 4 | ||||
-rw-r--r-- | svl/source/numbers/numfmuno.cxx | 8 | ||||
-rw-r--r-- | svl/source/numbers/supservs.cxx | 4 | ||||
-rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 58 | ||||
-rw-r--r-- | svl/source/passwordcontainer/syscreds.cxx | 6 | ||||
-rw-r--r-- | svl/source/uno/pathservice.cxx | 4 | ||||
-rw-r--r-- | svl/source/uno/registerservices.cxx | 14 |
18 files changed, 172 insertions, 172 deletions
diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx index 4ee8ce09289f..3f44d5a8dd9c 100644 --- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx @@ -47,13 +47,13 @@ namespace css = ::com::sun::star; namespace svl{ //============================================================================= -static const ::rtl::OUString PROP_TEST = ::rtl::OUString::createFromAscii("Test"); -static const ::rtl::OUString TEST_PICKLIST = ::rtl::OUString::createFromAscii("checkPicklist"); -static const ::rtl::OUString TEST_URLHISTORY = ::rtl::OUString::createFromAscii("checkURLHistory"); -static const ::rtl::OUString TEST_HELPBOOKMARKS = ::rtl::OUString::createFromAscii("checkHelpBookmarks"); -static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS = ::rtl::OUString::createFromAscii("checkAccessibilityOptions"); -static const ::rtl::OUString TEST_PRINTOPTIONS = ::rtl::OUString::createFromAscii("checkPrintOptions"); -static const ::rtl::OUString TEST_USEROPTIONS = ::rtl::OUString::createFromAscii("checkUserOptions"); +static const ::rtl::OUString PROP_TEST (RTL_CONSTASCII_USTRINGPARAM("Test")); +static const ::rtl::OUString TEST_PICKLIST (RTL_CONSTASCII_USTRINGPARAM("checkPicklist")); +static const ::rtl::OUString TEST_URLHISTORY (RTL_CONSTASCII_USTRINGPARAM("checkURLHistory")); +static const ::rtl::OUString TEST_HELPBOOKMARKS (RTL_CONSTASCII_USTRINGPARAM("checkHelpBookmarks")); +static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkAccessibilityOptions")); +static const ::rtl::OUString TEST_PRINTOPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkPrintOptions")); +static const ::rtl::OUString TEST_USEROPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkUserOptions")); //============================================================================= class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob , @@ -189,14 +189,14 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi //============================================================================= ::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.ConfigItemTest")); } //============================================================================= css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::st_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServices(1); - lServices[0] = ::rtl::OUString::createFromAscii("com.sun.star.test.ConfigItems"); + lServices[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.ConfigItems")); return lServices; } diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx index a304a508b3fb..7bf855c7e4a3 100644 --- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx @@ -42,14 +42,14 @@ namespace css = ::com::sun::star; //============================================================================= -static const ::rtl::OUString MESSAGE_CLEAR_FAILED = ::rtl::OUString::createFromAscii("Clearing the list failed."); -static const ::rtl::OUString MESSAGE_SETSIZE_FAILED = ::rtl::OUString::createFromAscii("Setting a new size for a list failed."); -static const ::rtl::OUString MESSAGE_MISS_HISTORY = ::rtl::OUString::createFromAscii("Could not get config access to history list inside config."); -static const ::rtl::OUString MESSAGE_MISS_ITEMLIST = ::rtl::OUString::createFromAscii("Could not get config access to item list inside config."); -static const ::rtl::OUString MESSAGE_MISS_ORDERLIST = ::rtl::OUString::createFromAscii("Could not get config access to order list inside config."); -static const ::rtl::OUString MESSAGE_MISS_ITEM = ::rtl::OUString::createFromAscii("Could not locate item."); -static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM = ::rtl::OUString::createFromAscii("Found an unexpected item."); -static const ::rtl::OUString MESSAGE_WRONG_ORDER = ::rtl::OUString::createFromAscii("Wrong order in history list."); +static const ::rtl::OUString MESSAGE_CLEAR_FAILED (RTL_CONSTASCII_USTRINGPARAM("Clearing the list failed.")); +static const ::rtl::OUString MESSAGE_SETSIZE_FAILED (RTL_CONSTASCII_USTRINGPARAM("Setting a new size for a list failed.")); +static const ::rtl::OUString MESSAGE_MISS_HISTORY (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to history list inside config.")); +static const ::rtl::OUString MESSAGE_MISS_ITEMLIST (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to item list inside config.")); +static const ::rtl::OUString MESSAGE_MISS_ORDERLIST (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to order list inside config.")); +static const ::rtl::OUString MESSAGE_MISS_ITEM (RTL_CONSTASCII_USTRINGPARAM("Could not locate item.")); +static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM (RTL_CONSTASCII_USTRINGPARAM("Found an unexpected item.")); +static const ::rtl::OUString MESSAGE_WRONG_ORDER (RTL_CONSTASCII_USTRINGPARAM("Wrong order in history list.")); //============================================================================= HistoryOptTest::HistoryOptTest() @@ -662,10 +662,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) { impl_clearList(s_sPickList); aHistoryOpt.AppendItem( ePICKLIST , - ::rtl::OUString::createFromAscii("file:///c/test1"), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( ePICKLIST ); if ( aHistoryList.getLength()==0 ) @@ -677,10 +677,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) { impl_clearList(s_sURLHistory); aHistoryOpt.AppendItem( eHISTORY , - ::rtl::OUString::createFromAscii("file:///c/test1"), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHISTORY ); if ( aHistoryList.getLength()==0 ) @@ -692,10 +692,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) { impl_clearList(s_sHelpBookmarks); aHistoryOpt.AppendItem( eHELPBOOKMARKS , - ::rtl::OUString::createFromAscii("file:///c/test1"), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHELPBOOKMARKS ); if ( aHistoryList.getLength()==0 ) @@ -714,15 +714,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) for (sal_Int32 i=0; i<nListSize; ++i) aHistoryOpt.AppendItem( ePICKLIST , ::rtl::OUString::valueOf(i), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); aHistoryOpt.AppendItem( ePICKLIST , ::rtl::OUString::valueOf(nListSize), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); } else if (sList.equalsAscii("URLHistory")) @@ -733,15 +733,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) for (sal_Int32 i=0; i<nListSize; ++i) aHistoryOpt.AppendItem( eHISTORY , ::rtl::OUString::valueOf(i), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); aHistoryOpt.AppendItem( eHISTORY , ::rtl::OUString::valueOf(nListSize), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii(""), - ::rtl::OUString::createFromAscii("") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); } else if (sList.equalsAscii("HelpBookmarks")) @@ -752,15 +752,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) //for (sal_Int32 i=0; i<nListSize; ++i) // aHistoryOpt.AppendItem( eHELPBOOKMARKS , // ::rtl::OUString::valueOf(i), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii("") ); + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); //aHistoryOpt.AppendItem( eHELPBOOKMARKS , // ::rtl::OUString::valueOf(nListSize), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii("") ); + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ); } } diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx index e2ef940cbde6..fddc466417bb 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx @@ -36,24 +36,24 @@ namespace css = ::com::sun::star; // using test only -#define ROOTNODE_PRINTOPTION rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option") -#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString::createFromAscii("ReduceTransparency") -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString::createFromAscii("ReducedTransparencyMode") -#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString::createFromAscii("ReduceGradients") -#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString::createFromAscii("ReducedGradientMode") -#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString::createFromAscii("ReducedGradientStepCount") -#define PROPERTYNAME_REDUCEBITMAPS rtl::OUString::createFromAscii("ReduceBitmaps") -#define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString::createFromAscii("ReducedBitmapMode") -#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION rtl::OUString::createFromAscii("ReducedBitmapResolution") -#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY rtl::OUString::createFromAscii("ReducedBitmapIncludesTransparency") -#define PROPERTYNAME_CONVERTTOGREYSCALES rtl::OUString::createFromAscii("ConvertToGreyscales") +#define ROOTNODE_PRINTOPTION rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")) +#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency")) +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode")) +#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients")) +#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode")) +#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount")) +#define PROPERTYNAME_REDUCEBITMAPS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps")) +#define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode")) +#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution")) +#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency")) +#define PROPERTYNAME_CONVERTTOGREYSCALES rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales")) PrintOptTest::PrintOptTest() { m_xCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( ::utl::getProcessServiceFactory(), - rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); @@ -62,7 +62,7 @@ PrintOptTest::PrintOptTest() //UniString sTmp = UniString("printer"); //xub_StrLen nTokenCount = sTmp.GetTokenCount('/'); //sTmp = sTmp.GetToken(nTokenCount - 1, '/'); - m_xCfg->getByName(rtl::OUString::createFromAscii("Printer")) >>= m_xNode; + m_xCfg->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Printer"))) >>= m_xNode; } } diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx index 571d5bb9e3ed..c1e03e915ed2 100644 --- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx @@ -31,24 +31,24 @@ namespace css = ::com::sun::star; //============================================================================= -static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED = ::rtl::OUString::createFromAscii("set company failed") ; -static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED = ::rtl::OUString::createFromAscii("set firstname failed") ; -static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED = ::rtl::OUString::createFromAscii("set lastname failed") ; -static const ::rtl::OUString MESSAGE_SETID_FAILED = ::rtl::OUString::createFromAscii("set ID failed") ; -static const ::rtl::OUString MESSAGE_SETSTREET_FAILED = ::rtl::OUString::createFromAscii("set street failed") ; -static const ::rtl::OUString MESSAGE_SETCITY_FAILED = ::rtl::OUString::createFromAscii("set city failed") ; -static const ::rtl::OUString MESSAGE_SETSTATE_FAILED = ::rtl::OUString::createFromAscii("set state failed") ; -static const ::rtl::OUString MESSAGE_SETZIP_FAILED = ::rtl::OUString::createFromAscii("set zip failed") ; -static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED = ::rtl::OUString::createFromAscii("set country failed") ; -static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED = ::rtl::OUString::createFromAscii("set position failed") ; -static const ::rtl::OUString MESSAGE_SETTITLE_FAILED = ::rtl::OUString::createFromAscii("set title failed") ; -static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED = ::rtl::OUString::createFromAscii("set telephonehome failed") ; -static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED = ::rtl::OUString::createFromAscii("set telephonework failed") ; -static const ::rtl::OUString MESSAGE_SETFAX_FAILED = ::rtl::OUString::createFromAscii("set fax failed") ; -static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED = ::rtl::OUString::createFromAscii("set email failed") ; -static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED = ::rtl::OUString::createFromAscii("set customernumber failed"); -static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED = ::rtl::OUString::createFromAscii("set fathersname failed") ; -static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED = ::rtl::OUString::createFromAscii("set apartment failed") ; +static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set company failed")) ; +static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set firstname failed")) ; +static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set lastname failed")) ; +static const ::rtl::OUString MESSAGE_SETID_FAILED (RTL_CONSTASCII_USTRINGPARAM("set ID failed")) ; +static const ::rtl::OUString MESSAGE_SETSTREET_FAILED (RTL_CONSTASCII_USTRINGPARAM("set street failed")) ; +static const ::rtl::OUString MESSAGE_SETCITY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set city failed")) ; +static const ::rtl::OUString MESSAGE_SETSTATE_FAILED (RTL_CONSTASCII_USTRINGPARAM("set state failed")) ; +static const ::rtl::OUString MESSAGE_SETZIP_FAILED (RTL_CONSTASCII_USTRINGPARAM("set zip failed")) ; +static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set country failed")) ; +static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED (RTL_CONSTASCII_USTRINGPARAM("set position failed")) ; +static const ::rtl::OUString MESSAGE_SETTITLE_FAILED (RTL_CONSTASCII_USTRINGPARAM("set title failed")) ; +static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set telephonehome failed")) ; +static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED (RTL_CONSTASCII_USTRINGPARAM("set telephonework failed")) ; +static const ::rtl::OUString MESSAGE_SETFAX_FAILED (RTL_CONSTASCII_USTRINGPARAM("set fax failed")) ; +static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED (RTL_CONSTASCII_USTRINGPARAM("set email failed")) ; +static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED (RTL_CONSTASCII_USTRINGPARAM("set customernumber failed")); +static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set fathersname failed")) ; +static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED (RTL_CONSTASCII_USTRINGPARAM("set apartment failed")) ; //============================================================================= @@ -84,24 +84,24 @@ void UserOptTest::impl_checkUserData() impl_checkSetFathersName( ::rtl::OUString() ); impl_checkSetApartment( ::rtl::OUString() ); - impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") ); - impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") ); - impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") ); - impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") ); - impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") ); - impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") ); - impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") ); - impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") ); - impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") ); - impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") ); - impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") ); - impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") ); - impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") ); - impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") ); - impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") ); - //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") ); - impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") ); - impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") ); + impl_checkSetCompany( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedFlag2000")) ); + impl_checkSetFirstName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yan")) ); + impl_checkSetLastName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wu")) ); + impl_checkSetID( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy")) ); + impl_checkSetStreet( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SouthFifthRing")) ); + impl_checkSetCity( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) ); + impl_checkSetState( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) ); + impl_checkSetZip( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100176")) ); + impl_checkSetCountry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("China")) ); + impl_checkSetPosition( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Engineer")) ); + impl_checkSetTitle( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Software Engineer")) ); + impl_checkSetTelephoneHome( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) ); + impl_checkSetTelephoneWork( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) ); + impl_checkSetFax( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) ); + impl_checkSetEmail( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy@redflag2000.cn")) ); + //impl_checkSetCustomerNumber( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("87654321")) ); + impl_checkSetFathersName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("father")) ); + impl_checkSetApartment( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("apartment")) ); } void UserOptTest::impl_checkSetCompany( const ::rtl::OUString& sUserData ) diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 17e9724e8a87..9f752aa9f471 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -59,7 +59,7 @@ ItemHolder2::ItemHolder2() { css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); css::uno::Reference< css::lang::XComponent > xCfg( - xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), css::uno::UNO_QUERY); if (xCfg.is()) xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this)); diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 6da26ece8381..f4dfd8e6f025 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -53,15 +53,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.FileSystemStorageFactory"); - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.FileSystemStorageFactory"); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.FileSystemStorageFactory")); + aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory")); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.FileSystemStorageFactory"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory")); } //------------------------------------------------------------------------- @@ -154,7 +154,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA if( aArguments[2] >>= aDescr ) { aPropsToSet.realloc(1); - aPropsToSet[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aPropsToSet[0].Value <<= aURL; for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ ) diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 628bb7563759..e3fa778fe94d 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -255,8 +255,8 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // create cursor for access to children uno::Sequence< ::rtl::OUString > aProps( 2 ); ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" ); - pProps[1] = ::rtl::OUString::createFromAscii( "IsFolder" ); + pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")); + pProps[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -440,7 +440,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -550,7 +550,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -659,7 +659,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -696,7 +696,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt uno::Reference< io::XInputStream > xInStream = aResultContent.openStream(); xTempResult = uno::Reference < io::XStream >( - m_pImpl->m_xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + m_pImpl->m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), uno::UNO_QUERY_THROW ); uno::Reference < io::XOutputStream > xTempOut = xTempResult->getOutputStream(); uno::Reference < io::XInputStream > xTempIn = xTempResult->getInputStream(); @@ -734,7 +734,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -932,7 +932,7 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -1017,7 +1017,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } @@ -1097,7 +1097,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetException( ::rtl::OUString::createFromAscii( "Can not open element!\n" ), + throw lang::WrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open element!\n")), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1121,7 +1121,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() uno::Sequence< ::rtl::OUString > aProps( 1 ); ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString::createFromAscii( "Title" ); + pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; uno::Sequence< ::rtl::OUString > aResult; @@ -1150,7 +1150,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() else { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ), + throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1163,7 +1163,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ), + throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1197,7 +1197,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ), + throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1236,7 +1236,7 @@ sal_Bool SAL_CALL FSStorage::hasElements() throw io::IOException(); // TODO: error handling uno::Sequence< ::rtl::OUString > aProps( 1 ); - aProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" ); + aProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -1549,7 +1549,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")), uno::Reference< io::XInputStream >(), aCaught ); } diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 57853f6fcfa2..5bb2fd5c7231 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -84,7 +84,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) { com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter - ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), + ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), com::sun::star::uno::UNO_QUERY ); com::sun::star::uno::Sequence< sal_Int8 > aSeq; com::sun::star::uno::Any aNew; diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 9316cef2ffd3..61917ffa63b5 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -79,7 +79,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE ) { ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter - ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), + ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Any aNew; try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); } diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index d595ca585a09..12f98ce326ea 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -103,7 +103,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() try { uno::Reference< io::XStream > xTempFile( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), uno::UNO_QUERY_THROW ); uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW ); @@ -173,7 +173,7 @@ uno::Reference< io::XInputStream > DocumentLockFile::OpenStream() uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ), uno::UNO_QUERY_THROW ); // the file can be opened readonly, no locking will be done @@ -226,7 +226,7 @@ void DocumentLockFile::RemoveFile() uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ), uno::UNO_QUERY_THROW ); xSimpleFileAccess->kill( m_aURL ); } diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 43259f5bad7c..46d6eae274f7 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -50,7 +50,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const UniString& rURL, ::ucbhelper::Content aTestContent( rURL, uno::Reference< XCommandEnvironment > ()); uno::Any aAny = aTestContent.getPropertyValue( - OUString::createFromAscii( "DateModified" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ); if( aAny.hasValue() ) { bRet = sal_True; diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index c00a8f916f2d..6d4f4975869c 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -118,7 +118,7 @@ void ShareControlFile::OpenStream() ucb::InsertCommandArgument aInsertArg; aInsertArg.Data = xInput; aInsertArg.ReplaceExisting = sal_False; - aContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), uno::makeAny( aInsertArg ) ); + aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), uno::makeAny( aInsertArg ) ); // try to let the file be hidden if possible try { @@ -365,7 +365,7 @@ void ShareControlFile::RemoveFile() uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ), uno::UNO_QUERY_THROW ); xSimpleFileAccess->kill( m_aURL ); } diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index cf026acb8a71..243958a38839 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -405,7 +405,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( rtl::OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject")); } sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const rtl::OUString& ServiceName ) @@ -694,7 +694,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const rtl::OUString SAL_CALL SvNumberFormatsObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii("SvNumberFormatsObj"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatsObj")); } sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const rtl::OUString& ServiceName ) @@ -955,7 +955,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P rtl::OUString SAL_CALL SvNumberFormatObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii("SvNumberFormatObj"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatObj")); } sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const rtl::OUString& ServiceName ) @@ -1118,7 +1118,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl rtl::OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii("SvNumberFormatSettingsObj"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatSettingsObj")); } sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const rtl::OUString& ServiceName ) diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 909a141e018f..3f5eb9aa1582 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::utl; -#define PERSISTENT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"); +#define PERSISTENT_SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")); //------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) @@ -130,7 +130,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject")); } //------------------------------------------------------------------------- diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 1d315c2d264f..f01f7e3f96a7 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -150,7 +150,7 @@ static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd ) static sal_Bool shorterUrl( ::rtl::OUString& aURL ) { sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); - if( aInd > 0 && aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) != aInd-2 ) + if( aInd > 0 && aURL.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("://")) ) != aInd-2 ) { aURL = aURL.copy( 0, aInd ); return sal_True; @@ -222,16 +222,16 @@ PassMap StorageItem::getInfo() { PassMap aResult; - Sequence< ::rtl::OUString > aNodeNames = ConfigItem::GetNodeNames( ::rtl::OUString::createFromAscii("Store") ); + Sequence< ::rtl::OUString > aNodeNames = ConfigItem::GetNodeNames( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")) ); sal_Int32 aNodeCount = aNodeNames.getLength(); Sequence< ::rtl::OUString > aPropNames( aNodeCount ); sal_Int32 aNodeInd; for( aNodeInd = 0; aNodeInd < aNodeCount; ++aNodeInd ) { - aPropNames[aNodeInd] = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" ); + aPropNames[aNodeInd] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['")); aPropNames[aNodeInd] += aNodeNames[aNodeInd]; - aPropNames[aNodeInd] += ::rtl::OUString::createFromAscii( "']/Password" ); + aPropNames[aNodeInd] += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']/Password")); } Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aPropNames ); @@ -279,7 +279,7 @@ void StorageItem::setUseStorage( sal_Bool bUse ) Sequence< ::rtl::OUString > sendNames(1); Sequence< uno::Any > sendVals(1); - sendNames[0] = ::rtl::OUString::createFromAscii( "UseStorage" ); + sendNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseStorage")); sendVals[0] <<= bUse; @@ -292,7 +292,7 @@ void StorageItem::setUseStorage( sal_Bool bUse ) sal_Bool StorageItem::useStorage() { Sequence< ::rtl::OUString > aNodeNames( 1 ); - aNodeNames[0] = ::rtl::OUString::createFromAscii( "UseStorage" ); + aNodeNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseStorage")); Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames ); @@ -319,8 +319,8 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) } Sequence< ::rtl::OUString > aNodeNames( 2 ); - aNodeNames[0] = ::rtl::OUString::createFromAscii( "HasMaster" ); - aNodeNames[1] = ::rtl::OUString::createFromAscii( "Master" ); + aNodeNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasMaster")); + aNodeNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master")); Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames ); @@ -345,8 +345,8 @@ void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, sal_Bool bAccep Sequence< ::rtl::OUString > sendNames(2); Sequence< uno::Any > sendVals(2); - sendNames[0] = ::rtl::OUString::createFromAscii( "HasMaster" ); - sendNames[1] = ::rtl::OUString::createFromAscii( "Master" ); + sendNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasMaster")); + sendNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master")); sal_Bool bHasMaster = ( aEncoded.getLength() > 0 || bAcceptEmpty ); sendVals[0] <<= bHasMaster; @@ -370,11 +370,11 @@ void StorageItem::remove( const ::rtl::OUString& aURL, const ::rtl::OUString& aN Sequence< ::rtl::OUString > sendSeq(1); sendSeq[0] = createIndex( forIndex ); - // sendSeq[0] = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" ); + // sendSeq[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['")); // sendSeq[0] += createIndex( forIndex ); - // sendSeq[0] += ::rtl::OUString::createFromAscii( "']" ); + // sendSeq[0] += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']")); - ConfigItem::ClearNodeElements( ::rtl::OUString::createFromAscii( "Store" ), sendSeq ); + ConfigItem::ClearNodeElements( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")), sendSeq ); } //------------------------------------------------------------------------- @@ -383,7 +383,7 @@ void StorageItem::clear() { Sequence< ::rtl::OUString > sendSeq(1); - ConfigItem::ClearNodeSet( ::rtl::OUString::createFromAscii( "Store" ) ); + ConfigItem::ClearNodeSet( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")) ); } //------------------------------------------------------------------------- @@ -402,14 +402,14 @@ void StorageItem::update( const ::rtl::OUString& aURL, const NamePassRecord& aRe Sequence< beans::PropertyValue > sendSeq(1); - sendSeq[0].Name = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" ); + sendSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['")); sendSeq[0].Name += createIndex( forIndex ); - sendSeq[0].Name += ::rtl::OUString::createFromAscii( "']/Password" ); + sendSeq[0].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']/Password")); sendSeq[0].Value <<= aRecord.GetPersPasswords(); ConfigItem::SetModified(); - ConfigItem::SetSetProperties( ::rtl::OUString::createFromAscii( "Store" ), sendSeq ); + ConfigItem::SetSetProperties( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")), sendSeq ); } //------------------------------------------------------------------------- @@ -440,7 +440,7 @@ PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xSe mComponent = Reference< XComponent >( xServiceFactory, UNO_QUERY ); mComponent->addEventListener( this ); - m_pStorageFile = new StorageItem( this, ::rtl::OUString::createFromAscii( "Office.Common/Passwords" ) ); + m_pStorageFile = new StorageItem( this, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Passwords")) ); if( m_pStorageFile ) if( m_pStorageFile->useStorage() ) m_aContainer = m_pStorageFile->getInfo(); @@ -532,7 +532,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr // problems with decoding OSL_ENSURE( sal_False, "Problem with decoding\n" ); - throw RuntimeException( ::rtl::OUString::createFromAscii( "Can't decode!" ), Reference< XInterface >() ); + throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't decode!")), Reference< XInterface >() ); } @@ -612,7 +612,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr // problems with encoding OSL_ENSURE( sal_False, "Problem with encoding\n" ); - throw RuntimeException( ::rtl::OUString::createFromAscii( "Can't encode!" ), Reference< XInterface >() ); + throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't encode!")), Reference< XInterface >() ); } //------------------------------------------------------------------------- @@ -843,7 +843,7 @@ UrlRecord PasswordContainer::find( { ::rtl::OUString tmpUrl( aUrl ); if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' ) - tmpUrl += ::rtl::OUString::createFromAscii( "/" ); + tmpUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aIter = m_aContainer.lower_bound( tmpUrl ); if( aIter != m_aContainer.end() && aIter->first.match( tmpUrl ) ) @@ -906,7 +906,7 @@ UrlRecord PasswordContainer::find( { PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER; if( !m_pStorageFile || !m_pStorageFile->useStorage() ) - throw NoMasterException( ::rtl::OUString::createFromAscii( "Password storing is not active!" ), Reference< XInterface >(), aRMode ); + throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password storing is not active!")), Reference< XInterface >(), aRMode ); if( !m_aMasterPasswd.getLength() && aHandler.is() ) { @@ -955,7 +955,7 @@ UrlRecord PasswordContainer::find( } if ( !m_aMasterPasswd.getLength() ) - throw NoMasterException( ::rtl::OUString::createFromAscii( "No master password!" ), Reference< XInterface >(), aRMode ); + throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No master password!")), Reference< XInterface >(), aRMode ); return m_aMasterPasswd; } @@ -977,7 +977,7 @@ void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rt if( aInd > 0 && aUrl.getLength()-1 == aInd ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else - aUrl += ::rtl::OUString::createFromAscii( "/" ); + aUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aIter = m_aContainer.find( aUrl ); } @@ -1019,7 +1019,7 @@ void SAL_CALL PasswordContainer::removePersistent( const ::rtl::OUString& aURL, if( aInd > 0 && aUrl.getLength()-1 == aInd ) aUrl = aUrl.copy( 0, aUrl.getLength() - 1 ); else - aUrl += ::rtl::OUString::createFromAscii( "/" ); + aUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aIter = m_aContainer.find( aUrl ); } @@ -1463,7 +1463,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::getSupportedServiceNames Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException) { Sequence< ::rtl::OUString > aRet(1); - *aRet.getArray() = ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer"); + *aRet.getArray() = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.PasswordContainer")); return aRet; } @@ -1471,7 +1471,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedS ::rtl::OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("stardiv.svl.PasswordContainer"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.svl.PasswordContainer")); } //------------------------------------------------------------------------- @@ -1554,8 +1554,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( Reference< XRegistryKey > xNewKey; xNewKey = xRegistryKey->createKey( - ::rtl::OUString::createFromAscii( "/stardiv.svl.PasswordContainer/UNO/SERVICES" )); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer")); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv.svl.PasswordContainer/UNO/SERVICES"))); + xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.PasswordContainer"))); return sal_True; } diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 4ba6d78a660e..5aa63b297e07 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; SysCredentialsConfigItem::SysCredentialsConfigItem( SysCredentialsConfig * pOwner ) -: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ), +: utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Passwords")), CONFIG_MODE_IMMEDIATE_UPDATE ), m_bInited( false ), m_pOwner( pOwner ) @@ -123,7 +123,7 @@ namespace if( aInd > 0 ) { sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd ); - if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) + if ( aURL.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("://")) ) != aPrevInd - 2 || aInd != aURL.getLength() - 1 ) { @@ -157,7 +157,7 @@ namespace { ::rtl::OUString tmpUrl( aUrl ); if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' ) - tmpUrl += ::rtl::OUString::createFromAscii( "/" ); + tmpUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aIter = rContainer.lower_bound( tmpUrl ); if( aIter != rContainer.end() && aIter->match( tmpUrl ) ) diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index a7a932435d24..5317176f51b5 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -52,7 +52,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException) { - return OUString::createFromAscii("com.sun.star.comp.svl.PathService"); + return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.PathService")); } virtual sal_Bool SAL_CALL supportsService ( @@ -66,7 +66,7 @@ public: throw(css::uno::RuntimeException) { css::uno::Sequence< OUString > aRet(1); - aRet.getArray()[0] = OUString::createFromAscii("com.sun.star.config.SpecialConfigManager"); + aRet.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager")); return aRet; } diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index 679f79898d79..e90d5bfe5de6 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -74,18 +74,18 @@ SVL_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo ( OUString::createFromAscii( "/com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject/UNO/SERVICES" ) ); xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.util.NumberFormatsSupplier" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")) ); xNewKey = xRegistryKey->createKey ( OUString::createFromAscii( "/com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject/UNO/SERVICES" ) ); xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter")) ); xNewKey = xRegistryKey->createKey( - OUString::createFromAscii( "/com.sun.star.comp.svl.PathService/UNO/SERVICES" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.svl.PathService/UNO/SERVICES")) ); xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager")) ); return sal_True; } @@ -105,7 +105,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory ( { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.util.NumberFormatsSupplier" ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")); xFactory = ::cppu::createSingleFactory( reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager), @@ -119,7 +119,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory ( { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter")); xFactory = ::cppu::createSingleFactory( reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager), @@ -132,7 +132,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory ( { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager")); xFactory = ::cppu::createSingleFactory ( reinterpret_cast< css::lang::XMultiServiceFactory* >( _pServiceManager ), OUString::createFromAscii( pImplementationName ), |