Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2863
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2863/1
simplify OUString assignments
Change-Id: Ieffd80aa84c9a041785bb81b3a904a32d00cb2bb
---
M basegfx/test/basegfx2d.cxx
M chart2/source/controller/main/ConfigurationAccess.cxx
M comphelper/source/container/embeddedobjectcontainer.cxx
M comphelper/source/misc/locale.cxx
M connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
M connectivity/source/commontools/ParamterSubstitution.cxx
M connectivity/source/commontools/TPrivilegesResultSet.cxx
M connectivity/source/commontools/dbtools.cxx
M testtools/source/bridgetest/constructors.cxx
M ucb/source/ucp/webdav/webdavresponseparser.cxx
M unotools/source/config/moduleoptions.cxx
M unoxml/source/rdf/CBlankNode.cxx
M unoxml/source/rdf/CLiteral.cxx
M unoxml/source/rdf/CURI.cxx
M xmloff/source/chart/PropertyMaps.cxx
M xmloff/source/chart/SchXMLChartContext.cxx
M xmloff/source/forms/eventexport.cxx
M xmloff/source/text/XMLTextListBlockContext.cxx
M xmloff/source/text/XMLTextMarkImportContext.cxx
M xmloff/source/text/XMLTextNumRuleInfo.hxx
20 files changed, 93 insertions(+), 97 deletions(-)
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index aea6c35..4abcf6c 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -65,18 +65,15 @@
void setUp()
{
// simple rectangle
- aPath0 = ::rtl::OUString(
- "M 10 10-10 10-10-10 10-10Z" );
+ aPath0 = "M 10 10-10 10-10-10 10-10Z";
// simple bezier polygon
- aPath1 = ::rtl::OUString(
- "m11430 0c-8890 3810 5715 6985 5715 6985 "
+ aPath1 = "m11430 0c-8890 3810 5715 6985 5715 6985 "
"0 0-17145-1905-17145-1905 0 0 22860-10160 "
- "16510 6350-6350 16510-3810-11430-3810-11430z" );
+ "16510 6350-6350 16510-3810-11430-3810-11430z";
// '@' as a bezier polygon
- aPath2 = ::rtl::OUString(
- "m1917 1114c-89-189-233-284-430-284-167 "
+ aPath2 = "m1917 1114c-89-189-233-284-430-284-167 "
"0-306 91-419 273-113 182-170 370-170 564 "
"0 145 33 259 98 342 65 84 150 126 257 126 "
"77 0 154-19 231-57 77-38 147-97 210-176 63"
@@ -98,11 +95,10 @@
"-215-201-487-301-816-301-395 0-715 124-960 "
"373-245 249-368 569-368 958 0 385 119 685 "
"357 900 237 216 557 324 958 325 189-1 389-27 "
- "600-77 211-52 378-110 503-174 27 70 54 140 81 210z" );
+ "600-77 211-52 378-110 503-174 27 70 54 140 81 210z";
// first part of 'Hello World' as a line polygon
- aPath3 = ::rtl::OUString(
- "m1598 125h306v2334h-306v-1105h-1293v1105h-305v"
+ aPath3 = "m1598 125h306v2334h-306v-1105h-1293v1105h-305v"
"-2334h305v973h1293zm2159 1015 78-44 85 235-91 "
"47-91 40-90 34-90 29-89 21-88 16-88 10-88 3-102"
"-4-97-12-91-19-85-26-40-16-39-18-38-20-36-22-34"
@@ -133,7 +129,7 @@
"-26-29-28-28-30-26-32-25-32-23-35-21-35-38-74-30-80"
"-24-85-17-89-11-95-3-100 3-101 11-95 17-90 24-85 30"
"-79 38-75 21-35 23-35 25-32 26-32 28-30 29-28 30-26 "
- "31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z" );
+ "31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z";
}
void tearDown()
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx
b/chart2/source/controller/main/ConfigurationAccess.cxx
index 621e918..812dbe5 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -76,11 +76,11 @@
{
FieldUnit eResult( FUNIT_CM );
- uno::Sequence< ::rtl::OUString > aNames( 1 );
+ uno::Sequence< OUString > aNames( 1 );
if( lcl_IsMetric() )
- aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/Metric" );
+ aNames[ 0 ] = "Other/MeasureUnit/Metric";
else
- aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/NonMetric" );
+ aNames[ 0 ] = "Other/MeasureUnit/NonMetric";
uno::Sequence< uno::Any > aResult( GetProperties( aNames ));
sal_Int32 nValue = 0;
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 8f449b5..ad55865 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1032,7 +1032,7 @@
pImpl->mxTempStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
uno::Sequence < beans::PropertyValue > aSeq;
- ::rtl::OUString aTmpPersistName = ::rtl::OUString( "Object " );
+ OUString aTmpPersistName = "Object ";
aTmpPersistName += ::rtl::OUString::valueOf( (sal_Int32)
pImpl->maTempObjectContainer.size() );
xPersist->storeAsEntry( pImpl->mxTempStorage, aTmpPersistName, aSeq, aSeq );
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index f11a13d..d1d528c 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -124,9 +124,9 @@
void Locale::fromISO(const ::rtl::OUString& sISO)
throw(Locale::MalFormedLocaleException)
{
- m_sLanguage = ::rtl::OUString();
- m_sCountry = ::rtl::OUString();
- m_sVariant = ::rtl::OUString();
+ m_sLanguage = "";
+ m_sCountry = "";
+ m_sVariant = "";
::rtl::OUString sParser(sISO);
sParser = sParser.trim();
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 6b8f9c0..284d2cf 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -821,10 +821,10 @@
return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
}
//------------------------------------------------------------------------------
- Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( )
throw (RuntimeException)
+ Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw
(RuntimeException)
{
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+ Sequence< OUString > aSNS( 1 );
+ aSNS[0] = "com.sun.star.sdbc.ResultSet";
return aSNS;
}
//------------------------------------------------------------------
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx
b/connectivity/source/commontools/ParamterSubstitution.cxx
index 91fa458..aa48760 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -65,10 +65,10 @@
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw
(RuntimeException)
+ Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw
(RuntimeException)
{
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString("com.sun.star.sdb.ParameterSubstitution");
+ Sequence< OUString > aSNS( 1 );
+ aSNS[0] = "com.sun.star.sdb.ParameterSubstitution";
return aSNS;
}
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx
b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 8a4baa2..3aec1f8 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -38,11 +38,11 @@
osl_atomic_increment( &m_refCount );
{
::rtl::OUString sUserWorkingFor;
- Sequence< ::rtl::OUString > sTableTypes(3);
+ Sequence< OUString > sTableTypes(3);
// we want all catalogues, all schemas, all tables
- sTableTypes[0] = ::rtl::OUString("VIEW");
- sTableTypes[1] = ::rtl::OUString("TABLE");
- sTableTypes[2] = ::rtl::OUString("%"); // just to be sure to include anything else ....
+ sTableTypes[0] = "VIEW";
+ sTableTypes[1] = "TABLE";
+ sTableTypes[2] = "%"; // just to be sure to include anything else ....
try
{
m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes);
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 499e6b2..8e6513d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -429,9 +429,9 @@
if (!sUser.isEmpty())
{ // use user and pwd together with the url
Sequence< PropertyValue> aInfo(2);
- aInfo.getArray()[0].Name = ::rtl::OUString("user");
+ aInfo.getArray()[0].Name = "user";
aInfo.getArray()[0].Value <<= sUser;
- aInfo.getArray()[1].Name = ::rtl::OUString("password");
+ aInfo.getArray()[1].Name = "password";
aInfo.getArray()[1].Value <<= sPwd;
xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo );
}
diff --git a/testtools/source/bridgetest/constructors.cxx
b/testtools/source/bridgetest/constructors.cxx
index a4cf910..8627e29 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -450,9 +450,9 @@
"comp.test.testtools.bridgetest.Constructors");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() {
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors");
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() {
+ css::uno::Sequence< OUString > s(1);
+ s[0] = "test.testtools.bridgetest.Constructors";
return s;
}
@@ -469,9 +469,9 @@
"comp.test.testtools.bridgetest.Constructors2");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames2() {
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors2");
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() {
+ css::uno::Sequence< OUString > s(1);
+ s[0] = "test.testtools.bridgetest.Constructors2";
return s;
}
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx
b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index 01240d4..32489d3 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -230,7 +230,7 @@
void WebDAVContext::splitName(const ::rtl::OUString& rSource)
{
const sal_Int32 nLen(rSource.getLength());
- maNamespace = ::rtl::OUString();
+ maNamespace = "";
maName = rSource;
if(nLen)
@@ -453,7 +453,7 @@
case WebDAVName_response:
{
// response start, reset Href and status and maResponseProperties
- maHref = maStatus = ::rtl::OUString();
+ maHref = maStatus = "";
if(isCollectingProperties())
{
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 2d31a5f..e015293 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -104,20 +104,20 @@
// easy way to reset struct member!
void free()
{
- bInstalled = sal_False ;
- sFactory = ::rtl::OUString() ;
- sShortName = ::rtl::OUString() ;
- sTemplateFile = ::rtl::OUString() ;
- sWindowAttributes = ::rtl::OUString() ;
- sEmptyDocumentURL = ::rtl::OUString() ;
- sDefaultFilter = ::rtl::OUString() ;
- nIcon = 0 ;
- bChangedTemplateFile = sal_False ;
- bChangedWindowAttributes = sal_False ;
- bChangedEmptyDocumentURL = sal_False ;
- bChangedDefaultFilter = sal_False ;
- bChangedIcon = sal_False ;
- bDefaultFilterReadonly = sal_False ;
+ bInstalled = sal_False;
+ sFactory = "";
+ sShortName = "";
+ sTemplateFile = "";
+ sWindowAttributes = "";
+ sEmptyDocumentURL = "";
+ sDefaultFilter = "";
+ nIcon = 0;
+ bChangedTemplateFile = sal_False;
+ bChangedWindowAttributes = sal_False;
+ bChangedEmptyDocumentURL = sal_False;
+ bChangedDefaultFilter = sal_False;
+ bChangedIcon = sal_False;
+ bDefaultFilterReadonly = sal_False;
}
//---------------------------------------------------------------------------------------------------------
@@ -610,28 +610,28 @@
//return m_lFactories[eFactory].sShortName;
- ::rtl::OUString sShortName;
+ OUString sShortName;
switch( eFactory )
{
- case SvtModuleOptions::E_WRITER : sShortName = ::rtl::OUString("swriter");
+ case SvtModuleOptions::E_WRITER : sShortName = "swriter";
break;
- case SvtModuleOptions::E_WRITERWEB : sShortName = ::rtl::OUString("swriter/web");
+ case SvtModuleOptions::E_WRITERWEB : sShortName = "swriter/web";
break;
- case SvtModuleOptions::E_WRITERGLOBAL : sShortName =
::rtl::OUString("swriter/GlobalDocument");
+ case SvtModuleOptions::E_WRITERGLOBAL : sShortName = "swriter/GlobalDocument";
break;
- case SvtModuleOptions::E_CALC : sShortName = ::rtl::OUString("scalc");
+ case SvtModuleOptions::E_CALC : sShortName = "scalc";
break;
- case SvtModuleOptions::E_DRAW : sShortName = ::rtl::OUString("sdraw");
+ case SvtModuleOptions::E_DRAW : sShortName = "sdraw";
break;
- case SvtModuleOptions::E_IMPRESS : sShortName = ::rtl::OUString("simpress");
+ case SvtModuleOptions::E_IMPRESS : sShortName = "simpress";
break;
- case SvtModuleOptions::E_MATH : sShortName = ::rtl::OUString("smath");
+ case SvtModuleOptions::E_MATH : sShortName = "smath";
break;
- case SvtModuleOptions::E_CHART : sShortName = ::rtl::OUString("schart");
+ case SvtModuleOptions::E_CHART : sShortName = "schart";
break;
- case SvtModuleOptions::E_BASIC : sShortName = ::rtl::OUString("sbasic");
+ case SvtModuleOptions::E_BASIC : sShortName = "sbasic";
break;
- case SvtModuleOptions::E_DATABASE : sShortName = ::rtl::OUString("sdatabase");
+ case SvtModuleOptions::E_DATABASE : sShortName = "sdatabase";
break;
default:
OSL_FAIL( "unknown factory" );
@@ -662,28 +662,28 @@
//return m_lFactories[eFactory].getEmptyDocumentURL();
- ::rtl::OUString sURL;
+ OUString sURL;
switch( eFactory )
{
- case SvtModuleOptions::E_WRITER : sURL =
::rtl::OUString("private:factory/swriter");
+ case SvtModuleOptions::E_WRITER : sURL = "private:factory/swriter";
break;
- case SvtModuleOptions::E_WRITERWEB : sURL =
::rtl::OUString("private:factory/swriter/web");
+ case SvtModuleOptions::E_WRITERWEB : sURL = "private:factory/swriter/web";
break;
- case SvtModuleOptions::E_WRITERGLOBAL : sURL =
::rtl::OUString("private:factory/swriter/GlobalDocument");
+ case SvtModuleOptions::E_WRITERGLOBAL : sURL = "private:factory/swriter/GlobalDocument";
break;
- case SvtModuleOptions::E_CALC : sURL = ::rtl::OUString("private:factory/scalc");
+ case SvtModuleOptions::E_CALC : sURL = "private:factory/scalc";
break;
- case SvtModuleOptions::E_DRAW : sURL = ::rtl::OUString("private:factory/sdraw");
+ case SvtModuleOptions::E_DRAW : sURL = "private:factory/sdraw";
break;
- case SvtModuleOptions::E_IMPRESS : sURL =
::rtl::OUString("private:factory/simpress?slot=6686");
+ case SvtModuleOptions::E_IMPRESS : sURL = "private:factory/simpress?slot=6686";
break;
- case SvtModuleOptions::E_MATH : sURL = ::rtl::OUString("private:factory/smath");
+ case SvtModuleOptions::E_MATH : sURL = "private:factory/smath";
break;
- case SvtModuleOptions::E_CHART : sURL = ::rtl::OUString("private:factory/schart");
+ case SvtModuleOptions::E_CHART : sURL = "private:factory/schart";
break;
- case SvtModuleOptions::E_BASIC : sURL = ::rtl::OUString("private:factory/sbasic");
+ case SvtModuleOptions::E_BASIC : sURL = "private:factory/sbasic";
break;
- case SvtModuleOptions::E_DATABASE : sURL =
::rtl::OUString("private:factory/sdatabase?Interactive");
+ case SvtModuleOptions::E_DATABASE : sURL = "private:factory/sdatabase?Interactive";
break;
default:
OSL_FAIL( "unknown factory" );
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index fd949ce..1ddbbbc 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -128,10 +128,10 @@
return ::rtl::OUString( "CBlankNode");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString( "com.sun.star.rdf.BlankNode");
+ css::uno::Sequence< OUString > s(1);
+ s[0] = "com.sun.star.rdf.BlankNode";
return s;
}
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 2261d45..272f6d2 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -191,10 +191,10 @@
return ::rtl::OUString( "CLiteral");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString( "com.sun.star.rdf.Literal");
+ css::uno::Sequence< OUString > s(1);
+ s[0] = "com.sun.star.rdf.Literal";
return s;
}
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index d095537..c275b68 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -752,7 +752,7 @@
}
// just append the parameters and then split them again; seems simplest
arg0 = arg0 + arg1;
- arg1 = ::rtl::OUString();
+ arg1 = "";
}
// split parameter
@@ -819,10 +819,10 @@
"CURI");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString( "com.sun.star.rdf.URI");
+ css::uno::Sequence< OUString > s(1);
+ s[0] = "com.sun.star.rdf.URI";
return s;
}
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 5b1809b..0831d3a 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -217,24 +217,24 @@
// if Auto... is set the corresponding properties mustn't be exported
case XML_SCH_CONTEXT_MIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString( "AutoMin" );
+ aAutoPropName = "AutoMin";
break;
case XML_SCH_CONTEXT_MAX:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString( "AutoMax" );
+ aAutoPropName = "AutoMax";
break;
case XML_SCH_CONTEXT_STEP_MAIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString( "AutoStepMain" );
+ aAutoPropName = "AutoStepMain";
break;
case XML_SCH_CONTEXT_STEP_HELP_COUNT:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString( "AutoStepHelp" );
+ aAutoPropName = "AutoStepHelp";
break;
case XML_SCH_CONTEXT_ORIGIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString( "AutoOrigin" );
+ aAutoPropName = "AutoOrigin";
break;
// the following property is deprecated
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 0632b6b..cf3d3cc 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -774,7 +774,7 @@
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
}
if( bHasOwnData )
- msChartAddress = ::rtl::OUString( "all" );
+ msChartAddress = "all";
bool bSwitchRangesFromOuterToInternalIfNecessary = false;
if( !bHasOwnData && mbAllRangeAddressesAvailable )
@@ -821,7 +821,7 @@
if(!bHasOwnData)
{
bHasOwnData = true;
- msChartAddress = ::rtl::OUString( "all" );
+ msChartAddress = "all";
if( !xNewDoc->hasInternalDataProvider() )
{
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 88cf80c..0cd93ed 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -55,7 +55,7 @@
Sequence< PropertyValue >& rMappedEvent = m_aMappedEvents[sName];
sLocalMacroName = pEvents->ScriptCode;
- sLibrary = ::rtl::OUString();
+ sLibrary = "";
if (pEvents->ScriptType.equals(EVENT_STARBASIC))
{ // for StarBasic, the library name is part of the ScriptCode
sal_Int32 nPrefixLen = sLocalMacroName.indexOf( ':' );
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx
b/xmloff/source/text/XMLTextListBlockContext.cxx
index 827d575..0efd44f 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -202,7 +202,7 @@
{
if ( !rTextListsHelper.IsListProcessed( msContinueListId ) )
{
- msContinueListId = ::rtl::OUString();
+ msContinueListId = "";
}
else
{
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8320329..2e68230 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -176,7 +176,7 @@
{
if (m_sBookmarkName.isEmpty())
{
- m_sBookmarkName = ::rtl::OUString("Unknown");
+ m_sBookmarkName = "Unknown";
}
m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
}
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 81c650c..255bb33 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -163,15 +163,15 @@
inline void XMLTextNumRuleInfo::Reset()
{
mxNumRules = 0;
- msNumRulesName = ::rtl::OUString();
- msListId = ::rtl::OUString();
+ msNumRulesName = "";
+ msListId = "";
mnListStartValue = -1;
mnListLevel = 0;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
mbIsNumbered = mbIsRestart =
mbOutlineStyleAsNormalListStyle = sal_False;
mbContinueingPreviousSubTree = sal_False;
- msListLabelString = ::rtl::OUString();
+ msListLabelString = "";
}
#endif // _XMLOFF_XMLTEXTNUMRULEINFO_HXX
--
To view, visit https://gerrit.libreoffice.org/2863
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieffd80aa84c9a041785bb81b3a904a32d00cb2bb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <ChrRossmanith@web.de>
Context
- [PATCH] simplify OUString assignments · via Code Review
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.