[Libreoffice-commits] .: 4 commits - chart2/source l10ntools/source sal/qa sal/test sal/workben testtools/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Fri Jun 1 04:31:03 PDT 2012
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 8
chart2/source/controller/main/ChartController.cxx | 2
l10ntools/source/help/HelpLinker.cxx | 6
l10ntools/source/xmlparse.cxx | 114 +++------
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 122 ++++------
sal/test/unloading/samplelib1.cxx | 48 +--
sal/test/unloading/samplelib2.cxx | 36 +-
sal/workben/t_osl_getVolInfo.cxx | 12
sal/workben/t_osl_joinProcess.cxx | 6
testtools/source/bridgetest/multi.cxx | 42 +--
11 files changed, 181 insertions(+), 218 deletions(-)
New commits:
commit 35a30cbc04cee9b8cdffc334f631ce5580a89e03
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jun 1 06:28:51 2012 -0500
targeted string re-work
Change-Id: I7b2dac4afc448b6b694bc48f162f46d2a5a7dddb
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 7656d0b..a95c56b 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -899,7 +899,7 @@ void HelpLinker::main( std::vector<std::string> &args,
//This part is used when compileExtensionHelp is called from the extensions manager.
//If extension help is compiled using helplinker in the build process
rtl::OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
- aIdxCaptionPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcaption.xsl"));
+ aIdxCaptionPathFileURL += rtl::OUString("/idxcaption.xsl");
rtl::OString aOStr_IdxCaptionPathFileURL( rtl::OUStringToOString
( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
@@ -924,7 +924,7 @@ void HelpLinker::main( std::vector<std::string> &args,
//then -idxcontent must be supplied
//This part is used when compileExtensionHelp is called from the extensions manager.
rtl::OUString aIdxContentPathFileURL( *pOfficeHelpPath );
- aIdxContentPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcontent.xsl"));
+ aIdxContentPathFileURL += rtl::OUString("/idxcontent.xsl");
rtl::OString aOStr_IdxContentPathFileURL( rtl::OUStringToOString
( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1058,7 +1058,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
// i83624: Tree files
::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
- aTreeFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/help.tree"));
+ aTreeFileURL += rtl::OUString("/help.tree");
osl::DirectoryItem aTreeFileItem;
osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index ad5197b..bcad104 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -720,7 +720,7 @@ OUString XMLElement::ToOUString(){
/*****************************************************************************/
void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement ){
/*****************************************************************************/
- static const OUString XML_LANG ( RTL_CONSTASCII_USTRINGPARAM("xml-lang") );
+ static const OUString XML_LANG ( "xml-lang" );
if(pCur!=NULL){
if(rootelement){
@@ -742,34 +742,34 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
XMLElement *pElement = ( XMLElement * ) pCur;
if( !pElement->GetName().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("comment")) ){
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\<")) );
+ buffer.append( OUString("\\<") );
buffer.append( pElement->GetName() );
if ( pElement->GetAttributeList()){
for ( size_t j = 0; j < pElement->GetAttributeList()->size(); j++ ){
OUString aAttrName( (*pElement->GetAttributeList())[ j ]->GetName() );
if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) ) {
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) );
+ buffer.append( OUString(" ") );
buffer.append( aAttrName );
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
+ buffer.append( OUString("=") );
+ buffer.append( OUString("\\\"") );
buffer.append( (*pElement->GetAttributeList())[ j ]->GetValue() );
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
+ buffer.append( OUString("\\\"") );
}
}
}
if ( !pElement->GetChildList())
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("/\\>")) );
+ buffer.append( OUString("/\\>") );
else {
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
+ buffer.append( OUString("\\>") );
XMLChildNode* tmp=NULL;
for ( size_t k = 0; k < pElement->GetChildList()->size(); k++ ){
tmp = (*pElement->GetChildList())[ k ];
Print( tmp, buffer , false);
}
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\</")) );
+ buffer.append( OUString("\\</") );
buffer.append( pElement->GetName() );
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
+ buffer.append( OUString("\\>") );
}
}
}
@@ -782,9 +782,9 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
break;
case XML_NODE_TYPE_COMMENT: {
XMLComment *pComment = ( XMLComment * ) pCur;
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("<!--")) );
+ buffer.append( OUString("<!--") );
buffer.append( pComment->GetComment() );
- buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("-->")) );
+ buffer.append( OUString("-->") );
}
break;
case XML_NODE_TYPE_DEFAULT: {
@@ -1031,8 +1031,7 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXML
aErrorInformation.eCode = XML_ERROR_NONE;
aErrorInformation.nLine = 0;
aErrorInformation.nColumn = 0;
- aErrorInformation.sMessage = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("ERROR: Unable to open file "));
+ aErrorInformation.sMessage = rtl::OUString( "ERROR: Unable to open file ");
aErrorInformation.sMessage += rFileName;
rtl::OUString aFileURL(common::pathnameToAbsoluteUrl(rFileName));
@@ -1065,15 +1064,12 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXML
aErrorInformation.nLine = 0;
aErrorInformation.nColumn = 0;
if ( !pXMLFile->GetName().isEmpty()) {
- aErrorInformation.sMessage = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("File "));
+ aErrorInformation.sMessage = rtl::OUString( "File ");
aErrorInformation.sMessage += pXMLFile->GetName();
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(" parsed successfully"));
+ aErrorInformation.sMessage += rtl::OUString( " parsed successfully");
}
else
- aErrorInformation.sMessage = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("XML-File parsed successfully"));
+ aErrorInformation.sMessage = rtl::OUString( "XML-File parsed successfully");
if (!XML_Parse(aParser, reinterpret_cast< char * >(p), s, true))
{
@@ -1081,110 +1077,84 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXML
aErrorInformation.nLine = XML_GetErrorLineNumber( aParser );
aErrorInformation.nColumn = XML_GetErrorColumnNumber( aParser );
- aErrorInformation.sMessage = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("ERROR: "));
+ aErrorInformation.sMessage = rtl::OUString( "ERROR: ");
if ( !pXMLFile->GetName().isEmpty())
aErrorInformation.sMessage += pXMLFile->GetName();
else
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("XML-File ("));
+ aErrorInformation.sMessage += rtl::OUString( "XML-File (");
aErrorInformation.sMessage += rtl::OUString::valueOf(
sal::static_int_cast< sal_Int64 >(aErrorInformation.nLine));
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(","));
+ aErrorInformation.sMessage += rtl::OUString( ",");
aErrorInformation.sMessage += rtl::OUString::valueOf(
sal::static_int_cast< sal_Int64 >(aErrorInformation.nColumn));
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("): "));
+ aErrorInformation.sMessage += rtl::OUString( "): ");
switch (aErrorInformation.eCode) {
case XML_ERROR_NO_MEMORY:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("No memory"));
+ aErrorInformation.sMessage += rtl::OUString( "No memory");
break;
case XML_ERROR_SYNTAX:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Syntax"));
+ aErrorInformation.sMessage += rtl::OUString( "Syntax");
break;
case XML_ERROR_NO_ELEMENTS:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("No elements"));
+ aErrorInformation.sMessage += rtl::OUString( "No elements");
break;
case XML_ERROR_INVALID_TOKEN:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Invalid token"));
+ aErrorInformation.sMessage += rtl::OUString( "Invalid token");
break;
case XML_ERROR_UNCLOSED_TOKEN:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Unclosed token"));
+ aErrorInformation.sMessage += rtl::OUString( "Unclosed token");
break;
case XML_ERROR_PARTIAL_CHAR:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Partial char"));
+ aErrorInformation.sMessage += rtl::OUString( "Partial char");
break;
case XML_ERROR_TAG_MISMATCH:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Tag mismatch"));
+ aErrorInformation.sMessage += rtl::OUString( "Tag mismatch");
break;
case XML_ERROR_DUPLICATE_ATTRIBUTE:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Dublicat attribute"));
+ aErrorInformation.sMessage += rtl::OUString( "Dublicat attribute");
break;
case XML_ERROR_JUNK_AFTER_DOC_ELEMENT:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Junk after doc element"));
+ aErrorInformation.sMessage += rtl::OUString( "Junk after doc element");
break;
case XML_ERROR_PARAM_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Param entity ref"));
+ aErrorInformation.sMessage += rtl::OUString( "Param entity ref");
break;
case XML_ERROR_UNDEFINED_ENTITY:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Undefined entity"));
+ aErrorInformation.sMessage += rtl::OUString( "Undefined entity");
break;
case XML_ERROR_RECURSIVE_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Recursive entity ref"));
+ aErrorInformation.sMessage += rtl::OUString( "Recursive entity ref");
break;
case XML_ERROR_ASYNC_ENTITY:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Async_entity"));
+ aErrorInformation.sMessage += rtl::OUString( "Async_entity");
break;
case XML_ERROR_BAD_CHAR_REF:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Bad char ref"));
+ aErrorInformation.sMessage += rtl::OUString( "Bad char ref");
break;
case XML_ERROR_BINARY_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Binary entity"));
+ aErrorInformation.sMessage += rtl::OUString( "Binary entity");
break;
case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Attribute external entity ref"));
+ aErrorInformation.sMessage += rtl::OUString( "Attribute external entity ref");
break;
case XML_ERROR_MISPLACED_XML_PI:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Misplaced xml pi"));
+ aErrorInformation.sMessage += rtl::OUString( "Misplaced xml pi");
break;
case XML_ERROR_UNKNOWN_ENCODING:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Unknown encoding"));
+ aErrorInformation.sMessage += rtl::OUString( "Unknown encoding");
break;
case XML_ERROR_INCORRECT_ENCODING:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Incorrect encoding"));
+ aErrorInformation.sMessage += rtl::OUString( "Incorrect encoding");
break;
case XML_ERROR_UNCLOSED_CDATA_SECTION:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Unclosed cdata section"));
+ aErrorInformation.sMessage += rtl::OUString( "Unclosed cdata section");
break;
case XML_ERROR_EXTERNAL_ENTITY_HANDLING:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("External entity handling"));
+ aErrorInformation.sMessage += rtl::OUString( "External entity handling");
break;
case XML_ERROR_NOT_STANDALONE:
- aErrorInformation.sMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Not standalone"));
+ aErrorInformation.sMessage += rtl::OUString( "Not standalone");
break;
case XML_ERROR_NONE:
break;
commit 0a321bfc804d389fe7e7cfe388a9cbeda8f89f74
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jun 1 06:21:08 2012 -0500
targeted string re-work
Change-Id: I8e6b9ac1e9382e7dcd51421263e1fb51605565ca
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index f85da83..29ae9f8 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -87,8 +87,7 @@ using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Diagram" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Diagram" );
enum
{
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 702fff3..330346f 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -389,10 +389,10 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
- aServices[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartArea"));
- aServices[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineProperties"));
- aServices[ 2 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FillProperties"));
- aServices[ 3 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.UserDefinedAttributeSupplier"));
+ aServices[ 0 ] = ::rtl::OUString("com.sun.star.chart.ChartArea");
+ aServices[ 1 ] = ::rtl::OUString("com.sun.star.drawing.LineProperties");
+ aServices[ 2 ] = ::rtl::OUString("com.sun.star.drawing.FillProperties");
+ aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributeSupplier");
return aServices;
}
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 7c4595d..097c057 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -346,7 +346,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
{
uno::Sequence< rtl::OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
- aSNS.getArray()[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Controller" ) );
+ aSNS.getArray()[ 1 ] = ::rtl::OUString( "com.sun.star.frame.Controller" );
//// @todo : add additional services if you support any further
return aSNS;
}
commit f713237cc38fe682f7cd35bd61562a90befbf8eb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jun 1 06:18:43 2012 -0500
targeted string re-work
Change-Id: I81e04e43efd512d88b904cdd5b7fdd5aa54eea02
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index 4cb4080..c3cdc08 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -135,32 +135,32 @@ rtl::OUString testMulti(
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn11(5));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc")),
+ rtl::OUString("12" "abc"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc"))));
+ rtl::OUString("abc")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
+ rtl::OUString("12" "abc-2"),
static_cast< test::testtools::bridgetest::XMultiBase2 * >(
- multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
+ multi.get())->fn12(rtl::OUString("abc-2")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
+ rtl::OUString("12" "abc-2"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
+ rtl::OUString("abc-2")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
+ rtl::OUString("12" "abc-5"),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
+ multi.get())->fn12(rtl::OUString("abc-5")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
+ rtl::OUString("12" "abc-5"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
+ rtl::OUString("abc-5")));
checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22" "de")),
- multi->fn22(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
+ rtl::OUString("22" "de"),
+ multi->fn22(rtl::OUString("de")));
checkEqual< sal_Int32 >(
31 * 3,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -200,19 +200,19 @@ rtl::OUString testMulti(
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->getatt3());
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f")),
+ rtl::OUString("32" "f"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
multi, css::uno::UNO_QUERY_THROW)->fn32(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f"))));
+ rtl::OUString("f")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
+ rtl::OUString("32" "f-5"),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn32(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
+ multi.get())->fn32(rtl::OUString("f-5")));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
+ rtl::OUString("32" "f-5"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn32(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
+ rtl::OUString("f-5")));
checkEqual< sal_Int32 >(
33,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -228,12 +228,12 @@ rtl::OUString testMulti(
checkEqual< sal_Int32 >(41 * 4, multi->fn41(4));
checkEqual< sal_Int32 >(61 * 6, multi->fn61(6));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62" "")),
+ rtl::OUString("62" ""),
multi->fn62(rtl::OUString()));
checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
checkEqual(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72" "g")),
- multi->fn72(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("g"))));
+ rtl::OUString("72" "g"),
+ multi->fn72(rtl::OUString("g")));
checkEqual< sal_Int32 >(73, multi->fn73());
} catch (CheckFailed const & f) {
return f.message;
commit 55bfc3b62a0ffd38bec682b03856505cf8cb7172
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jun 1 06:17:05 2012 -0500
targeted string re-work
Change-Id: I6b23bd671c3c090a7c3b60d5301c59da5f9354d5
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 38ffcd4..8f6c929 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -94,7 +94,7 @@ inline ::rtl::OUString getModulePath( void )
suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
- suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
+ suDirPath += rtl::OUString("bin");
return suDirPath;
}
@@ -121,12 +121,12 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
{
rtl::OUString aDirURL(getExecutableDirectory());
- aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aDirURL += OUString("/");
aDirURL += OUString::createFromAscii( _sFilename.getStr() );
#if defined(WNT)
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
+ aDirURL += rtl::OUString(".ini");
#else
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
+ aDirURL += rtl::OUString("rc");
#endif
return aDirURL;
}
@@ -211,7 +211,7 @@ namespace rtl_Bootstrap
{
Bootstrap aBootstrap;
rtl::OUString suValue;
- rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SOLAR_JAVA"));
+ rtl::OUString suValuename ("SOLAR_JAVA");
//aBootstrap.getFrom( suValuename, suValue );
aBootstrap.getFrom( suValuename, suValue );
sal_Char * pStr = getenv("SOLAR_JAVA");
@@ -223,7 +223,7 @@ namespace rtl_Bootstrap
{
Bootstrap aBootstrap;
rtl::OUString suValue;
- rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SRC_ROOT"));
+ rtl::OUString suValuename ("SRC_ROOT");
//aBootstrap.getFrom( suValuename, suValue );
aBootstrap.getFrom( suValuename, suValue );
sal_Char * pStr = getenv("SRC_ROOT");
@@ -244,7 +244,7 @@ namespace rtl_Bootstrap
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname );
rtl::OUString suGetname;
- rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+ rtl::OUString suValuename ("INHERITED_VALUE");
aBootstrap.getFrom( suValuename, suGetname );
printUString( suGetname );
CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", suGetname.getLength() != 0 );
@@ -256,8 +256,8 @@ namespace rtl_Bootstrap
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname );
rtl::OUString suGetname;
- rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("MY_VALUE"));
- rtl::OUString myDefault(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString suValuename("MY_VALUE");
+ rtl::OUString myDefault("2");
aBootstrap.getFrom( suValuename, suGetname, myDefault );
CPPUNIT_ASSERT_MESSAGE("getFrom use default.", suGetname.compareTo( myDefault ) == 0 );
}
@@ -274,26 +274,26 @@ namespace rtl_Bootstrap
aBootstrap.getIniName( suGetIniName );
printUString(suGetIniName, "Current bootstrap file");
- sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo")));
+ sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString("pseudo"));
CPPUNIT_ASSERT_MESSAGE("ini name must have 'pseudo' in name.", nIndex > 0);
rtl::OUString suValue;
- rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
+ rtl::OUString suKeyName("FILE");
aBootstrap.getFrom( suKeyName, suValue );
printUString( suValue );
- sal_Int32 nCompare = suValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo file")) );
+ sal_Int32 nCompare = suValue.compareTo( rtl::OUString("pseudo file") );
CPPUNIT_ASSERT_MESSAGE("<Bootstrap('pseudo')>.getFrom('FILE', ...) result is unexpected.", nCompare == 0);
}
void getFrom_004_1()
{
// get the same key out of the default context
- rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
+ rtl::OUString suKeyName("FILE");
rtl::OUString suGetValue;
Bootstrap::get( suKeyName, suGetValue );
printUString( suGetValue );
- CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2 file")) ) == 0 );
+ CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString("testshl2 file") ) == 0 );
}
/** helper function: return the child process's ret value( typedef sal_uInt32 oslProcessExitCode;)
@@ -304,14 +304,14 @@ namespace rtl_Bootstrap
rtl::OUString suCWD = getModulePath();
oslProcess hProcess = NULL;
rtl::OUString suFileURL = suCWD;
- suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString::createFromAscii(process_name) ;
+ suFileURL += rtl::OUString("/") + rtl::OUString::createFromAscii(process_name) ;
#if defined(WNT)
- suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
+ suFileURL += rtl::OUString(".exe");
#endif
const int nParameterCount = 3;
rtl_uString* pParameters[ nParameterCount ];
OUString suFlag( OUString::createFromAscii(flag) );
- OUString suEnv1( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_SERVICES=service.rdb") );
+ OUString suEnv1( "-env:UNO_SERVICES=service.rdb" );
OUString suIniname = t_getSourcePath("rtl");
printUString( suIniname, "rtl path:");
@@ -446,7 +446,7 @@ namespace rtl_Bootstrap
Bootstrap::setIniFilename( suIniname );
rtl::OUString suGetname;
- rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+ rtl::OUString suValuename("INHERITED_VALUE");
Bootstrap::get( suValuename, suGetname );
printUString( suGetname );
CPPUNIT_ASSERT_MESSAGE("setIniFilename and get value of the argument.", suGetname.getLength() != 0 );
@@ -486,7 +486,7 @@ namespace rtl_Bootstrap
CPPUNIT_ASSERT_MESSAGE("getHandle return NULL!", bsHandle != 0);
rtl::OUString suValue;
- rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("PSEUDOFILE"));
+ rtl::OUString suKeyName("PSEUDOFILE");
rtl_bootstrap_get_from_handle(bsHandle, suKeyName.pData, &suValue.pData, NULL);
printUString( suValue);
@@ -516,8 +516,8 @@ namespace rtl_Bootstrap
//in ini fle, INHERITED_VALUE=inherited_value
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname);
- rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
- rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("ok"));
+ rtl::OUString suName("INHERITED_VALUE");
+ rtl::OUString suValue("ok");
// set to another value
Bootstrap::set( suName, suValue );
rtl::OUString suGetValue;
@@ -528,13 +528,13 @@ namespace rtl_Bootstrap
{
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap myBootstrap( suIniname);
- rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+ rtl::OUString suName("INHERITED_VALUE");
rtl::OUString suGetOrientValue;
Bootstrap::get( suName, suGetOrientValue);
// ?? INHERITED_VALUE = ok now, which is set in set_001
printUString( suGetOrientValue );
- rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM( TESTSHL2_INI ));
+ rtl::OUString suValue( TESTSHL2_INI );
// set to another value
Bootstrap::set( suName, suValue );
rtl::OUString suGetValue;
@@ -562,10 +562,10 @@ namespace rtl_Bootstrap
{
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname);
- rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$MYVAR/expand1"));
+ rtl::OUString suMacro("$MYVAR/expand1");
//expandMacro now
aBootstrap.expandMacrosFrom( suMacro );
- rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_test/expand1"));
+ rtl::OUString suExpectedMacro("src680_test/expand1");
CPPUNIT_ASSERT_MESSAGE("expandMacrosFrom failed.", suMacro.compareTo(suExpectedMacro) == 0 );
}
@@ -583,26 +583,26 @@ namespace rtl_Bootstrap
t_print("inifile is:");
printUString( suIniname );
Bootstrap aBootstrap( suIniname) ;
- rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("${")); //rtlrc:Bootstrap:RTLVALUE}");
+ rtl::OUString suMacro("${"); //rtlrc:Bootstrap:RTLVALUE}");
- rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
- aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl"));
+ rtl::OUString aDirURL("$ORIGIN");
+ aDirURL += OUString("/");
+ aDirURL += OUString("rtl");
#if defined(WNT)
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
+ aDirURL += rtl::OUString(".ini");
#else
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
+ aDirURL += rtl::OUString("rc");
#endif
suMacro += aDirURL;//t_getSourcePath("rtl");
- suMacro += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("::RTLVALUE}"));
+ suMacro += rtl::OUString("::RTLVALUE}");
t_print("created macro is: ");
printUString( suMacro );
aBootstrap.expandMacrosFrom( suMacro );
t_print("expanded macro is:");
printUString( suMacro );
- rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("qadev17"));
+ rtl::OUString suExpectedMacro("qadev17");
CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${file:///.../" SAL_CONFIGFILE("rtl") "::RTLVALUE}' to 'qadev17'", suMacro.compareTo(suExpectedMacro) == 0 );
}
void expandMacrosFrom_002_1()
@@ -614,19 +614,19 @@ namespace rtl_Bootstrap
rtl::OUString suMacro;
// just a simple test, if this really work.
- aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE2")), suMacro );
+ aBootstrap.getFrom(rtl::OUString("SOFROMVALUE2"), suMacro );
t_print("SOFROMVALUE2:");
printUString( suMacro );
CPPUNIT_ASSERT_MESSAGE("'SOFROMVALUE2' seems to do not exist.", suMacro.getLength() > 0 );
- aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE")), suMacro );
+ aBootstrap.getFrom(rtl::OUString("SOFROMVALUE"), suMacro );
t_print("SOFROMVALUE:");
printUString( suMacro );
//expandMacro now
// seems to be, that getFrom() already expand the string
- rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_qadev"));
+ rtl::OUString suExpectedMacro("src680_qadev");
CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${" SAL_CONFIGFILE("rtl") "::SOVALUE}' to 'src680_qadev'", suMacro.compareTo(suExpectedMacro) == 0 );
}
void expandMacrosFrom_002_2()
@@ -640,7 +640,7 @@ namespace rtl_Bootstrap
Bootstrap aBootstrap( suIniname);
rtl::OUString suMacro;
- aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE3")), suMacro );
+ aBootstrap.getFrom(rtl::OUString("SOFROMVALUE3"), suMacro );
t_print("SOFROMVALUE3:");
printUString( suMacro );
@@ -659,10 +659,10 @@ namespace rtl_Bootstrap
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname);
rtl::OUString suMacro[4];
- suMacro[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
- suMacro[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERHOME"));
- suMacro[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSBINDIR"));
- suMacro[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
+ suMacro[0] = rtl::OUString("$SYSUSERCONFIG");
+ suMacro[1] = rtl::OUString("$SYSUSERHOME");
+ suMacro[2] = rtl::OUString("$SYSBINDIR");
+ suMacro[3] = rtl::OUString("$ORIGIN");
for ( int i = 0; i < 4; i++ )
{
@@ -676,34 +676,28 @@ namespace rtl_Bootstrap
}
void testRecursion() {
- rtl::OUString t(RTL_CONSTASCII_USTRINGPARAM("$RECURSIVE"));
+ rtl::OUString t("$RECURSIVE");
Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t);
CPPUNIT_ASSERT_MESSAGE( "recursion detection", t == "***RECURSION DETECTED***" );
}
void testLink() {
- rtl::OUString t(RTL_CONSTASCII_USTRINGPARAM("$LINKED"));
+ rtl::OUString t("$LINKED");
Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t);
CPPUNIT_ASSERT_MESSAGE( "link file", t == "qadev17");
}
void testOverride() {
- rtl::OUString t1(
- RTL_CONSTASCII_USTRINGPARAM(
- "${.override:$ORIGIN/" SAL_CONFIGFILE("rtl") ":ORIGIN}"));
+ rtl::OUString t1( "${.override:$ORIGIN/" SAL_CONFIGFILE("rtl" ":ORIGIN}"));
Bootstrap(t_getSourcePath("rtl")).expandMacrosFrom(t1);
CPPUNIT_ASSERT_MESSAGE( "override ORIGIN", t1 == "direct" );
- rtl::OUString t2(
- RTL_CONSTASCII_USTRINGPARAM(
- "${.override:$ORIGIN/" SAL_CONFIGFILE("none") ":MYVAR}"));
+ rtl::OUString t2( "${.override:$ORIGIN/" SAL_CONFIGFILE("none" ":MYVAR}"));
Bootstrap::expandMacros(t2);
CPPUNIT_ASSERT_MESSAGE( "override MYVAR", t2 == "src680_test" );
}
void testNonexisting() {
- rtl::OUString t(
- RTL_CONSTASCII_USTRINGPARAM(
- "${$ORIGIN/" SAL_CONFIGFILE("none") ":MYVAR}"));
+ rtl::OUString t( "${$ORIGIN/" SAL_CONFIGFILE("none" ":MYVAR}"));
Bootstrap::expandMacros(t);
CPPUNIT_ASSERT_MESSAGE( "nonexisting", t == "src680_test" );
}
@@ -757,13 +751,13 @@ namespace rtl_Bootstrap
{
rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
Bootstrap aBootstrap( suIniname) ;
- rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$INHERITED_VALUE/well"));
+ rtl::OUString suMacro("$INHERITED_VALUE/well");
Bootstrap::expandMacros( suMacro );
- rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+ rtl::OUString suName("INHERITED_VALUE");
OUString suGetValue;
Bootstrap::get( suName, suGetValue );
- suGetValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/well"));
+ suGetValue += OUString("/well");
CPPUNIT_ASSERT_MESSAGE("expandMacros failed.", suGetValue.compareTo(suMacro) == 0 );
}
@@ -821,9 +815,9 @@ static void create_rtlrc()
{
rtl::OUString aFileURL(getExecutableDirectory());
#if defined(WNT)
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini"));
+ aFileURL += rtl::OUString("/rtl.ini");
#else
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc"));
+ aFileURL += rtl::OUString("/rtlrc");
#endif
rtl::OString sLines;
@@ -844,9 +838,9 @@ static void create_testshl2rc()
{
rtl::OUString aFileURL(getExecutableDirectory());
#if defined(WNT)
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini"));
+ aFileURL += rtl::OUString("/testshl2.ini");
#else
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc"));
+ aFileURL += rtl::OUString("/testshl2rc");
#endif
rtl::OString sLines;
sLines += "[Bootstrap]\n";
@@ -874,7 +868,7 @@ static void create_testshl2rc()
removeAndCreateFile(
(getExecutableDirectory() +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2-link"))),
+ rtl::OUString("/testshl2-link")),
SAL_CONFIGFILE("rtl"));
}
@@ -884,9 +878,9 @@ static void create_pseudorc()
{
rtl::OUString aFileURL(getExecutableDirectory());
#if defined(WNT)
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini"));
+ aFileURL += rtl::OUString("/pseudo.ini");
#else
- aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc"));
+ aFileURL += rtl::OUString("/pseudorc");
#endif
rtl::OString sLines;
sLines += "[Bootstrap]\n";
@@ -901,9 +895,9 @@ void create_bootstrap_processrc()
{
rtl::OUString aDirURL(getModulePath());
#if defined(WNT)
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini"));
+ aDirURL += rtl::OUString("/bootstrap_process.ini");
#else
- aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc"));
+ aDirURL += rtl::OUString("/bootstrap_processrc");
#endif
rtl::OString sLines;
sLines += "[Bootstrap]\n";
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 78835cd..19ec2e2 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -106,29 +106,29 @@ static Reference<XInterface> SAL_CALL test1_createInstance(const Reference<XMult
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)) )), UNO_QUERY);
+ OUString( IMPLNAME1),
+ OUString( SERVICENAME1) )), UNO_QUERY);
}
static Reference<XInterface> SAL_CALL test2_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)) )), UNO_QUERY);
+ OUString( IMPLNAME2),
+ OUString( SERVICENAME2) )), UNO_QUERY);
}
static Reference<XInterface> SAL_CALL test3_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)) )), UNO_QUERY);
+ OUString( IMPLNAME3),
+ OUString( SERVICENAME3) )), UNO_QUERY);
}
static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME4)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)) )), UNO_QUERY);
+ OUString( IMPLNAME4),
+ OUString( SERVICENAME4) )), UNO_QUERY);
}
@@ -142,26 +142,26 @@ extern "C" {
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
+ OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
- xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
+ xNewKey->createKey( OUString( SERVICENAME1));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
+ OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) );
- xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
+ xNewKey->createKey(OUString( SERVICENAME2));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" )) );
+ OUString( "/" IMPLNAME3 "/UNO/SERVICES" ) );
- xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
+ xNewKey->createKey(OUString( SERVICENAME3));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME4 "/UNO/SERVICES" )) );
+ OUString( "/" IMPLNAME4 "/UNO/SERVICES" ) );
- xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
+ xNewKey->createKey(OUString( SERVICENAME4));
return sal_True;
}
catch (const InvalidRegistryException &)
@@ -177,14 +177,14 @@ extern "C" {
void * pRet = 0;
- OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
- OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
- OUString implname2( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2) );
- OUString serviceName2( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2) );
- OUString implname3( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3) );
- OUString serviceName3( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3) );
- OUString implname4( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME4) );
- OUString serviceName4( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4) );
+ OUString implname1( IMPLNAME1 );
+ OUString serviceName1( SERVICENAME1 );
+ OUString implname2( IMPLNAME2 );
+ OUString serviceName2( SERVICENAME2 );
+ OUString implname3( IMPLNAME3 );
+ OUString serviceName3( SERVICENAME3 );
+ OUString implname4( IMPLNAME4 );
+ OUString serviceName4( SERVICENAME4 );
if (implname1.equals( OUString::createFromAscii(pImplName)))
{
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 142472a..2e7be25 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -103,22 +103,22 @@ static Reference<XInterface> SAL_CALL test21_createInstance(const Reference<XMul
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)) )), UNO_QUERY);
+ OUString( IMPLNAME1),
+ OUString( SERVICENAME1) )), UNO_QUERY);
}
static Reference<XInterface> SAL_CALL test22_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)) )), UNO_QUERY);
+ OUString( IMPLNAME2),
+ OUString( SERVICENAME2) )), UNO_QUERY);
}
static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
throw (RuntimeException)
{
return Reference<XInterface>( static_cast<XWeak*>( new TestService(
- OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3)),
- OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)) )), UNO_QUERY);
+ OUString( IMPLNAME3),
+ OUString( SERVICENAME3) )), UNO_QUERY);
}
@@ -132,20 +132,20 @@ extern "C" {
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
+ OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
- xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
+ xNewKey->createKey( OUString( SERVICENAME1));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
+ OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) );
- xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
+ xNewKey->createKey(OUString( SERVICENAME2));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" )) );
+ OUString( "/" IMPLNAME3 "/UNO/SERVICES" ) );
- xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
+ xNewKey->createKey(OUString( SERVICENAME3));
return sal_True;
}
@@ -162,12 +162,12 @@ extern "C" {
void * pRet = 0;
- OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
- OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
- OUString implname2( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2) );
- OUString serviceName2( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2) );
- OUString implname3( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3) );
- OUString serviceName3( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3) );
+ OUString implname1( IMPLNAME1 );
+ OUString serviceName1( SERVICENAME1 );
+ OUString implname2( IMPLNAME2 );
+ OUString serviceName2( SERVICENAME2 );
+ OUString implname3( IMPLNAME3 );
+ OUString serviceName3( SERVICENAME3 );
if (implname1.equals( OUString::createFromAscii(pImplName)))
{
diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx
index 5db4588..1e9e425 100644
--- a/sal/workben/t_osl_getVolInfo.cxx
+++ b/sal/workben/t_osl_getVolInfo.cxx
@@ -88,28 +88,28 @@ public:
void test_osl_getVolumeInformation()
{
- rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_1));
+ rtl::OUString path = rtl::OUString(TEST_PATH_1);
rtl::OUString path_url;
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_2));
+ path = rtl::OUString(TEST_PATH_2);
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_3));
+ path = rtl::OUString(TEST_PATH_3);
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_4));
+ path = rtl::OUString(TEST_PATH_4);
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_5));
+ path = rtl::OUString(TEST_PATH_5);
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_6));
+ path = rtl::OUString(TEST_PATH_6);
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
}
diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx
index 93b2e6b..60914ee 100644
--- a/sal/workben/t_osl_joinProcess.cxx
+++ b/sal/workben/t_osl_joinProcess.cxx
@@ -36,12 +36,12 @@
#include <signal.h>
#ifdef WNT
- const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx.exe"));
+ const rtl::OUString IMAGE_NAME("ojpx.exe");
#else
- const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx"));
+ const rtl::OUString IMAGE_NAME("ojpx");
#endif
-const rtl::OUString CWD(RTL_CONSTASCII_USTRINGPARAM("."));
+const rtl::OUString CWD(".");
class Test_osl_Process : public CppUnit::TestFixture
{
More information about the Libreoffice-commits
mailing list