summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-25 17:17:50 +0200
committerNoel Grandin <noel@peralex.com>2013-11-04 10:11:07 +0200
commitaeb41c9b9b7559c6d87bf92807acdc0df9e104cc (patch)
tree5a36bcd5af873c2b597fcda5fbd7e2f76f997669
parent57c2de08ddf14c0da80de06736d99382ad036539 (diff)
remove redundant calls to OUString constructor
Change code like this: aStr = OUString("xxxx"); into this: aStr = "xxxx"; Change-Id: I31cb92e21658d57bb9e14b65c179536eae8096f6
-rw-r--r--canvas/source/vcl/devicehelper.cxx4
-rw-r--r--canvas/source/vcl/spritedevicehelper.cxx4
-rw-r--r--connectivity/source/commontools/TColumnsHelper.cxx18
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx6
-rw-r--r--connectivity/source/commontools/dbtools.cxx6
-rw-r--r--connectivity/source/commontools/dbtools2.cxx11
-rw-r--r--connectivity/source/commontools/predicateinput.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx18
-rw-r--r--connectivity/source/drivers/dbase/DIndexes.cxx7
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx49
-rw-r--r--connectivity/source/drivers/hsqldb/HTables.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HUser.cxx50
-rw-r--r--connectivity/source/drivers/hsqldb/HUsers.cxx10
-rw-r--r--connectivity/source/drivers/hsqldb/HViews.cxx10
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.cxx5
-rw-r--r--connectivity/source/drivers/macab/MacabAddressBook.cxx5
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.cxx2
-rw-r--r--connectivity/source/drivers/mork/MNSProfileDiscover.cxx3
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx3
-rw-r--r--connectivity/source/drivers/mysql/YDriver.cxx6
-rw-r--r--connectivity/source/drivers/mysql/YTable.cxx34
-rw-r--r--connectivity/source/drivers/mysql/YTables.cxx4
-rw-r--r--connectivity/source/drivers/mysql/YUser.cxx51
-rw-r--r--connectivity/source/drivers/mysql/YUsers.cxx4
-rw-r--r--connectivity/source/drivers/mysql/YViews.cxx2
-rw-r--r--connectivity/source/drivers/odbcbase/OConnection.cxx6
-rw-r--r--connectivity/source/parse/sqlnode.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx5
-rw-r--r--crashrep/source/win32/soreport.cxx2
-rw-r--r--cui/source/options/optaboutconfig.cxx4
-rw-r--r--cui/source/options/optgdlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx2
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx14
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx16
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx6
-rw-r--r--desktop/source/app/app.cxx5
-rw-r--r--desktop/source/app/officeipcthread.cxx4
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx10
-rw-r--r--forms/source/component/ListBox.cxx6
-rw-r--r--forms/source/runtime/formoperations.cxx2
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx2
-rw-r--r--framework/source/accelerators/presethandler.cxx4
-rw-r--r--helpcompiler/source/HelpLinker.cxx7
-rw-r--r--lotuswordpro/source/filter/lwpbulletstylemgr.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextcontent.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx3
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx42
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx20
-rw-r--r--scripting/source/basprov/basmethnode.cxx10
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx4
-rw-r--r--scripting/source/stringresource/stringresource.cxx10
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx2
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx3
-rw-r--r--sfx2/source/doc/docfac.cxx2
-rw-r--r--sot/source/sdstor/ucbstorage.cxx15
-rw-r--r--stoc/test/registry_tdprovider/testregistrytdprovider.cxx4
-rw-r--r--stoc/test/tdmanager/testtdmanager.cxx4
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx10
-rw-r--r--svtools/source/config/extcolorcfg.cxx4
-rw-r--r--svtools/source/config/fontsubstconfig.cxx11
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx10
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/form/navigatortree.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx15
-rw-r--r--sw/source/ui/index/cnttab.cxx4
-rw-r--r--sw/source/ui/uiview/viewport.cxx2
-rw-r--r--sw/source/ui/vba/vbaview.cxx4
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx4
-rw-r--r--ucb/source/core/ucbcmds.cxx2
-rw-r--r--ucb/source/ucp/file/bc.cxx6
-rw-r--r--ucb/source/ucp/file/shell.cxx8
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx4
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx6
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.cxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx18
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.cxx14
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.cxx6
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx20
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.cxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx12
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.cxx10
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx16
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.cxx2
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx29
-rw-r--r--ucbhelper/source/client/proxydecider.cxx2
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx4
-rw-r--r--xmloff/source/forms/layerexport.cxx2
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx6
101 files changed, 360 insertions, 468 deletions
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index b874bd1a5ff3..2618a04b219b 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -211,9 +211,7 @@ namespace vclcanvas
if( mpOutDev )
{
- OUString aFilename("dbg_frontbuffer");
- aFilename += OUString::number(nFilePostfixCount);
- aFilename += OUString(".bmp");
+ OUString aFilename = "dbg_frontbuffer" + OUString::number(nFilePostfixCount) + ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 2e1063c5f8b6..a92150a6782a 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -128,9 +128,7 @@ namespace vclcanvas
if( mpBackBuffer )
{
- OUString aFilename("dbg_backbuffer");
- aFilename += OUString::number(nFilePostfixCount);
- aFilename += OUString(".bmp");
+ OUString aFilename = "dbg_backbuffer" + OUString::number(nFilePostfixCount) + OUString(".bmp");
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 8d97941e869f..527fd6f6b584 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -177,11 +177,10 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const
return cloneDescriptor( descriptor );
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
- OUString aSql( "ALTER TABLE " );
-
- aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
- aSql += OUString(" ADD ");
- aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
+ OUString aSql = "ALTER TABLE " +
+ ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ) +
+ " ADD " +
+ ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
if ( xStmt.is() )
@@ -198,13 +197,12 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName
OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!");
if ( m_pTable && !m_pTable->isNew() )
{
- OUString aSql( "ALTER TABLE " );
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
OUString aQuote = xMetaData->getIdentifierQuoteString( );
-
- aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
- aSql += OUString(" DROP ");
- aSql += ::dbtools::quoteName( aQuote,_sElementName);
+ OUString aSql = "ALTER TABLE " +
+ ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ) +
+ " DROP " +
+ ::dbtools::quoteName( aQuote,_sElementName);
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
if ( xStmt.is() )
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 3e29b7bbd524..f77eefca4b3e 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -483,10 +483,10 @@ void OTableHelper::refreshIndexes()
OUString OTableHelper::getRenameStart() const
{
OUString sSql("RENAME ");
- if ( m_Type == OUString("VIEW") )
- sSql += OUString(" VIEW ");
+ if ( m_Type == "VIEW" )
+ sSql += " VIEW ";
else
- sSql += OUString(" TABLE ");
+ sSql += " TABLE ";
return sSql;
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index e54ab300f17a..c2df4738fe67 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -999,9 +999,9 @@ try
{
OSL_UNUSED( e );
#ifdef DBG_UTIL
- OUString sMessage("TransferFormComponentProperties : could not transfer the value for property \"");
- sMessage += pResult->Name;
- sMessage += OUString("\"");
+ OUString sMessage = "TransferFormComponentProperties : could not transfer the value for property \"" +
+ pResult->Name +
+ "\"";
OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
#endif
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index de82465c8dc1..689fc5c64547 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -825,14 +825,9 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
const OUString& _rName,
ColumnInformationMap& _rInfo)
{
- static OUString STR_WHERE = OUString(" WHERE ");
-
- OUString sSelect = OUString("SELECT ");
- sSelect += _rName;
- sSelect += OUString(" FROM ");
- sSelect += _sComposedName;
- sSelect += STR_WHERE;
- sSelect += OUString("0 = 1");
+ OUString sSelect = "SELECT " + _rName +
+ " FROM " + _sComposedName +
+ " WHERE 0 = 1";
try
{
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index f27bc142da55..0d04af9510a3 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -343,11 +343,7 @@ namespace dbtools
if ( nType == DataType::OTHER || sField.isEmpty() )
{
// first try the international version
- OUString sSql;
- sSql += OUString("SELECT * ");
- sSql += OUString(" FROM x WHERE ");
- sSql += sField;
- sSql += _rPredicateValue;
+ OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue;
::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 836e198b6631..8fbfe9bb8183 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -365,10 +365,9 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd
// -------------------------------------------------------------------------
OUString ODbaseIndex::getCompletePath()
{
- OUString sDir = m_pTable->getConnection()->getURL();
- sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
- sDir += m_Name;
- sDir += OUString(".ndx");
+ OUString sDir = m_pTable->getConnection()->getURL() +
+ OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER) +
+ m_Name + ".ndx";
return sDir;
}
//------------------------------------------------------------------
@@ -420,10 +419,9 @@ sal_Bool ODbaseIndex::DropImpl()
}
// synchronize inf-file
- OUString sCfgFile(m_pTable->getConnection()->getURL());
- sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
- sCfgFile += m_pTable->getName();
- sCfgFile += OUString(".inf");
+ OUString sCfgFile = m_pTable->getConnection()->getURL() +
+ OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER) +
+ m_pTable->getName() + ".inf";
OUString sPhysicalPath;
OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath),
@@ -433,14 +431,14 @@ sal_Bool ODbaseIndex::DropImpl()
aInfFile.SetGroup(dBASE_III_GROUP);
sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
OString aKeyName;
- OUString sEntry = m_Name + (".ndx");
+ OUString sEntry = m_Name + ".ndx";
// delete entries from the inf file
for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
{
// References the Key to an Index-file?
aKeyName = aInfFile.GetKeyName( nKey );
- if (aKeyName.copy(0,3).equals("NDX"))
+ if (aKeyName.copy(0,3) == "NDX")
{
if(sEntry == OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding()))
{
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f96224e43c86..ef31f7e73e62 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -39,10 +39,9 @@ using namespace ::com::sun::star::lang;
sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
{
- OUString sFile = m_pTable->getConnection()->getURL();
- sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
- sFile += _rName;
- sFile += OUString(".ndx");
+ OUString sFile = m_pTable->getConnection()->getURL() +
+ OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER) +
+ _rName + ".ndx";
if ( !UCBContentHelper::Exists(sFile) )
{
const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index c0f6f75b0156..06e0bccb1cd5 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2307,7 +2307,7 @@ namespace
{
OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
- aIdent += OUString("/");
+ aIdent += "/";
aIdent += oldName;
aName = aIdent;
}
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index a60aad05df3a..f5a183026740 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -52,9 +52,7 @@ void REGISTER_PROVIDER(
const Sequence< OUString>& Services,
const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
{
- OUString aMainKeyName("/");
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString("/UNO/SERVICES");
+ OUString aMainKeyName = "/" + aServiceImplName + "/UNO/SERVICES";
Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
OSL_ENSURE(xNewKey.is(), "FIREBIRD::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index be5c8aa74ee1..de618dabec89 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -206,12 +206,11 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe
{
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER COLUMN ");
- sSql += ::dbtools::quoteName(sQuote,colName);
-
- sSql += OUString(" RENAME TO ");
- sSql += ::dbtools::quoteName(sQuote,sNewColumnName);
+ OUString sSql = getAlterTableColumnPart() +
+ " ALTER COLUMN " +
+ ::dbtools::quoteName(sQuote,colName) +
+ " RENAME TO " +
+ ::dbtools::quoteName(sQuote,sNewColumnName);
executeStatement(sSql);
}
@@ -263,7 +262,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
{
OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER COLUMN ");
+ sSql += " ALTER COLUMN ";
#if OSL_DEBUG_LEVEL > 0
try
{
@@ -292,25 +291,22 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
// -----------------------------------------------------------------------------
void OHSQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName)
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER COLUMN ");
-
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,_rColName);
- sSql += OUString(" SET DEFAULT '") + _sNewDefault;
- sSql += OUString("'");
+ OUString sSql = getAlterTableColumnPart() +
+ " ALTER COLUMN " +
+ ::dbtools::quoteName(sQuote,_rColName) +
+ " SET DEFAULT '" + _sNewDefault + "'";
executeStatement(sSql);
}
// -----------------------------------------------------------------------------
void OHSQLTable::dropDefaultValue(const OUString& _rColName)
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER COLUMN ");
-
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,_rColName);
- sSql += OUString(" DROP DEFAULT");
+ OUString sSql = getAlterTableColumnPart() +
+ " ALTER COLUMN " +
+ ::dbtools::quoteName(sQuote,_rColName) +
+ " DROP DEFAULT";
executeStatement(sSql);
}
@@ -380,20 +376,19 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException,
if(!isNew())
{
- OUString sSql = OUString("ALTER ");
- if ( m_Type == OUString("VIEW") )
- sSql += OUString(" VIEW ");
+ OUString sSql = "ALTER ";
+ if ( m_Type == "VIEW" )
+ sSql += " VIEW ";
else
- sSql += OUString(" TABLE ");
+ sSql += " TABLE ";
OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
- OUString sComposedName(
- ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) );
- sSql += sComposedName
- + OUString(" RENAME TO ");
- sSql += ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation );
+ OUString sComposedName =
+ ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) +
+ sComposedName + " RENAME TO " +
+ ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation );
executeStatement(sSql);
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index a68f24a44aa0..0b5d97928660 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -133,9 +133,9 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
sal_Bool bIsView;
if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW")))) // here we have a view
- aSql += OUString("VIEW ");
+ aSql += "VIEW ";
else
- aSql += OUString("TABLE ");
+ aSql += "TABLE ";
OUString sComposedName(
::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) );
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 8d3a7fa0d681..dc6d8d81c6dd 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -226,14 +226,10 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 obj
OUString sPrivs = getPrivilegeString(objPrivileges);
if(!sPrivs.isEmpty())
{
- OUString sGrant;
- sGrant += OUString("GRANT ");
- sGrant += sPrivs;
- sGrant += OUString(" ON ");
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += OUString(" TO ");
- sGrant += m_Name;
+ OUString sGrant = "GRANT " + sPrivs +
+ " ON " + ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+ " TO " + m_Name;
Reference<XStatement> xStmt = m_xConnection->createStatement();
if(xStmt.is())
@@ -256,14 +252,10 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 ob
OUString sPrivs = getPrivilegeString(objPrivileges);
if(!sPrivs.isEmpty())
{
- OUString sGrant;
- sGrant += OUString("REVOKE ");
- sGrant += sPrivs;
- sGrant += OUString(" ON ");
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += OUString(" FROM ");
- sGrant += m_Name;
+ OUString sGrant = "REVOKE " + sPrivs +
+ " ON " + ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+ " FROM " + m_Name;
Reference<XStatement> xStmt = m_xConnection->createStatement();
if(xStmt.is())
@@ -277,12 +269,8 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
- OUString sAlterPwd;
- sAlterPwd = OUString("SET PASSWORD FOR ");
- sAlterPwd += m_Name;
- sAlterPwd += OUString("@\"%\" = PASSWORD('") ;
- sAlterPwd += newPassword;
- sAlterPwd += OUString("')") ;
+ OUString sAlterPwd = "SET PASSWORD FOR " +
+ m_Name + "@\"%\" = PASSWORD('" + newPassword + "')";
Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -297,41 +285,41 @@ OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const
{
OUString sPrivs;
if((nRights & Privilege::INSERT) == Privilege::INSERT)
- sPrivs += OUString("INSERT");
+ sPrivs += "INSERT";
if((nRights & Privilege::DELETE) == Privilege::DELETE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("DELETE");
+ sPrivs += ",";
+ sPrivs += "DELETE";
}
if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("UPDATE");
+ sPrivs += ",";
+ sPrivs += "UPDATE";
}
if((nRights & Privilege::ALTER) == Privilege::ALTER)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("ALTER");
+ sPrivs += ",";
+ sPrivs += "ALTER";
}
if((nRights & Privilege::SELECT) == Privilege::SELECT)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("SELECT");
+ sPrivs += ",";
+ sPrivs += "SELECT";
}
if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("REFERENCES");
+ sPrivs += ",";
+ sPrivs += "REFERENCES";
}
return sPrivs;
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 609b87504cf7..abf698d86333 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -68,18 +68,14 @@ Reference< XPropertySet > OUsers::createDescriptor()
// XAppend
sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
{
- OUString aSql( "GRANT USAGE ON * TO " );
OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( );
- OUString sUserName( _rForName );
- aSql += ::dbtools::quoteName(aQuote,sUserName)
- + OUString(" @\"%\" ");
OUString sPassword;
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
+ OUString aSql = "GRANT USAGE ON * TO " +
+ ::dbtools::quoteName(aQuote,_rForName) + " @\"%\" ";
if ( !sPassword.isEmpty() )
{
- aSql += OUString(" IDENTIFIED BY '");
- aSql += sPassword;
- aSql += OUString("'");
+ aSql += " IDENTIFIED BY '" + sPassword + "'";
}
Reference< XStatement > xStmt = m_xConnection->createStatement( );
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 265981fda0ff..3a91dd8b7289 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -131,14 +131,12 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
{
Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
- OUString aSql( "CREATE VIEW " );
OUString sCommand;
-
- aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
-
- aSql += OUString(" AS ");
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
- aSql += sCommand;
+
+ OUString aSql = "CREATE VIEW " +
+ ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ) +
+ " AS " + sCommand;
Reference< XStatement > xStmt = xConnection->createStatement( );
if ( xStmt.is() )
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 075a32d1bd8f..7c3aeef597c9 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -36,9 +36,8 @@ namespace connectivity { namespace hsqldb
//---------------------------------------------------------------------
LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
{
- m_sFileName = StorageContainer::jstring2ustring(env,streamName);
- m_sFileName += OUString(".");
- m_sFileName += OUString::createFromAscii( _pAsciiSuffix );
+ m_sFileName = StorageContainer::jstring2ustring(env,streamName) +
+ "." + OUString::createFromAscii( _pAsciiSuffix );
}
//---------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 1ba152ed6951..3a61df373ab9 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -235,10 +235,9 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup
// duplicate!
if(count != 1)
{
- OUString sName = (*iter1)->getName();
- sName += OUString(" (") +
+ OUString sName = (*iter1)->getName() + " (" +
OUString::number(count) +
- OUString(")");
+ ")";
(*iter1)->setName(sName);
}
}
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 2efea4ed71c1..364213db7807 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -836,7 +836,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I
// There is probably a better way to do this...
OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value);
CFRelease(_headerNames[i]->value);
- newName += OUString(" (") + OUString::number(count) + OUString(")");
+ newName += " (" + OUString::number(count) + ")";
_headerNames[i]->value = OUStringToCFString(newName);
}
}
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
index 5984677dbb73..579d7ce19f3f 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
@@ -68,8 +68,7 @@ namespace connectivity
ProductStruct &m_Product = m_ProductProfileList[index];
OUString regDir = getRegistryDir(product);
- OUString profilesIni( regDir );
- profilesIni += OUString("profiles.ini");
+ OUString profilesIni = regDir + "profiles.ini";
IniParser parser( profilesIni );
IniSectionMap &mAllSection = *(parser.getAllSection());
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 6338eff8b4da..7fcd034222a4 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -146,8 +146,7 @@ namespace connectivity
nsresult rv;
#endif
OUString regDir = getRegistryDir(product);
- OUString profilesIni( regDir );
- profilesIni += OUString("profiles.ini");
+ OUString profilesIni = regDir + "profiles.ini";
IniParser parser( profilesIni );
IniSectionMap &mAllSection = *(parser.getAllSection());
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 51e5a114fc9a..cb005e9e7363 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -290,11 +290,11 @@ namespace connectivity
} // if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) )
} // if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() )
if ( sCuttedUrl.indexOf('?') == -1 )
- sCuttedUrl += OUString("?");
+ sCuttedUrl += "?";
else
- sCuttedUrl += OUString("&");
+ sCuttedUrl += "&";
sCuttedUrl += sAdd;
- sCuttedUrl += OUString("characterEncoding=");
+ sCuttedUrl += "characterEncoding=";
sCuttedUrl += sIanaName;
}
}
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 4938b724fc34..decb437b75bb 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -234,7 +234,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Ref
{
if ( sTypeName.indexOf(s_sAutoIncrement) == -1 )
{
- sTypeName += OUString(" ");
+ sTypeName += " ";
sTypeName += s_sAutoIncrement;
}
}
@@ -271,12 +271,10 @@ void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Ref
descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName;
if ( !sNewColumnName.equalsIgnoreAsciiCase(colName) && !bColumnNameChanged )
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" CHANGE ");
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,colName);
- sSql += OUString(" ");
- sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern()));
+ OUString sSql = getAlterTableColumnPart() +
+ " CHANGE " + ::dbtools::quoteName(sQuote,colName) +
+ " " + OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern()));
executeStatement(sSql);
}
m_pColumns->refresh();
@@ -294,11 +292,10 @@ void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Ref
// -----------------------------------------------------------------------------
void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" CHANGE ");
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,_rColName);
- sSql += OUString(" ");
+ OUString sSql = getAlterTableColumnPart() +
+ " CHANGE " + ::dbtools::quoteName(sQuote,_rColName) +
+ " ";
OColumn* pColumn = new OColumn(sal_True);
Reference<XPropertySet> xProp = pColumn;
@@ -317,25 +314,20 @@ OUString OMySQLTable::getTypeCreatePattern() const
// -----------------------------------------------------------------------------
void OMySQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName)
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER ");
-
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,_rColName);
- sSql += OUString(" SET DEFAULT '") + _sNewDefault;
- sSql += OUString("'");
+ OUString sSql = getAlterTableColumnPart() +
+ " ALTER " + ::dbtools::quoteName(sQuote,_rColName) +
+ " SET DEFAULT '" + _sNewDefault + "'";
executeStatement(sSql);
}
// -----------------------------------------------------------------------------
void OMySQLTable::dropDefaultValue(const OUString& _rColName)
{
- OUString sSql = getAlterTableColumnPart();
- sSql += OUString(" ALTER ");
-
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- sSql += ::dbtools::quoteName(sQuote,_rColName);
- sSql += OUString(" DROP DEFAULT");
+ OUString sSql = getAlterTableColumnPart() +
+ " ALTER " + ::dbtools::quoteName(sQuote,_rColName) +
+ " DROP DEFAULT";
executeStatement(sSql);
}
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 776c260671ef..25fbf73ff712 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -138,9 +138,9 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW");
if(bIsView) // here we have a view
- aSql += OUString("VIEW ");
+ aSql += "VIEW ";
else
- aSql += OUString("TABLE ");
+ aSql += "TABLE ";
OUString sComposedName(
::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) );
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 5f300a3b0672..d44c34541a8e 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -225,14 +225,10 @@ void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 ob
OUString sPrivs = getPrivilegeString(objPrivileges);
if(!sPrivs.isEmpty())
{
- OUString sGrant;
- sGrant += OUString("GRANT ");
- sGrant += sPrivs;
- sGrant += OUString(" ON ");
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += OUString(" TO ");
- sGrant += m_Name;
+ OUString sGrant = "GRANT " + sPrivs +
+ " ON " + ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
+ " TO " + m_Name;
Reference<XStatement> xStmt = m_xConnection->createStatement();
if(xStmt.is())
@@ -255,14 +251,10 @@ void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 o
OUString sPrivs = getPrivilegeString(objPrivileges);
if(!sPrivs.isEmpty())
{
- OUString sGrant;
- sGrant += OUString("REVOKE ");
- sGrant += sPrivs;
- sGrant += OUString(" ON ");
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += OUString(" FROM ");
- sGrant += m_Name;
+ OUString sGrant = "REVOKE " + sPrivs +
+ " ON " + ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
+ " FROM " + m_Name;
Reference<XStatement> xStmt = m_xConnection->createStatement();
if(xStmt.is())
@@ -276,12 +268,9 @@ void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
- OUString sAlterPwd;
- sAlterPwd = OUString("SET PASSWORD FOR ");
- sAlterPwd += m_Name;
- sAlterPwd += OUString("@\"%\" = PASSWORD('") ;
- sAlterPwd += newPassword;
- sAlterPwd += OUString("')") ;
+ OUString sAlterPwd = "SET PASSWORD FOR " +
+ m_Name + "@\"%\" = PASSWORD('" +
+ newPassword + "')";
Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -296,41 +285,41 @@ OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const
{
OUString sPrivs;
if((nRights & Privilege::INSERT) == Privilege::INSERT)
- sPrivs += OUString("INSERT");
+ sPrivs += "INSERT";
if((nRights & Privilege::DELETE) == Privilege::DELETE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("DELETE");
+ sPrivs += ",";
+ sPrivs += "DELETE";
}
if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("UPDATE");
+ sPrivs += ",";
+ sPrivs += "UPDATE";
}
if((nRights & Privilege::ALTER) == Privilege::ALTER)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("ALTER");
+ sPrivs += ",";
+ sPrivs += "ALTER";
}
if((nRights & Privilege::SELECT) == Privilege::SELECT)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("SELECT");
+ sPrivs += ",";
+ sPrivs += "SELECT";
}
if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
{
if(!sPrivs.isEmpty())
- sPrivs += OUString(",");
- sPrivs += OUString("REFERENCES");
+ sPrivs += ",";
+ sPrivs += "REFERENCES";
}
return sPrivs;
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index e2e54e85d0f3..90ee347294dd 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -77,9 +77,9 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
if ( !sPassword.isEmpty() )
{
- aSql += OUString(" IDENTIFIED BY '");
+ aSql += " IDENTIFIED BY '";
aSql += sPassword;
- aSql += OUString("'");
+ aSql += "'";
}
Reference< XStatement > xStmt = m_xConnection->createStatement( );
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 8ff2a1b971aa..a2378d1382cb 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -130,7 +130,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
- aSql += OUString(" AS ");
+ aSql += " AS ";
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
aSql += sCommand;
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 9e04bba0428d..cae97e22a356 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -235,12 +235,12 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
else if(!pBegin->Name.compareToAscii(pUser))
{
OSL_VERIFY( pBegin->Value >>= aUID );
- aDSN = aDSN + OUString(";UID=") + aUID;
+ aDSN = aDSN + ";UID=" + aUID;
}
else if(!pBegin->Name.compareToAscii(pPwd))
{
OSL_VERIFY( pBegin->Value >>= aPWD );
- aDSN = aDSN + OUString(";PWD=") + aPWD;
+ aDSN = aDSN + ";PWD=" + aPWD;
}
else if(!pBegin->Name.compareToAscii(pUseCatalog))
{
@@ -249,7 +249,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
else if(!pBegin->Name.compareToAscii(pSysDrv))
{
OSL_VERIFY( pBegin->Value >>= aSysDrvSettings );
- aDSN += OUString(";");
+ aDSN += ";";
aDSN += aSysDrvSettings;
}
else if(0 == pBegin->Name.compareToAscii(pCharSet))
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index db004873a733..5dca3588ce90 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -738,7 +738,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rStri
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseTableRangeNodeToString_throw" );
OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count");
- // rString += OUString(" ");
+ // rString += " ";
::std::for_each(m_aChildren.begin(),m_aChildren.end(),
boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ), false ));
}
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 5685c49322d6..2f48b9b6cafd 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -770,9 +770,8 @@ namespace cppcanvas
#if OSL_DEBUG_LEVEL > 1
mfStream.Seek(0);
static sal_Int32 emfp_debug_stream_number = 0;
- OUString emfp_debug_filename("/tmp/emf-embedded-stream");
- emfp_debug_filename += OUString::number(emfp_debug_stream_number++);
- emfp_debug_filename += OUString(".emf");
+ OUString emfp_debug_filename = "/tmp/emf-embedded-stream" +
+ OUString::number(emfp_debug_stream_number++) + ".emf";
SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC );
diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx
index da84dfd8c783..a48db076c5ec 100644
--- a/crashrep/source/win32/soreport.cxx
+++ b/crashrep/source/win32/soreport.cxx
@@ -166,7 +166,7 @@ static BOOL GetCrashDataPath( LPTSTR szBuffer )
if ( !ustrValue.isEmpty() )
{
- ustrValue += OUString("/user/crashdata");
+ ustrValue += "/user/crashdata";
::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue );
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 21b96c4b222a..12f65f4cca71 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -293,7 +293,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
{
OUString sNumber( OUString::number(seqLong[nInd]) );
sValue += sNumber;
- sValue += OUString(",");
+ sValue += ",";
}
}
}
@@ -319,7 +319,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
{
OUString sHyper( OUString::number( seqHyp[nInd] ) );
sValue += sHyper;
- sValue += OUString(",");
+ sValue += ",";
}
}
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6c7f60e1d13b..08873a5c760c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -613,7 +613,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] );
m_pIconStyleLB->RemoveEntry( 0 );
- m_pIconStyleLB->InsertEntry( aAutoStr += OUString(")" ), 0 );
+ m_pIconStyleLB->InsertEntry( aAutoStr += ")", 0 );
// separate auto and other icon themes
m_pIconStyleLB->SetSeparatorPos( 0 );
}
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 8c9ce5c4708c..12aa23c5fd59 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -232,7 +232,7 @@ OUString DlgOrderCrit::GetOrderList( ) const
if(m_aColumnList[i]->GetSelectEntryPos() != 0)
{
if(!sOrder.isEmpty())
- sOrder += OUString(",");
+ sOrder += ",";
OUString sName = m_aColumnList[i]->GetSelectEntry();
sOrder += ::dbtools::quoteName(sQuote,sName);
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index eccb7d9dc391..1e8ea2b13861 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -829,15 +829,13 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
,const TPositions& _rvColumns)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::createPreparedStatment" );
- OUString aSql(OUString("INSERT INTO "));
+ OUString aSql("INSERT INTO ");
OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true );
aSql += sComposedTableName;
- aSql += OUString(" ( ");
+ aSql += " ( ";
// set values and column names
OUString aValues(" VALUES ( ");
- static OUString aPara("?,");
- static OUString aComma(",");
OUString aQuote;
if ( _xMetaData.is() )
@@ -874,13 +872,13 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
if ( !aInsertIter->isEmpty() )
{
aSql += *aInsertIter;
- aSql += aComma;
- aValues += aPara;
+ aSql += ",";
+ aValues += "?,";
}
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")"));
- aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1, 1, ")");
+ aValues = aValues.replaceAt(aValues.getLength()-1, 1, ")");
aSql += aValues;
// now create,fill and execute the prepared statement
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 6c6126ff044a..807764b2a78f 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1093,15 +1093,15 @@ void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark )
// query part exists?
if ( _bQuestionMark )
// no, so start with '?'
- _rURL += OUString("?");
+ _rURL += "?";
else
// yes, so only append with '&'
- _rURL += OUString("&");
+ _rURL += "&";
// set parameters
- _rURL += OUString("Language=");
+ _rURL += "Language=";
_rURL += utl::ConfigManager::getLocale();
- _rURL += OUString("&System=");
+ _rURL += "&System=";
_rURL += SvtHelpOptions().GetSystem();
}
@@ -1143,10 +1143,8 @@ namespace
::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId)
{
::com::sun::star::util::URL aURL;
- aURL.Complete = OUString( "vnd.sun.star.help://" );
- aURL.Complete += _sModuleName;
- aURL.Complete += OUString( "/" );
- aURL.Complete += OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8);
+ aURL.Complete = "vnd.sun.star.help://" +
+ _sModuleName + "/" + OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8);
OUString sAnchor;
OUString sTempURL = aURL.Complete;
@@ -1155,7 +1153,7 @@ namespace
AppendConfigToken(aURL.Complete,sal_True);
if ( bHasAnchor )
{
- aURL.Complete += OUString("#");
+ aURL.Complete += "#";
aURL.Complete += sAnchor;
}
return aURL;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d5effc13b5f3..4b4a5bbab3a0 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -166,9 +166,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
const OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
const OUString sTargetNameTemp = (sTargetName + OUString("."));
- OUString sStatement("SELECT * FROM ");
- sStatement += sTargetName;
- sStatement += OUString(" WHERE 0=1");
+ OUString sStatement = "SELECT * FROM " + sTargetName + " WHERE 0=1";
for ( size_t i=0; i < SAL_N_ELEMENTS(aProperties); ++i )
{
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index fecdf380e7e4..682bd07f0e6c 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2874,9 +2874,7 @@ OUString OQueryDesignView::getStatement()
GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
if(!aJoinCrit.isEmpty())
{
- OUString aTmp("( ");
- aTmp += aJoinCrit;
- aTmp += OUString(" )");
+ OUString aTmp = "( " + aJoinCrit + " )";
if(!aCriteriaListStr.isEmpty())
{
aTmp += C_AND;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index c368cf0bda55..78f5f7e72d48 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -711,13 +711,13 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe
else
sSql += sFullFieldName;
- sSql = OUString("SELECT ") + sSql;
+ sSql = "SELECT " + sSql;
if ( !sFieldAlias.isEmpty() )
{ // always quote the alias name: there cannot be a function in it
- sSql += OUString(" ");
+ sSql += " ";
sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias );
}
- sSql += OUString(" FROM x");
+ sSql += " FROM x";
pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational );
}
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b9e4ad13278d..e17ed30713c5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1504,9 +1504,8 @@ int Desktop::Main()
#ifdef DBG_UTIL
//include buildid in non product builds
OUString aDefault("development");
- aTitle += OUString(" [");
- OUString aVerId( utl::Bootstrap::getBuildIdData(aDefault));
- aTitle += aVerId;
+ aTitle += " [";
+ aTitle += utl::Bootstrap::getBuildIdData(aDefault);
aTitle += "]";
#endif
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index de1a340d69c4..ee4a779e01af 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1001,13 +1001,13 @@ static void AddConversionsToDispatchList(
if( !rParamOut.trim().isEmpty() )
{
- aParam += OUString(";");
+ aParam += ";";
aParam += aOutDir;
}
else
{
::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD );
- aParam += OUString(";" ) + aPWD;
+ aParam += ";" + aPWD;
}
for (std::vector< OUString >::const_iterator i(rRequestList.begin());
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 8908e6521f5d..1ad0b8f8cbbb 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -396,7 +396,7 @@ void BackendImpl::implProcessHelp(
if( !xSFA->isFolder( aExpandedHelpURL ) )
{
OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
- aErrStr += OUString("No help folder" );
+ aErrStr += "No help folder";
OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
throw deployment::DeploymentException( OUString(), oWeakThis,
makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
@@ -439,9 +439,9 @@ void BackendImpl::implProcessHelp(
aJarFile, rtl_UriCharClassPchar,
rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8 );
- OUString aDestBasePath = OUString("vnd.sun.star.zip://" );
+ OUString aDestBasePath = "vnd.sun.star.zip://";
aDestBasePath += aEncodedJarFilePath;
- aDestBasePath += OUString("/" );
+ aDestBasePath += "/" ;
sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
@@ -534,14 +534,14 @@ void BackendImpl::implProcessHelp(
aErrStr += aErrMsg;
if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() )
{
- aErrStr += OUString(" in " );
+ aErrStr += " in ";
OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
aErrStr += aDecodedFile;
if( aErrorInfo.m_nXMLParsingLine != -1 )
{
- aErrStr += OUString(", line " );
+ aErrStr += ", line ";
aErrStr += OUString::number( aErrorInfo.m_nXMLParsingLine );
}
}
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 67b6f7c69ae9..696ff231ff64 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -787,15 +787,15 @@ namespace frm
OUString aQuote = xMeta->getIdentifierQuoteString();
OUString aStatement("SELECT ");
if (aBoundFieldName.isEmpty()) // act like a combobox
- aStatement += OUString("DISTINCT ");
+ aStatement += "DISTINCT ";
aStatement += quoteName(aQuote,aFieldName);
if (!aBoundFieldName.isEmpty())
{
- aStatement += OUString(", ");
+ aStatement += ", ";
aStatement += quoteName(aQuote, aBoundFieldName);
}
- aStatement += OUString(" FROM ");
+ aStatement += " FROM ";
OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation );
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index e1b8acbe1cba..c8109ed06c6f 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -395,7 +395,7 @@ namespace frm
OUString sValue = OUString::number( nCount );
if ( !bFinalCount )
- sValue += OUString(" *");
+ sValue += " *";
aState.State <<= sValue;
aState.Enabled = sal_True;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 2494e15e40c9..64eb6752e79d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -888,7 +888,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
OUString aFileURL(m_sDirectory);
sal_Int32 nIndex = aFileURL.lastIndexOf('/');
if (nIndex != aFileURL.getLength()-1)
- aFileURL += OUString("/");
+ aFileURL += "/";
aFileURL += m_sFilename;
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 3c4d6b6e1712..efde565eac25 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -228,7 +228,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
// Note: May be an user uses URLs without a final slash! Check it ...
nPos = sShareLayer.lastIndexOf('/');
if (nPos != sShareLayer.getLength()-1)
- sShareLayer += OUString("/");
+ sShareLayer += "/";
sShareLayer += "soffice.cfg";
/*
@@ -281,7 +281,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
// Note: May be an user uses URLs without a final slash! Check it ...
sal_Int32 nPos = sUserLayer.lastIndexOf('/');
if (nPos != sUserLayer.getLength()-1)
- sUserLayer += OUString("/");
+ sUserLayer += "/";
sUserLayer += "soffice.cfg"; // storage file
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index b50b2ce301f3..33e320a9b2db 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -810,7 +810,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
OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
- aIdxCaptionPathFileURL += OUString("/idxcaption.xsl");
+ aIdxCaptionPathFileURL += "/idxcaption.xsl";
OString aOStr_IdxCaptionPathFileURL( OUStringToOString
( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
@@ -835,7 +835,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.
OUString aIdxContentPathFileURL( *pOfficeHelpPath );
- aIdxContentPathFileURL += OUString("/idxcontent.xsl");
+ aIdxContentPathFileURL += "/idxcontent.xsl";
OString aOStr_IdxContentPathFileURL( OUStringToOString
( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
@@ -971,8 +971,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
// The following basically checks if the help.tree is well formed XML.
// Apparently there have been cases when translations contained
// non-well-formed XML in the past.
- OUString aTreeFileURL = aExtensionLanguageRoot;
- aTreeFileURL += OUString("/help.tree");
+ OUString aTreeFileURL = aExtensionLanguageRoot + "/help.tree";
osl::DirectoryItem aTreeFileItem;
osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 597f7c0fc118..f1889d100cdf 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -204,7 +204,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
if (pParaNumber->GetStyleID() == NUMCHAR_01 || pParaNumber->GetStyleID() == NUMCHAR_Chinese4)
{
- aPrefix += OUString("0");
+ aPrefix += "0";
}
aFmt.SetPrefix(aPrefix);
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index 12394134794a..f2fcdf1a5ba2 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -81,8 +81,7 @@ void XFTextContent::SetText(const OUString& text)
void XFTextContent::ToXml(IXFStream *pStrm)
{
// pStrm->Characters(m_strText);
- OUString sSpaceToken(" ");
- sSpaceToken += OUString(" ");
+ OUString sSpaceToken(" ");
OUString sSubString;
sal_Int32 nIndex = 0;
sal_Int32 nSize = m_strText.getLength();
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 8ab0b4303ec1..3d8fbbc39de7 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1100,7 +1100,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
if ( aGroupFind != m_aGroupFunctionMap.end() )
sExpression = aGroupFind->second->getName();
sFormula += sExpression;
- sFormula += OUString("\")");
+ sFormula += "\")";
sExpression = sFormula;
}
AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField);
@@ -1597,14 +1597,14 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
xFunction->setName(sFunctionName);
if ( !sInitialFormula.isEmpty() )
xFunction->setInitialFormula(beans::Optional< OUString>(sal_True, sInitialFormula));
- sFunction = OUString("rpt:") + sFunction;
- sFunction += OUString("([");
+ sFunction = "rpt:" + sFunction;
+ sFunction += "([";
sFunction += sExpression;
- sFunction += OUString("]");
+ sFunction += "]";
if ( !sPrefix.isEmpty() )
sFunction += sPrefix;
- sFunction += OUString(")");
+ sFunction += ")";
if ( !sPostfix.isEmpty() )
sFunction += sPostfix;
xFunction->setFormula(sFunction);
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 7f796e34d015..d2db12f86f7e 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -65,8 +65,7 @@ void lcl_correctCellAddress(const OUString & _sName, const uno::Reference< xml::
const sal_Int32 nPos = sCellAddress.lastIndexOf('$');
if ( nPos != -1 )
{
- sCellAddress = sCellAddress.copy(0,nPos);
- sCellAddress += OUString("$65535");
+ sCellAddress = sCellAddress.copy(0,nPos) + "$65535";
pList->RemoveAttribute(_sName);
pList->AddAttribute(_sName,sCellAddress);
}
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index a9245cf44562..3cf5ad170ff8 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -193,7 +193,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
// for(;pChartTypeIter != pChartTypeEnd;++pChartTypeIter)
// {
// sChartTypes += (*pChartTypeIter)->getChartType();
- // sChartTypes += OUString(";");
+ // sChartTypes += ";";
// }
// }
// aPropertyValue;// <<= sChartTypes;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index aded321f7715..7a29bd4a2e89 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1399,7 +1399,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
if ( !pActEntry->bHasGraphic )
{ // ALT text only if not any image loaded
if (!pActEntry->aAltText.isEmpty())
- pActEntry->aAltText += OUString("; ");
+ pActEntry->aAltText += "; ";
pActEntry->aAltText += rOption.GetString();
}
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 7917e82f9b52..594d74200a2f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -188,26 +188,26 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
{
//case sheet::ValidationType_CUSTOM
case sheet::ValidationType_DATE :
- sCondition += OUString("cell-content-is-date()");
+ sCondition += "cell-content-is-date()";
break;
case sheet::ValidationType_DECIMAL :
- sCondition += OUString("cell-content-is-decimal-number()");
+ sCondition += "cell-content-is-decimal-number()";
break;
case sheet::ValidationType_LIST :
- sCondition += OUString("cell-content-is-in-list(");
+ sCondition += "cell-content-is-in-list(";
sCondition += aValidation.sFormula1;
- sCondition += OUString(")");
+ sCondition += ")";
break;
case sheet::ValidationType_TEXT_LEN :
if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN &&
aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN)
- sCondition += OUString("cell-content-text-length()");
+ sCondition += "cell-content-text-length()";
break;
case sheet::ValidationType_TIME :
- sCondition += OUString("cell-content-is-time()");
+ sCondition += "cell-content-is-time()";
break;
case sheet::ValidationType_WHOLE :
- sCondition += OUString("cell-content-is-whole-number()");
+ sCondition += "cell-content-is-whole-number()";
break;
default:
{
@@ -221,31 +221,31 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
!aValidation.sFormula2.isEmpty())))
{
if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN)
- sCondition += OUString(" and ");
+ sCondition += " and ";
if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN &&
aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN)
{
if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN)
- sCondition += OUString("cell-content()");
+ sCondition += "cell-content()";
switch (aValidation.aOperator)
{
case sheet::ConditionOperator_EQUAL :
- sCondition += OUString("=");
+ sCondition += "=";
break;
case sheet::ConditionOperator_GREATER :
- sCondition += OUString(">");
+ sCondition += ">";
break;
case sheet::ConditionOperator_GREATER_EQUAL :
- sCondition += OUString(">=");
+ sCondition += ">=";
break;
case sheet::ConditionOperator_LESS :
- sCondition += OUString("<");
+ sCondition += "<";
break;
case sheet::ConditionOperator_LESS_EQUAL :
- sCondition += OUString("<=");
+ sCondition += "<=";
break;
case sheet::ConditionOperator_NOT_EQUAL :
- sCondition += OUString("!=");
+ sCondition += "!=";
break;
default:
{
@@ -259,21 +259,21 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN)
{
if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN)
- sCondition += OUString("cell-content-text-length-is-between(");
+ sCondition += "cell-content-text-length-is-between(";
else
- sCondition += OUString("cell-content-text-length-is-not-between(");
+ sCondition += "cell-content-text-length-is-not-between(";
}
else
{
if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN)
- sCondition += OUString("cell-content-is-between(");
+ sCondition += "cell-content-is-between(";
else
- sCondition += OUString("cell-content-is-not-between(");
+ sCondition += "cell-content-is-not-between(";
}
sCondition += aValidation.sFormula1;
- sCondition += OUString(",");
+ sCondition += ",";
sCondition += aValidation.sFormula2;
- sCondition += OUString(")");
+ sCondition += ")";
}
}
else
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index cd8a47b592ec..2c0f1b56c4f8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2660,7 +2660,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& r
{
OUString sErrorMessage("Fehler im Formatstring ");
sErrorMessage += sFormatString;
- sErrorMessage += OUString(" an Position ");
+ sErrorMessage += " an Position ";
sErrorMessage += OUString::number(rException.CheckPos);
uno::Sequence<OUString> aSeq(1);
aSeq[0] = sErrorMessage;
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index e2bd28fa9917..ab0ef1525fc5 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -717,7 +717,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
{
OUString sCondition("is-true-formula(");
sCondition += xSheetCondition->getFormula1();
- sCondition += OUString(")");
+ sCondition += ")";
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition);
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName ));
OUString sOUBaseAddress;
@@ -738,9 +738,9 @@ void ScXMLAutoStylePoolP::exportStyleContent(
else
sCondition = OUString("cell-content-is-not-between(");
sCondition += xSheetCondition->getFormula1();
- sCondition += OUString(",");
+ sCondition += ",";
sCondition += xSheetCondition->getFormula2();
- sCondition += OUString(")");
+ sCondition += ")";
}
else
{
@@ -748,22 +748,22 @@ void ScXMLAutoStylePoolP::exportStyleContent(
switch (aOperator)
{
case sheet::ConditionOperator_LESS:
- sCondition += OUString("<");
+ sCondition += "<";
break;
case sheet::ConditionOperator_GREATER:
- sCondition += OUString(">");
+ sCondition += ">";
break;
case sheet::ConditionOperator_LESS_EQUAL:
- sCondition += OUString("<=");
+ sCondition += "<=";
break;
case sheet::ConditionOperator_GREATER_EQUAL:
- sCondition += OUString(">=");
+ sCondition += ">=";
break;
case sheet::ConditionOperator_EQUAL:
- sCondition += OUString("=");
+ sCondition += "=";
break;
case sheet::ConditionOperator_NOT_EQUAL:
- sCondition += OUString("!=");
+ sCondition += "!=";
break;
default:
{
@@ -1081,7 +1081,7 @@ bool XmlScPropHdl_CellProtection::exportXML(
else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked)
{
rStrExpValue = GetXMLToken(XML_PROTECTED);
- rStrExpValue += OUString(" ");
+ rStrExpValue += " ";
rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN);
bRetval = true;
}
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index c8bdba5691e3..f1d3088179a1 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -78,15 +78,15 @@ namespace basprov
{
m_sURI = OUString("vnd.sun.star.script:");
m_sURI += pBasic->GetName();
- m_sURI += OUString(".");
+ m_sURI += ".";
m_sURI += pModule->GetName();
- m_sURI += OUString(".");
+ m_sURI += ".";
m_sURI += m_pMethod->GetName();
- m_sURI += OUString("?language=Basic&location=");
+ m_sURI += "?language=Basic&location=";
if ( m_bIsAppScript )
- m_sURI += OUString("application");
+ m_sURI += "application";
else
- m_sURI += OUString("document");
+ m_sURI += "document";
}
}
}
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index f6393cfd9724..6dfe69a05fbd 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -533,9 +533,9 @@ namespace dlgprov
sal_Int32 nIndex = sScriptCode.indexOf( ':' );
if ( nIndex >= 0 && nIndex < sScriptCode.getLength() )
{
- sScriptURL = OUString("vnd.sun.star.script:");
+ sScriptURL = "vnd.sun.star.script:";
sScriptURL += sScriptCode.copy( nIndex + 1 );
- sScriptURL += OUString("?language=Basic&location=");
+ sScriptURL += "?language=Basic&location=";
sScriptURL += sScriptCode.copy( 0, nIndex );
}
ScriptEvent aSFScriptEvent( aScriptEvent );
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 69c5df0f798a..f727e4864864 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1016,7 +1016,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
if( pLocaleItem != NULL )
{
OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase );
- aStreamName += OUString(".properties");
+ aStreamName += ".properties";
try
{
@@ -1038,7 +1038,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
loadLocale( pLocaleItem ) )
{
OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase );
- aStreamName += OUString(".properties");
+ aStreamName += ".properties";
Reference< io::XStream > xElementStream =
Storage->openStreamElement( aStreamName, ElementModes::READWRITE );
@@ -1076,7 +1076,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
if( pLocaleItem != NULL )
{
OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase );
- aStreamName += OUString(".default");
+ aStreamName += ".default";
try
{
@@ -1095,7 +1095,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
if( m_pDefaultLocaleItem != NULL && (bStoreAll || m_bDefaultModified) )
{
OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase );
- aStreamName += OUString(".default");
+ aStreamName += ".default";
Reference< io::XStream > xElementStream =
Storage->openStreamElement( aStreamName, ElementModes::READWRITE );
@@ -2568,7 +2568,7 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem )
try
{
OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase );
- aStreamName += OUString( ".properties" );
+ aStreamName += ".properties";
Reference< io::XStream > xElementStream =
m_xStorage->openStreamElement( aStreamName, ElementModes::READ );
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 03e8110da2f8..5bfac6ade440 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -230,7 +230,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
static int ppt_anim_debug_stream_number = 1;
OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-");
ppt_anim_debug_filename += OUString::number(ppt_anim_debug_stream_number++);
- ppt_anim_debug_filename += OUString(".xml");
+ ppt_anim_debug_filename += ".xml";
mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" );
#endif
dump("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 0c31186b20ad..4859c0c54acc 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1918,8 +1918,7 @@ SfxDocumentMetaData::loadFromStorage(
try {
xPropArg->getPropertyValue("BaseURI")
>>= input.sSystemId;
- input.sSystemId += OUString("/").concat(
- OUString(s_meta));
+ input.sSystemId += "/" + OUString(s_meta);
} catch (const css::uno::Exception &) {
input.sSystemId = OUString(s_meta);
}
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 7ca28798eb9e..cc2119a3e368 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -253,7 +253,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU
OUString aBackupURL;
::osl::Security().getConfigDir(aBackupURL);
- aBackupURL += OUString("/temp");
+ aBackupURL += "/temp";
if ( !xSimpleFileAccess->exists( aBackupURL ) )
xSimpleFileAccess->createFolder( aBackupURL );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b0801e3a0060..e7b1275aca19 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -660,7 +660,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
{
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
xProgress );
- aTemp += OUString("?repairpackage");
+ aTemp += "?repairpackage";
}
m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() );
@@ -1591,8 +1591,8 @@ UCBStorage_Impl::UCBStorage_Impl( const OUString& rName, StreamMode nMode, UCBSt
if ( m_bIsRoot )
{
// create the special package URL for the package content
- OUString aTemp = OUString("vnd.sun.star.pkg://");
- aTemp += OUString(INetURLObject::encode( aName, INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL ));
+ OUString aTemp = "vnd.sun.star.pkg://";
+ aTemp += INetURLObject::encode( aName, INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL );
m_aURL = aTemp;
if ( m_nMode & STREAM_WRITE )
@@ -1636,8 +1636,8 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, bool
// UCBStorages work on a content, so a temporary file for a content must be created, even if the stream is only
// accessed readonly
// the root storage opens the package; create the special package URL for the package content
- OUString aTemp = OUString("vnd.sun.star.pkg://");
- aTemp += OUString(INetURLObject::encode( m_pTempFile->GetURL(), INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL ));
+ OUString aTemp = "vnd.sun.star.pkg://";
+ aTemp += INetURLObject::encode( m_pTempFile->GetURL(), INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL );
m_aURL = aTemp;
// copy data into the temporary file
@@ -1768,7 +1768,7 @@ void UCBStorage_Impl::CreateContent()
{
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
m_xProgressHandler );
- aTemp += OUString("?repairpackage");
+ aTemp += "?repairpackage";
}
m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() );
@@ -3209,8 +3209,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName )
aTitle += ".";
for ( sal_Int32 i=0; !bRet; i++ )
{
- OUString aTmp( aTitle );
- aTmp += OUString::number( i );
+ OUString aTmp = aTitle + OUString::number( i );
bRet = ::utl::UCBContentHelper::MakeFolder( aFolder, aTmp, aNewFolder );
if ( bRet )
aTitle = aTmp;
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index c3ffaf1ee73d..8038d6173be8 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -784,9 +784,7 @@ namespace {
bool writeInfo(void * registryKey, OUString const & implementationName,
css::uno::Sequence< OUString > const & serviceNames) {
- OUString keyName("/");
- keyName += implementationName;
- keyName += OUString("/UNO/SERVICES");
+ OUString keyName = "/" + implementationName + "/UNO/SERVICES";
css::uno::Reference< css::registry::XRegistryKey > key;
try {
key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 31bf83c95bc7..aaacf910d461 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -303,9 +303,7 @@ namespace {
bool writeInfo(void * registryKey, OUString const & implementationName,
css::uno::Sequence< OUString > const & serviceNames) {
- OUString keyName("/");
- keyName += implementationName;
- keyName += OUString("/UNO/SERVICES");
+ OUString keyName = "/" + implementationName + "/UNO/SERVICES";
css::uno::Reference< css::registry::XRegistryKey > key;
try {
key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index d16702109883..09d82dc1f8e6 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -206,9 +206,7 @@ PassMap StorageItem::getInfo()
for( aNodeInd = 0; aNodeInd < aNodeCount; ++aNodeInd )
{
- aPropNames[aNodeInd] = OUString("Store/Passwordstorage['");
- aPropNames[aNodeInd] += aNodeNames[aNodeInd];
- aPropNames[aNodeInd] += OUString("']/Password");
+ aPropNames[aNodeInd] = "Store/Passwordstorage['" + aNodeNames[aNodeInd] + "']/Password";
}
Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aPropNames );
@@ -367,9 +365,7 @@ void StorageItem::update( const OUString& aURL, const NamePassRecord& aRecord )
Sequence< beans::PropertyValue > sendSeq(1);
- sendSeq[0].Name = OUString("Store/Passwordstorage['");
- sendSeq[0].Name += createIndex( forIndex );
- sendSeq[0].Name += OUString("']/Password");
+ sendSeq[0].Name = "Store/Passwordstorage['" + createIndex( forIndex ) + "']/Password";
sendSeq[0].Value <<= aRecord.GetPersPasswords();
@@ -810,7 +806,7 @@ OUString PasswordContainer::GetDefaultMasterPassword()
{
OUString aResult;
for ( sal_Int32 nInd = 0; nInd < RTL_DIGEST_LENGTH_MD5; nInd++ )
- aResult += OUString( "aa" );
+ aResult += "aa";
return aResult;
}
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 34a534efa0b7..6456a9b8cc90 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -268,7 +268,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName));
}
- *pIter += OUString("/Entries");
+ *pIter += "/Entries";
uno::Sequence < OUString > aDisplayNames = GetPropertyNames(*pIter);
lcl_addString(aDisplayNames,sDisplayName);
@@ -472,7 +472,7 @@ sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName)
OUString sBase("ExtendedColorScheme/ColorSchemes");
uno::Sequence < OUString > aComponentNames = GetPropertyNames(sBase);
- sBase += OUString("/") + _sSchemeName;
+ sBase += "/" + _sSchemeName;
const OUString* pCompIter = aComponentNames.getConstArray();
const OUString* pCompEnd = pCompIter + aComponentNames.getLength();
for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter)
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 2f55f5dd97d2..4d97c9bdeaa2 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -65,13 +65,11 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
Sequence<OUString> aPropNames(aNodeNames.getLength() * 4);
OUString* pNames = aPropNames.getArray();
sal_Int32 nName = 0;
- sPropPrefix += OUString("/");
+ sPropPrefix += "/";
sal_Int32 nNode;
for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
{
- OUString sStart(sPropPrefix);
- sStart += pNodeNames[nNode];
- sStart += OUString("/");
+ OUString sStart = sPropPrefix + pNodeNames[nNode] + "/";
pNames[nName] = sStart; pNames[nName++] += cReplaceFont;
pNames[nName] = sStart; pNames[nName++] += cSubstituteFont;
pNames[nName] = sStart; pNames[nName++] += cAlways;
@@ -125,10 +123,7 @@ void SvtFontSubstConfig::Commit()
const uno::Type& rBoolType = ::getBooleanCppuType();
for(size_t i = 0; i < pImpl->aSubstArr.size(); i++)
{
- OUString sPrefix(sNode);
- sPrefix += "/_";
- sPrefix += OUString::number(i);
- sPrefix += "/";
+ OUString sPrefix = sNode + "/_" + OUString::number(i) + "/";
SubstitutionStruct& pSubst = pImpl->aSubstArr[i];
pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name += sReplaceFont;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index eb81fb6f7ea2..fc4a4810f463 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -348,7 +348,7 @@ void AssignmentPersistentData::Commit()
{
OUString sFieldPath("Fields/");
sFieldPath += _rLogicalName;
- sFieldPath += OUString("/AssignedFieldName");
+ sFieldPath += "/AssignedFieldName";
sAssignment = getStringProperty(sFieldPath);
}
return sAssignment;
@@ -421,17 +421,15 @@ void AssignmentPersistentData::Commit()
// Fields/<field>
OUString sFieldElementNodePath(sDescriptionNodePath);
- sFieldElementNodePath += OUString("/");
+ sFieldElementNodePath += "/";
sFieldElementNodePath += _rLogicalName;
Sequence< PropertyValue > aNewFieldDescription(2);
// Fields/<field>/ProgrammaticFieldName
- aNewFieldDescription[0].Name = sFieldElementNodePath;
- aNewFieldDescription[0].Name += OUString("/ProgrammaticFieldName");
+ aNewFieldDescription[0].Name = sFieldElementNodePath + "/ProgrammaticFieldName";
aNewFieldDescription[0].Value <<= _rLogicalName;
// Fields/<field>/AssignedFieldName
- aNewFieldDescription[1].Name = sFieldElementNodePath;
- aNewFieldDescription[1].Name += OUString("/AssignedFieldName");
+ aNewFieldDescription[1].Name = sFieldElementNodePath + "/AssignedFieldName";
aNewFieldDescription[1].Value <<= _rAssignment;
// just set the new value
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 6e5274b2ac95..ef267c0d25b9 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -664,7 +664,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
else
aText = m_aAbsolute.CreateFieldText(pParent->GetRowCount());
if(!pParent->m_bRecordCountFinal)
- aText += OUString(" *");
+ aText += " *";
}
else
aText = "";
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 33a310c2b3a2..5d47a219118c 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1455,7 +1455,7 @@ namespace svxform
aNewName = aBaseName;
if( i>0 )
{
- aNewName += OUString(" ");
+ aNewName += " ";
aNewName += OUString::number(i).getStr();
}
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 13f687a99c9c..3f4ae03b8ce5 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -835,7 +835,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1);
OUString sPages(OUString::number( rStartInfo.nStartPageInTarget ));
- sPages += OUString(" - ");
+ sPages += " - ";
sPages += OUString::number( rEndInfo.nEndPageInTarget );
SwWrtShell& rSh = pTargetView->GetWrtShell();
@@ -896,7 +896,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttach, '.');
if( 2 > nTokenCount)
{
- sAttach += OUString('.');
+ sAttach += ".";
++nTokenCount;
}
sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType( nDocType ));
@@ -1051,7 +1051,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttach, '.');
if (2 > nTokenCount)
{
- sAttach += OUString('.');
+ sAttach += ".";
++nTokenCount;
}
sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType(
@@ -1176,7 +1176,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
while ( bDone )
{
sBody += OStringToOUString(sLine, eEncoding);
- sBody += OUString('\n');
+ sBody += "\n";
bDone = pInStream->ReadLine( sLine );
}
}
@@ -1191,7 +1191,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttachment, '.');
if (2 > nTokenCount)
{
- sAttachment += OUString('.');
+ sAttachment += ".";
sAttachment = comphelper::string::setToken(sAttachment, nTokenCount, '.', sExtension);
}
else if (sAttachment.getToken( nTokenCount - 1, '.') != sExtension)
@@ -1232,9 +1232,8 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
aDesc.sBodyContent = sBody;
if(MM_DOCTYPE_HTML == nDocType)
{
- aDesc.sBodyMimeType = OUString("text/html; charset=");
- aDesc.sBodyMimeType += OUString::createFromAscii(
- rtl_getBestMimeCharsetFromTextEncoding( eEncoding ));
+ aDesc.sBodyMimeType = "text/html; charset=" +
+ OUString::createFromAscii(rtl_getBestMimeCharsetFromTextEncoding( eEncoding ));
}
else
aDesc.sBodyMimeType =
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 61d9f2d86f4c..d38c8ee103ea 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3129,9 +3129,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
long nDebugWidth = pDebugCtrl->GetSizePixel().Width();
sMessage += OUString::number( nDebugXPos );
- sMessage += OUString(" ");
+ sMessage += " ";
sMessage += OUString::number(nDebugXPos + nDebugWidth);
- sMessage += OUString(" | ");
+ sMessage += " | ";
}
#endif
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 09aabece5384..1d4acb347873 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -704,7 +704,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
m_pWrtShell->GetContentAtPos( aPos, aCnt );
if( !aCnt.sStr.isEmpty() )
{
- sPageStr += OUString(" - ");
+ sPageStr += " - ";
sal_Int32 nChunkLen = std::min<sal_Int32>(aCnt.sStr.getLength(), 80);
OUString sChunk = aCnt.sStr.copy(0, nChunkLen);
sPageStr = sChunk + sPageStr;
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 8a3fa43f7a13..6bc0569f4241 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -343,11 +343,11 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
if( nType == word::WdSeekView::wdSeekEvenPagesFooter
|| nType == word::WdSeekView::wdSeekEvenPagesHeader )
{
- aTempPropText += OUString("Left");
+ aTempPropText += "Left";
}
else
{
- aTempPropText += OUString("Right");
+ aTempPropText += "Right";
}
xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW );
}
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 43bbd2e4a1b1..341d829d67f7 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -610,9 +610,9 @@ OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeExcep
{
aName = GetWindow()->GetAccessibleName();
#if OSL_DEBUG_LEVEL > 1
- aName += OUString(" (Type = ");
+ aName += " (Type = ";
aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType()));
- aName += OUString( ")");
+ aName += ")";
#endif
}
return aName;
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 87a677305c37..d969330c615c 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1111,7 +1111,7 @@ void handleNameClashRename(
aOldTitlePre = aOldTitle;
if ( nPos > 0 )
- aOldTitlePre += OUString("_");
+ aOldTitlePre += "_";
sal_Bool bContinue = sal_True;
do
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 302149cc11bf..e179bfd7af8b 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -910,7 +910,7 @@ BaseContent::setPropertyValues(
// m_aUncPath contains parent's URI.
if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
- m_aUncPath += OUString("/");
+ m_aUncPath += "/";
m_aUncPath += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -951,7 +951,7 @@ BaseContent::setPropertyValues(
OUString aDstName = getParentName( m_aUncPath );
if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 )
- aDstName += OUString("/");
+ aDstName += "/";
aDstName += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -1247,7 +1247,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
m_pMyShell->clearError( nMyCommandIdentifier );
m_aUncPath = getParentName( m_aUncPath );
if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
- m_aUncPath += OUString("/");
+ m_aUncPath += "/";
m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(),
rtl_UriCharClassPchar,
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 538e013bf1ac..3d30f7883377 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1190,8 +1190,7 @@ shell::move( sal_Int32 CommandId,
{
newDstUnqPath = dstUnqPath;
- OUString aPostFix( "_" );
- aPostFix += OUString::number( ++nTry );
+ OUString aPostFix = "_" + OUString::number( ++nTry );
newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1417,8 +1416,7 @@ shell::copy(
{
newDstUnqPath = dstUnqPath;
- OUString aPostFix( "_" );
- aPostFix += OUString::number( ++nTry );
+ OUString aPostFix = "_" + OUString::number( ++nTry );
newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -2039,7 +2037,7 @@ shell::copy_recursive( const OUString& srcUnqPath,
RTL_TEXTENCODING_UTF8 );
if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 )
- newDstUnqPath += OUString("/");
+ newDstUnqPath += "/";
newDstUnqPath += tit;
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index f7ce5f94a822..f2ae8412f9f8 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -550,7 +550,7 @@ void Content::queryChildren( ContentRefList& rChildren )
sal_Int32 nURLPos = aURL.lastIndexOf( '/' );
if ( nURLPos != ( aURL.getLength() - 1 ) )
- aURL += OUString("/");
+ aURL += "/";
sal_Int32 nLen = aURL.getLength();
@@ -1171,7 +1171,7 @@ uno::Reference< ucb::XContent >
OUString aURL = m_xIdentifier->getContentIdentifier();
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += OUString("/");
+ aURL += "/";
name = create_document ? "[New_Content]" : "[New_Collection]";
aURL += OUString::createFromAscii( name );
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index e6824e25631b..bc4fb049c891 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -121,7 +121,7 @@ OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , NULL, false);
if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
- aId += OUString("/");
+ aId += "/";
aId += OUString::createFromAscii( escaped_name );
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 66d3db2ffdb5..ef97acc4a34c 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -499,7 +499,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
OUString aURL = getOUURI();
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += OUString("/");
+ aURL += "/";
name = create_document ? "[New_Content]" : "[New_Collection]";
// This looks problematic to me cf. webdav
@@ -700,7 +700,7 @@ Content::makeNewURL( const char */*newName*/ )
{
OUString aNewURL = getParentURL();
if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
- aNewURL += OUString("/");
+ aNewURL += "/";
char *name = gnome_vfs_escape_string( m_info.name );
aNewURL += GnomeToOUString( name );
@@ -882,7 +882,7 @@ void Content::queryChildren( ContentRefList& rChildren )
sal_Int32 nURLPos = aURL.lastIndexOf( '/' );
if ( nURLPos != ( aURL.getLength() - 1 ) )
- aURL += OUString("/");
+ aURL += "/";
sal_Int32 nLen = aURL.getLength();
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index fb02b50ed9f9..5871baa2bd51 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -161,7 +161,7 @@ OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name );
if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
- aId += OUString("/");
+ aId += "/";
aId += OUString::createFromAscii( escaped_name );
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index f86f1825b5eb..b0fa90fbae7b 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -609,12 +609,12 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info )
"HierarchyContent::createNewContent - empty identifier!" );
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += OUString("/");
+ aURL += "/";
if ( bCreateFolder )
- aURL += OUString("New_Folder");
+ aURL += "New_Folder";
else
- aURL += OUString("New_Link");
+ aURL += "New_Link";
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( aURL );
@@ -772,7 +772,7 @@ HierarchyContent::makeNewIdentifier( const OUString& rTitle )
// Assemble new content identifier...
HierarchyUri aUri( m_xIdentifier->getContentIdentifier() );
OUString aNewURL = aUri.getParentUri();
- aNewURL += OUString("/");
+ aNewURL += "/";
aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle );
return uno::Reference< ucb::XContentIdentifier >(
@@ -798,7 +798,7 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren )
if ( nURLPos != ( aURL.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aURL += OUString("/");
+ aURL += "/";
}
sal_Int32 nLen = aURL.getLength();
@@ -1449,7 +1449,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
do
{
OUString aNewId = xId->getContentIdentifier();
- aNewId += OUString("_");
+ aNewId += "_";
aNewId += OUString::number( ++nTry );
xId = new ::ucbhelper::ContentIdentifier( aNewId );
}
@@ -1469,7 +1469,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
else
{
OUString aNewTitle( m_aProps.getTitle() );
- aNewTitle += OUString("_");
+ aNewTitle += "_";
aNewTitle += OUString::number( nTry );
m_aProps.setTitle( aNewTitle );
}
@@ -1618,7 +1618,7 @@ void HierarchyContent::transfer(
if ( nPos != ( aId.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aId += OUString("/");
+ aId += "/";
}
if ( rInfo.SourceURL.getLength() <= aId.getLength() )
@@ -1801,7 +1801,7 @@ void HierarchyContent::transfer(
OUString aChildId = xId->getContentIdentifier();
if ( ( aChildId.lastIndexOf( '/' ) + 1 ) != aChildId.getLength() )
- aChildId += OUString("/");
+ aChildId += "/";
aChildId += rResult.getName();
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 25cfffe77061..814cc4702c81 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -170,7 +170,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
if ( xRootReadAccess.is() )
{
OUString aTitlePath = m_aPath;
- aTitlePath += OUString("/Title");
+ aTitlePath += "/Title";
// Note: Avoid NoSuchElementExceptions, because exceptions are
// relatively 'expensive'. Checking for availability of
@@ -194,7 +194,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
// Get TargetURL value.
OUString aTargetURLPath = m_aPath;
- aTargetURLPath += OUString("/TargetURL");
+ aTargetURLPath += "/TargetURL";
if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath )
>>= aValue ) )
{
@@ -213,7 +213,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
rData.setTargetURL( aValue );
OUString aTypePath = m_aPath;
- aTypePath += OUString("/Type");
+ aTypePath += "/Type";
if ( xRootReadAccess->hasByHierarchicalName( aTypePath ) )
{
// Might not be present since it was introduced long after
@@ -921,7 +921,7 @@ sal_Bool HierarchyEntry::first( iterator& it )
if ( !m_aPath.isEmpty() )
{
OUString aPath = m_aPath;
- aPath += OUString("/Children");
+ aPath += "/Children";
xRootHierNameAccess->getByHierarchicalName( aPath )
>>= xNameAccess;
@@ -1127,9 +1127,9 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const
OUString aTargetURL = aTitle;
OUString aType = aTitle;
- aTitle += OUString("/Title");
- aTargetURL += OUString("/TargetURL");
- aType += OUString("/Type");
+ aTitle += "/Title";
+ aTargetURL += "/TargetURL";
+ aType += "/Type";
OUString aValue;
m_pImpl->dir->getByHierarchicalName( aTitle ) >>= aValue;
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index dcb300bdb479..a27f462c06db 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -152,7 +152,7 @@ OUString HierarchyResultSetDataSupplier::queryContentIdentifierString(
= m_pImpl->m_xContent->getIdentifier()->getContentIdentifier();
if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
- aId += OUString("/");
+ aId += "/";
aId += m_pImpl->m_aResults[ nIndex ]->aData.getName();
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index fdbf1a7b957d..5f50aac9fcaf 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -75,7 +75,7 @@ void HierarchyUri::init() const
if ( m_aUri.getLength() == HIERARCHY_URL_SCHEME_LENGTH + 1 )
{
// root folder URI without path and service specifier.
- m_aUri += OUString( "//" DEFAULT_DATA_SOURCE_SERVICE "/" );
+ m_aUri += "//" DEFAULT_DATA_SOURCE_SERVICE "/";
m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE );
nPos = m_aUri.getLength() - 1;
@@ -85,7 +85,7 @@ void HierarchyUri::init() const
( m_aUri[ HIERARCHY_URL_SCHEME_LENGTH + 1 ] == '/' ) )
{
// root folder URI without service specifier.
- m_aUri += OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" );
+ m_aUri += "/" DEFAULT_DATA_SOURCE_SERVICE "/";
m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE );
nPos = m_aUri.getLength() - 1;
@@ -144,7 +144,7 @@ void HierarchyUri::init() const
{
// Trailing slash missing.
nEnd = m_aUri.getLength();
- m_aUri += OUString("/");
+ m_aUri += "/";
}
m_aService = m_aUri.copy( nStart, nEnd - nStart );
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index c6578482843b..b8eb22e21877 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -728,13 +728,13 @@ Content::createNewContent( const ucb::ContentInfo& Info )
return uno::Reference< ucb::XContent >();
OUString aURL = m_aUri.getUri();
- aURL += OUString("/");
+ aURL += "/";
if ( Info.Type.equalsIgnoreAsciiCase(
getContentType( m_aUri.getScheme(), sal_True ) ) )
- aURL += OUString("New_Folder");
+ aURL += "New_Folder";
else
- aURL += OUString("New_Stream");
+ aURL += "New_Stream";
uno::Reference< ucb::XContentIdentifier > xId(
new ::ucbhelper::ContentIdentifier( aURL ) );
@@ -1371,7 +1371,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
// Assemble new content identifier...
OUString aNewURL = m_aUri.getParentUri();
- aNewURL += OUString("/");
+ aNewURL += "/";
aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle );
uno::Reference< ucb::XContentIdentifier > xNewId
= new ::ucbhelper::ContentIdentifier( aNewURL );
@@ -1635,7 +1635,7 @@ void Content::insert(
OUString aNewURL = m_aUri.getParentUri();
if (1 + aNewURL.lastIndexOf('/') != aNewURL.getLength())
- aNewURL += OUString("/");
+ aNewURL += "/";
aNewURL += ::ucb_impl::urihelper::encodeSegment( m_aProps.aTitle );
PackageUri aNewUri( aNewURL );
@@ -1670,7 +1670,7 @@ void Content::insert(
do
{
OUString aNew = aNewUri.getUri();
- aNew += OUString("_");
+ aNew += "_";
aNew += OUString::number( ++nTry );
aNewUri.setUri( aNew );
}
@@ -1689,7 +1689,7 @@ void Content::insert(
}
else
{
- m_aProps.aTitle += OUString("_");
+ m_aProps.aTitle += "_";
m_aProps.aTitle += OUString::number( nTry );
}
}
@@ -1835,7 +1835,7 @@ void Content::transfer(
// Is source not a parent of me / not me?
OUString aId = m_aUri.getParentUri();
- aId += OUString("/");
+ aId += "/";
if ( rInfo.SourceURL.getLength() <= aId.getLength() )
{
@@ -2035,7 +2035,7 @@ void Content::transfer(
OUString aChildId = xId->getContentIdentifier();
if ( ( aChildId.lastIndexOf( '/' ) + 1 )
!= aChildId.getLength() )
- aChildId += OUString("/");
+ aChildId += "/";
aChildId += ::ucb_impl::urihelper::encodeSegment( aName );
@@ -2178,7 +2178,7 @@ void Content::queryChildren( ContentRefList& rChildren )
OSL_ENSURE( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ),
"Content::queryChildren - Invalid URL!" );
- aURL += OUString("/");
+ aURL += "/";
sal_Int32 nLen = aURL.getLength();
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index f0e9b8d2f995..3b39f58e9b4b 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -463,7 +463,7 @@ OUString DataSupplier::assembleChildURL( const OUString& aName )
sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
if ( nPackageUrlEnd != aURL.getLength() - 1 )
- aURL += OUString("/");
+ aURL += "/";
aURL += ::ucb_impl::urihelper::encodeSegment( aName );
aURL += aContURL.copy( nParam );
@@ -474,7 +474,7 @@ OUString DataSupplier::assembleChildURL( const OUString& aName )
sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
if ( nPackageUrlEnd != aURL.getLength() - 1 )
- aURL += OUString("/");
+ aURL += "/";
aURL += ::ucb_impl::urihelper::encodeSegment( aName );
}
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 9f7c6e24fc46..54543c39b7bb 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -717,12 +717,12 @@ Content::createNewContent( const ucb::ContentInfo& Info )
"Content::createNewContent - empty identifier!" );
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += OUString("/");
+ aURL += "/";
if ( bCreateFolder )
- aURL += OUString("New_Folder");
+ aURL += "New_Folder";
else
- aURL += OUString("New_Stream");
+ aURL += "New_Stream";
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( aURL );
@@ -783,7 +783,7 @@ void Content::queryChildren( ContentRefList& rChildren )
if ( nURLPos != ( aURL.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aURL += OUString("/");
+ aURL += "/";
}
sal_Int32 nLen = aURL.getLength();
@@ -1985,7 +1985,7 @@ void Content::transfer(
if ( nPos != ( aId.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aId += OUString("/");
+ aId += "/";
}
if ( rInfo.SourceURL.getLength() <= aId.getLength() )
@@ -2096,7 +2096,7 @@ void Content::transfer(
OUString aTargetUri = m_xIdentifier->getContentIdentifier();
if ( ( aTargetUri.lastIndexOf( '/' ) + 1 ) != aTargetUri.getLength() )
- aTargetUri += OUString("/");
+ aTargetUri += "/";
if ( !rInfo.NewTitle.isEmpty() )
aTargetUri += ::ucb_impl::urihelper::encodeSegment( rInfo.NewTitle );
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 6f7a55fcb279..a9ed86730478 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -429,7 +429,7 @@ ResultSetDataSupplier::assembleChildURL( const OUString& aName )
sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' );
if ( nUrlEnd != aURL.getLength() - 1 )
- aURL += OUString("/");
+ aURL += "/";
aURL += aName;
return aURL;
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 899b2275c3ea..b3488df1c095 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -147,16 +147,12 @@ void NeonUri::init( const OString & rUri, const ne_uri * pUri )
if ( pUri->query )
{
- mPath += OUString("?");
- mPath += OStringToOUString(
- pUri->query, RTL_TEXTENCODING_UTF8 );
+ mPath += "?" + OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 );
}
if ( pUri->fragment )
{
- mPath += OUString("#");
- mPath += OStringToOUString(
- pUri->fragment, RTL_TEXTENCODING_UTF8 );
+ mPath += "#" + OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 );
}
}
@@ -255,7 +251,7 @@ OUString NeonUri::GetPathBaseNameUnescaped () const
void NeonUri::AppendPath (const OUString& rPath)
{
if (mPath.lastIndexOf ('/') != mPath.getLength () - 1)
- mPath += OUString("/");
+ mPath += "/";
mPath += rPath;
calculateURI ();
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 81b27b65ad63..f117a9b7c758 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1076,17 +1076,17 @@ Content::createNewContent( const ucb::ContentInfo& Info )
"WebdavContent::createNewContent - empty identifier!" );
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += OUString("/");
+ aURL += "/";
sal_Bool isCollection;
if ( Info.Type == WEBDAV_COLLECTION_TYPE )
{
- aURL += OUString("New_Collection");
+ aURL += "New_Collection";
isCollection = sal_True;
}
else
{
- aURL += OUString("New_Content");
+ aURL += "New_Content";
isCollection = sal_False;
}
@@ -1851,7 +1851,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
OUString aNewURL = getParentURL();
if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
- aNewURL += OUString("/");
+ aNewURL += "/";
aNewURL += NeonUri::escapeSegment( aNewTitle );
@@ -2225,7 +2225,7 @@ void Content::queryChildren( ContentRefList& rChildren )
if ( nURLPos != ( aURL.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aURL += OUString("/");
+ aURL += "/";
}
sal_Int32 nLen = aURL.getLength();
@@ -2385,7 +2385,7 @@ void Content::insert(
// Assemble new content identifier...
OUString aURL = getParentURL();
if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) )
- aURL += OUString("/");
+ aURL += "/";
aURL += aEscapedTitle;
@@ -2603,7 +2603,7 @@ void Content::transfer(
OUString aTargetURL = xIdentifier->getContentIdentifier();
if ( ( aTargetURL.lastIndexOf( '/' ) + 1 )
!= aTargetURL.getLength() )
- aTargetURL += OUString("/");
+ aTargetURL += "/";
aTargetURL += aTitle;
@@ -2971,7 +2971,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
{
aURL = getParentURL();
if ( aURL.lastIndexOf('/') != ( aURL.getLength() - 1 ) )
- aURL += OUString(static_cast<sal_Unicode>('/'));
+ aURL += "/";
aURL += m_aEscapedTitle;
}
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 64da40979533..2bca85f3f0cd 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -149,12 +149,12 @@ OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
= *( m_pImpl->m_aResults[ nIndex ].pData );
if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
- aId += OUString("/");
+ aId += "/";
aId += props.getEscapedTitle();
if ( props.isTrailingSlash() )
- aId += OUString("/");
+ aId += "/";
m_pImpl->m_aResults[ nIndex ].aId = aId;
return aId;
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 616d1bd664e6..690d4da747db 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -173,7 +173,7 @@ ContentProvider::queryContent(
nPos = aURL.indexOf( '/', nPos + 1 );
if ( nPos == -1 )
{
- aURL += OUString("/");
+ aURL += "/";
bNewId = true;
}
}
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 709b62d3279d..6c2392baf7e1 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -214,8 +214,7 @@ void SAL_CALL TestOutputStream::writeBytes(
m_bMore = true;
}
m_sStart
- += OUString(reinterpret_cast< const sal_Char * >(rData.
- getConstArray()),
+ += OUString(reinterpret_cast< const sal_Char * >(rData.getConstArray()),
nLen, RTL_TEXTENCODING_ISO_8859_1);
}
@@ -224,7 +223,7 @@ OUString TestOutputStream::getStart() const
{
OUString sResult = m_sStart;
if (m_bMore)
- sResult += OUString("...");
+ sResult += "...";
return sResult;
}
@@ -272,14 +271,13 @@ OUString ProgressHandler::toString(const uno::Any & rStatus)
OUString sResult;
if (aStart.Text.getLength() > 0)
{
- sResult = aStart.Text;
- sResult += OUString(" ");
+ sResult = aStart.Text + " ";
}
- sResult += OUString("[");
+ sResult += "[";
sResult += OUString::valueOf(aStart.Minimum);
- sResult += OUString("..");
+ sResult += "..";
sResult += OUString::valueOf(aStart.Maximum);
- sResult += OUString("]");
+ sResult += "]";
return sResult;
}
@@ -290,9 +288,7 @@ OUString ProgressHandler::toString(const uno::Any & rStatus)
sal_Int32 nValue;
if (rStatus >>= nValue)
{
- OUString sResult("..");
- sResult += OUString::valueOf(nValue);
- sResult += OUString("..");
+ OUString sResult = ".." + OUString::valueOf(nValue) + "..";
return OUString(sResult);
}
@@ -387,10 +383,10 @@ OUString Ucb::getUnoURL()
OUString aUnoURL(
"uno:socket,host=localhost,port=8121;");
if (m_aProtocol.getLength() == 0)
- aUnoURL += OUString("urp");
+ aUnoURL += "urp";
else
aUnoURL += m_aProtocol;
- aUnoURL += OUString(";UCB.Factory");
+ aUnoURL += ";UCB.Factory";
return aUnoURL;
}
@@ -443,8 +439,7 @@ sal_Bool Ucb::init()
aInfos(xProvMgr->queryContentProviders());
for (sal_Int32 i = 0; i < aInfos.getLength(); ++i)
{
- String aText(" ");
- aText += OUString(aInfos[i].Scheme);
+ OUString aText = " " + aInfos[i].Scheme;
print(aText);
}
}
@@ -2136,10 +2131,10 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
case MYWIN_ITEMID_FETCHSIZE:
{
m_nFetchSize = aCmdLine.ToInt32();
- String aText;
+ OUString aText;
if (m_nFetchSize > 0)
{
- aText.AssignAscii("Fetch size set to ");
+ aText = "Fetch size set to ";
aText += OUString::number(m_nFetchSize);
}
else
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index f8271b579d8d..114c12a988a4 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -718,7 +718,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
aServer = aToken;
}
- aToken += OUString(":*");
+ aToken += ":*";
}
else
{
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 48118ceacd59..59f8f4ee879e 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2172,7 +2172,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
osl_getExecutableFile( &aPath.pData );
aPath = aPath.copy( 0, aPath.lastIndexOf('/') );
OUString aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') );
- aFontDirUrl += OUString("/" LIBO_SHARE_FOLDER "/fonts/truetype");
+ aFontDirUrl += "/" LIBO_SHARE_FOLDER "/fonts/truetype";
// collect fonts in font path that could not be registered
osl::Directory aFontDir( aFontDirUrl );
@@ -2184,7 +2184,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
OUString aBootStrap;
rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), aBootStrap );
- aBootStrap += OUString("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) );
+ aBootStrap += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" );
rtl::Bootstrap aBootstrap( aBootStrap );
OUString aUserPath;
aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath );
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index f8838c3072c4..c9f1a79edbc4 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -532,7 +532,7 @@ namespace xmloff
if (!sReferencedBy.isEmpty())
// it's not the first _rxObject referring to the xCurrentReference
// -> separate the id
- sReferencedBy += OUString(",");
+ sReferencedBy += ",";
sReferencedBy += sCurrentId;
}
}
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index f5ef3fe0f2b7..f529f3ae1c67 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -502,7 +502,7 @@ void XMLPropertiesTContext_Impl::StartElement(
{
if ( !aNewAttrValue.isEmpty() )
{
- aNewAttrValue += OUString(" " );
+ aNewAttrValue += " ";
}
if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) )
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 7543c10f5a06..99f5971e231d 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -910,7 +910,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
{
if ( !aStyleMirrorAttrValue.isEmpty() )
{
- aStyleMirrorAttrValue += OUString(" " );
+ aStyleMirrorAttrValue += " ";
}
if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) )
@@ -990,7 +990,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
if( bMoveProtect && -1 == aProtectAttrValue.indexOf( rPosition ) )
{
if( !aProtectAttrValue.isEmpty() )
- aProtectAttrValue += OUString( sal_Unicode( ' ' ) );
+ aProtectAttrValue += " ";
aProtectAttrValue += rPosition;
}
@@ -998,7 +998,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
if( bSizeProtect && -1 == aProtectAttrValue.indexOf( rSize ) )
{
if( !aProtectAttrValue.isEmpty() )
- aProtectAttrValue += OUString( sal_Unicode( ' ' ) );
+ aProtectAttrValue += " ";
aProtectAttrValue += rSize;
}