summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-12-13 09:29:22 +0200
committerNoel Grandin <noel@peralex.com>2013-12-17 11:49:03 +0200
commit08fe82e59cbc598d2683d72877653316c1e41962 (patch)
tree5eeace3006ef2bfd58a5d97a000f336b8b06099c
parentfc985c30048d410ab68a55af64f56df85547a6bf (diff)
Remove unnecessary use of OUString constructor in + expressions
Convert code like aFilename = OUString::number(nFilePostfixCount) + OUString(".bmp"); to aFilename = OUString::number(nFilePostfixCount) + ".bmp"; Change-Id: I03f513ad1c8ec8846b2afbdc67ab12525ed07e50
-rw-r--r--canvas/source/vcl/spritedevicehelper.cxx2
-rw-r--r--connectivity/source/commontools/TIndexes.cxx4
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx2
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.cxx14
-rw-r--r--connectivity/source/drivers/mork/MConnection.cxx4
-rw-r--r--connectivity/source/drivers/mork/MNSFolders.cxx2
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YUsers.cxx2
-rw-r--r--cui/source/customize/cfg.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.cxx4
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx4
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/migration/migration.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx4
-rw-r--r--dtrans/source/cnttype/mcnttype.cxx2
-rw-r--r--extensions/source/update/check/updatecheckconfig.cxx2
-rw-r--r--framework/source/services/license.cxx4
-rw-r--r--helpcompiler/source/HelpIndexer.cxx4
-rw-r--r--jvmfwk/source/fwkutil.cxx3
-rw-r--r--mysqlc/source/mysqlc_general.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx4
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx4
-rw-r--r--sal/qa/osl/file/osl_File.cxx6
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx4
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx8
-rw-r--r--sot/source/sdstor/ucbstorage.cxx2
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx6
-rw-r--r--stoc/source/implementationregistration/implreg.cxx2
-rw-r--r--stoc/source/javavm/javavm.cxx4
-rw-r--r--stoc/test/testintrosp.cxx2
-rw-r--r--svtools/source/contnr/DocumentInfoPreview.cxx2
-rw-r--r--svtools/source/control/roadmap.cxx2
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx2
-rw-r--r--test/source/beans/xpropertyset.cxx2
-rw-r--r--unotest/source/cpp/bootstrapfixturebase.cxx2
-rw-r--r--unotest/source/cpp/filters-test.cxx6
-rw-r--r--unotest/source/cpp/toabsolutefileurl.cxx6
-rw-r--r--unotools/source/config/eventcfg.cxx4
-rw-r--r--uui/source/iahndl-ssl.cxx2
-rw-r--r--vcl/generic/print/printerjob.cxx4
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx32
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx2
-rw-r--r--xmlscript/test/imexp.cxx2
-rw-r--r--xmlsecurity/source/helper/xsecctl.cxx12
54 files changed, 109 insertions, 116 deletions
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index a92150a6782a..982042b84165 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -128,7 +128,7 @@ namespace vclcanvas
if( mpBackBuffer )
{
- OUString aFilename = "dbg_backbuffer" + OUString::number(nFilePostfixCount) + OUString(".bmp");
+ OUString aFilename = "dbg_backbuffer" + OUString::number(nFilePostfixCount) + ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 6c89a81b3458..f9aa564b07a7 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -232,9 +232,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName
OUString sIndexName,sTemp;
sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions );
- aSql += sIndexName
- + OUString(" ON ")
- + aComposedName;
+ aSql += sIndexName + " ON " + aComposedName;
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 98dde62d2947..e7e4da0ec9fe 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -520,7 +520,7 @@ void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException
OUString sComposedName;
sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation);
sSql += sComposedName
- + OUString(" TO ");
+ + " TO ";
sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation);
sSql += sComposedName;
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index c02397ee92da..404101ebe57c 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -354,7 +354,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException,
OUString aBatchSql;
sal_Int32 nLen = 0;
for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
- aBatchSql = aBatchSql + *i + OUString(";");
+ aBatchSql = aBatchSql + *i + ";";
if ( m_RecordSet.IsValid() )
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 364213db7807..802a15a52b55 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -557,7 +557,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
multiLabelString = CFStringToOUString(localizedMultiLabel);
CFRelease(multiLabel);
CFRelease(localizedMultiLabel);
- headerNameString = multiPropertyString + OUString(": ") + fixLabel(multiLabelString);
+ headerNameString = multiPropertyString + ": " + fixLabel(multiLabelString);
headerNames[i] = new macabfield;
headerNames[i]->value = OUStringToCFString(headerNameString);
headerNames[i]->type = multiType;
@@ -608,7 +608,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
if(multiValue && multiLabel)
{
localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel);
- multiLabelString = multiPropertyString + OUString(": ") + fixLabel(CFStringToOUString(localizedMultiLabel));
+ multiLabelString = multiPropertyString + ": " + fixLabel(CFStringToOUString(localizedMultiLabel));
CFRelease(multiLabel);
CFRelease(localizedMultiLabel);
multiLabel = OUStringToCFString(multiLabelString);
@@ -696,7 +696,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
dictType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(dictValues[i]) );
localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]);
dictKeyString = CFStringToOUString(localizedDictKey);
- dictLabelString = propertyNameString + OUString(": ") + fixLabel(dictKeyString);
+ dictLabelString = propertyNameString + ": " + fixLabel(dictKeyString);
dictLabel = OUStringToCFString(dictLabelString);
dictHeaders[i] = createHeaderForProperty(dictType, dictValues[i], dictLabel);
if (!dictHeaders[i])
@@ -942,7 +942,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
* property into the record.
*/
sal_Bool bPlaced = sal_False;
- OUString columnName = OUString(_propertyName);
+ OUString columnName = _propertyName;
sal_Int32 i = 1;
// A big safeguard to prevent two fields from having the same name.
@@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
{
bPlaced = sal_False;
i++;
- columnName = OUString(_propertyName) + OUString(" (") + OUString::number(i) + OUString(")");
+ columnName = _propertyName + " (" + OUString::number(i) + ")";
}
// success!
@@ -1029,7 +1029,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]);
dictKeyString = CFStringToOUString(localizedDictKey);
CFRelease(localizedDictKey);
- newPropertyName = _propertyName + OUString(": ") + fixLabel(dictKeyString);
+ newPropertyName = _propertyName + ": " + fixLabel(dictKeyString);
insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, dictValues[i]);
}
@@ -1072,7 +1072,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel);
multiLabelString = CFStringToOUString(localizedMultiLabel);
- newPropertyName = _propertyName + OUString(": ") + fixLabel(multiLabelString);
+ newPropertyName = _propertyName + ": " + fixLabel(multiLabelString);
insertPropertyIntoMacabRecord(multiType, _abrecord, _header, newPropertyName, multiValue);
/* free our variables */
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index d9ea6a74ba2a..78956371372f 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -127,8 +127,8 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
OUString path = m_pProfileAccess->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile);
SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile);
SAL_INFO("connectivity.mork", "ProfilePath: " << path);
- abook = path + OUString( "/abook.mab" );
- history = path + OUString( "/history.mab" );
+ abook = path + "/abook.mab";
+ history = path + "/history.mab";
SAL_INFO("connectivity.mork", "AdressbookPath (abook): " << abook);
SAL_INFO("connectivity.mork", "AdressbookPath (history): " << history);
}
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx
index 029d9e39be67..71a01493d659 100644
--- a/connectivity/source/drivers/mork/MNSFolders.cxx
+++ b/connectivity/source/drivers/mork/MNSFolders.cxx
@@ -56,7 +56,7 @@ namespace
aSecurity.getHomeDir( aConfigPath );
#endif
- return aConfigPath + OUString("/");
+ return aConfigPath + "/";
}
// -------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index e498128b8c35..2418877570dc 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -258,7 +258,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo"
// So we append ("E-mail" varchar) to the last of it to make it work
{
- return parseSql(sql + OUString( "(""E-mail"" character)"),sal_True);
+ return parseSql(sql + "(""E-mail"" character)", sal_True);
}
getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 029d9e39be67..71a01493d659 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -56,7 +56,7 @@ namespace
aSecurity.getHomeDir( aConfigPath );
#endif
- return aConfigPath + OUString("/");
+ return aConfigPath + "/";
}
// -------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index 90ee347294dd..a84181909cbc 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -72,7 +72,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
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;
if ( !sPassword.isEmpty() )
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 54f745c29760..fc817d66bbee 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5362,7 +5362,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
OUString aSourcePath( rPaths[0] );
if ( rPaths[0].lastIndexOf( '/' ) != rPaths[0].getLength() -1 )
- aSourcePath = rPaths[0] + OUString("/" );
+ aSourcePath = rPaths[0] + "/";
for ( sal_Int32 i = 1; i < rPaths.getLength(); ++i )
{
@@ -5414,7 +5414,7 @@ void SvxIconSelectorDialog::ImportGraphics(
OUString newLine("\n");
OUString fPath;
if (rejectedCount > 1)
- fPath = rPaths[0].copy(8) + OUString("/" );
+ fPath = rPaths[0].copy(8) + "/";
for ( sal_Int32 i = 0; i < rejectedCount; ++i )
{
message += fPath + rejected[i];
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 7e705ae668aa..cbd9b18b1bae 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1587,7 +1587,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv
Reference<XContent> xContent(xContainer,UNO_QUERY);
if ( xContent.is() )
{
- sName = xContent->getIdentifier()->getContentIdentifier() + OUString("/") + sName;
+ sName = xContent->getIdentifier()->getContentIdentifier() + "/" + sName;
}
}
break;
@@ -1631,7 +1631,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE
Reference<XContent> xContent(xContainer,UNO_QUERY);
if ( xContent.is() )
{
- sName = xContent->getIdentifier()->getContentIdentifier() + OUString("/") + sName;
+ sName = xContent->getIdentifier()->getContentIdentifier() + "/" + sName;
}
}
break;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 202071992a60..39c1594b2711 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -316,7 +316,7 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
{
Reference<XContent> xContent(xChild->getParent(),UNO_QUERY);
if ( xContent.is() )
- sOldName = xContent->getIdentifier()->getContentIdentifier() + OUString("/") + sOldName;
+ sOldName = xContent->getIdentifier()->getContentIdentifier() + "/" + sOldName;
}
getContainer()->elementReplaced( eType , sOldName, sNewName );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 1366981564de..012096da1471 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -334,7 +334,7 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _
SvTreeListEntry* pParent = rTree.GetParent(pEntry);
while(pParent)
{
- sName = rTree.GetEntryText(pParent) + OUString("/") + sName;
+ sName = rTree.GetEntryText(pParent) + "/" + sName;
pParent = rTree.GetParent(pParent);
}
_rNames.push_back(sName);
@@ -472,7 +472,7 @@ OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) cons
SvTreeListEntry* pParent = rTree.GetParent(pEntry);
while(pParent)
{
- sComposedName = rTree.GetEntryText(pParent) + OUString("/") + sComposedName;
+ sComposedName = rTree.GetEntryText(pParent) + "/" + sComposedName;
pParent = rTree.GetParent(pParent);
}
}
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d728f25b39d1..053fa5c63acd 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -162,9 +162,9 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
try
{
- const OUString sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + OUString("."));
+ const OUString sSourceName = ::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ".";
const OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
- const OUString sTargetNameTemp = (sTargetName + OUString("."));
+ const OUString sTargetNameTemp = sTargetName + ".";
OUString sStatement = "SELECT * FROM " + sTargetName + " WHERE 0=1";
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index fcf8732a4cb2..d5e87567cea7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1656,22 +1656,22 @@ namespace
case SQL_NODE_LESS:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(">");
+ aCondition += ">";
break;
case SQL_NODE_LESSEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(">=");
+ aCondition += ">=";
break;
case SQL_NODE_GREAT:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString("<");
+ aCondition += "<";
break;
case SQL_NODE_GREATEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString("<=");
+ aCondition += "<=";
break;
default:
break;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index dd10ae00dfad..0ced6a11257c 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -625,7 +625,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
if ( !pEntry->m_sErrorText.isEmpty() )
{
if ( pEntry->m_bActive )
- sDescription = pEntry->m_sErrorText + OUString("\n") + pEntry->m_sDescription;
+ sDescription = pEntry->m_sErrorText + "\n" + pEntry->m_sDescription;
else
sDescription = pEntry->m_sErrorText;
}
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 974515f3822f..03e5743ee1b0 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -259,7 +259,7 @@ sal_Bool MigrationImpl::doMigration()
continue;
uno::Sequence< uno::Any > lArgs(2);
- OUString aOldCfgDataPath = m_aInfo.userdata + OUString("/user/config/soffice.cfg/modules/");
+ OUString aOldCfgDataPath = m_aInfo.userdata + "/user/config/soffice.cfg/modules/";
lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName;
lArgs[1] <<= embed::ElementModes::READ;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index e268c0e23a14..dd35330a2c8f 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -369,9 +369,9 @@ void CommandEnvironmentImpl::update_( Any const & Status )
}
if (bUseErr)
- dp_misc::writeConsoleError(msg + OUString("\n"));
+ dp_misc::writeConsoleError(msg + "\n");
else
- dp_misc::writeConsole(msg + OUString("\n"));
+ dp_misc::writeConsole(msg + "\n");
}
//______________________________________________________________________________
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 015a77f89178..1e95d92803b6 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -72,7 +72,7 @@ OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
{
- return m_MediaType + OUString("/") + m_MediaSubtype;
+ return m_MediaType + "/" + m_MediaSubtype;
}
//------------------------------------------------------------------------
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 198414a3a634..f0f7ce1d6070 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -199,7 +199,7 @@ OUString UpdateCheckConfig::getDesktopDirectory()
// This should become a desktop specific setting in some system backend ..
OUString aHomeDir;
osl::Security().getHomeDir( aHomeDir );
- aRet = aHomeDir + OUString("/Desktop");
+ aRet = aHomeDir + "/Desktop";
// Set path to home directory when there is no /Desktop directory
osl::Directory aDocumentsDir( aRet );
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index e26591c98676..043322ddb14f 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -217,14 +217,14 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
OUString aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+ OUString::createFromAscii(szWNTLicenseName)
- + OUString("_")
+ + "_"
+ aLangString
+ OUString::createFromAscii(szWNTLicenseExt);
#else
OUString aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+ OUString::createFromAscii(szUNXLicenseName)
- + OUString("_")
+ + "_"
+ aLangString
+ OUString::createFromAscii(szUNXLicenseExt);
#endif
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 28833be49db9..9333aeb78455 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -125,11 +125,11 @@ bool HelpIndexer::helpDocument(OUString const & fileName, Document *doc) {
rtl_UriCharClassUric, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8);
// Add the caption as a field.
- OUString captionPath = d_captionDir + OUString("/") + sEscapedFileName;
+ OUString captionPath = d_captionDir + "/" + sEscapedFileName;
doc->add(*_CLNEW Field(_T("caption"), helpFileReader(captionPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
// Add the content as a field.
- OUString contentPath = d_contentDir + OUString("/") + sEscapedFileName;
+ OUString contentPath = d_contentDir + "/" + sEscapedFileName;
doc->add(*_CLNEW Field(_T("content"), helpFileReader(contentPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
return true;
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index e17079a4dec6..d7ca9ffde780 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -230,8 +230,7 @@ OUString findPlugin(
}
OUString retVal;
OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + OUString("/")
- + plugin;
+ sUrl = sProgDir + "/" + plugin;
jfw::FileStatus s = checkFileURL(sUrl);
if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
{
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index 6caccde4578f..ba330478fed6 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -35,7 +35,7 @@ namespace mysqlc_sdbc_driver
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": feature not implemented." );
+ const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + ": feature not implemented.";
throw SQLException(
sMessage,
_rxContext,
@@ -49,7 +49,7 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": invalid arguments." );
+ const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + ": invalid arguments.";
throw SQLException(
sMessage,
_rxContext,
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index f9554944b7b7..65e4d51ffa44 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
}
break;
case XML_TOK_PAGE_NUMBER:
- m_sText += s_sStringConcat + OUString(" PageNumber()");
+ m_sText += s_sStringConcat + " PageNumber()";
break;
case XML_TOK_PAGE_COUNT:
- m_sText += s_sStringConcat + OUString(" PageCount()");
+ m_sText += s_sStringConcat + " PageCount()";
break;
case XML_TOK_FORMATTED_TEXT:
{
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index c2c9a0326045..c61afd807798 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1572,7 +1572,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0")));
OUString sCountName = sFunction + "_count_" + sExpression;
xCountFunction->setName(sCountName);
- xCountFunction->setFormula(OUString("rpt:[") + sCountName + OUString("] + 1"));
+ xCountFunction->setFormula( "rpt:[" + sCountName + "] + 1" );
exportFunction(xCountFunction);
sExpression = sCountName;
// The reference to sCountName in the formula of sFunctionName refers to the *old* value
@@ -1587,7 +1587,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
;
}
if ( sFunctionName.isEmpty() )
- sFunctionName = sFunction + OUString("_") + sExpression;
+ sFunctionName = sFunction + "_" + sExpression;
if ( !sFunction.isEmpty() )
{
sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'};
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index ba3bab90cb01..e0197fe25f74 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
0x0020, sal_True );
break;
case XML_TOK_PAGE_NUMBER:
- m_sPageText += s_sStringConcat + OUString(" PageNumber()");
+ m_sPageText += s_sStringConcat + " PageNumber()";
m_bFormattedField = true;
break;
case XML_TOK_PAGE_COUNT:
- m_sPageText += s_sStringConcat + OUString(" PageCount()");
+ m_sPageText += s_sStringConcat + " PageCount()";
m_bFormattedField = true;
break;
default:
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 1ab4f298772f..bfc6d9f73873 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -131,9 +131,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin
// -----------------------------------------------------------------------------
OUString lcl_getQuotedFunctionName(const OUString& _sFunction)
{
- OUString sQuotedFunctionName("[");
- sQuotedFunctionName += _sFunction + OUString("]");
- return sQuotedFunctionName;
+ return "[" + _sFunction + "]";
}
// -----------------------------------------------------------------------------
OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction)
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index d7341e4336c2..11ce5ecaa06b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -4412,9 +4412,9 @@ namespace osl_File
//create directory $TEMP/tmpname/tmpdir
createTestDirectory( aTmpName8 );
//move directory $TEMP/tmpname to $TEMP/tmpname/tmpdir/tmpname
- rtl::OUString newName = aTmpName8 + OUString("/tmpname");
+ rtl::OUString newName = aTmpName8 + "/tmpname";
nError1 = ::osl::File::move( aTmpName3, newName );
- //deleteTestDirectory( newName + OUString("/tmpname") );
+ //deleteTestDirectory( newName + "/tmpname" );
//deleteTestDirectory( newName );
deleteTestDirectory( aTmpName8 );
deleteTestDirectory( aTmpName6 );
@@ -5899,7 +5899,7 @@ namespace osl_Directory
osl_setFileAttributes(aTmpDir.pData, 0); //no access allowed now
//Shouldn't be possible now to create a dir underneath it
- rtl::OUString aTmpSubLevel = aTmpDir + OUString("/notallowedhere");
+ rtl::OUString aTmpSubLevel = aTmpDir + "/notallowedhere";
nError1 = ::osl::Directory::create(aTmpSubLevel);
//allow removal
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index eefb7f60e2a8..93d8010a3886 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -47,7 +47,7 @@ void OptionString::InitViewData(
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
- OUString aDesc = maDesc + OUString(": ");
+ OUString aDesc = maDesc + ": ";
Size aDescSize(pView->GetTextWidth(aDesc), pView->GetTextHeight());
Font aOldFont = pView->GetFont();
@@ -66,7 +66,7 @@ void OptionString::InitViewData(
void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
{
Point aPos = rPos;
- OUString aDesc = maDesc + OUString(": ");
+ OUString aDesc = maDesc + ": ";
rDev.DrawText(aPos, aDesc);
aPos.X() += rDev.GetTextWidth(aDesc);
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 1e5fae0b47c1..103268990ea1 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -31,12 +31,12 @@ using namespace ::com::sun::star::presentation;
namespace sdext { namespace presenter {
const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/");
-const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + OUString("CenterPane"));
-const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + OUString("FullScreenPane"));
+const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
+const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
const OUString PresenterHelper::msViewURLPrefix( "private:resource/view/");
-const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + OUString("PresenterScreen"));
-const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + OUString("SlideSorter"));
+const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + "PresenterScreen");
+const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
const OUString PresenterHelper::msResourceActivationEvent( "ResourceActivation");
const OUString PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation");
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 9f9d50dd6e12..9c431434f15b 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1843,7 +1843,7 @@ void UCBStorage_Impl::ReadContent()
else if ( bIsOfficeDocument )
{
// streams can be external OLE objects, so they are now folders, but storages!
- OUString aName( m_aURL + OUString("/") + xRow->getString(1));
+ OUString aName( m_aURL + "/" + xRow->getString(1));
Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
if ( m_bRepairPackage )
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index d6e5dbed98dd..cf41a8d5327d 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -987,7 +987,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
if ( lastIndex == 0 )
resolvedName = m_name + aLinkName;
else
- resolvedName = m_name + OUString( "/" ) + aLinkName;
+ resolvedName = m_name + "/" + aLinkName;
}
if ( m_localKey.is() && m_localKey->isValid() )
@@ -1043,7 +1043,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
if ( lastIndex == 0 )
resolvedName = m_name + rLinkName;
else
- resolvedName = m_name + OUString( "/" ) + rLinkName;
+ resolvedName = m_name + "/" + rLinkName;
}
if ( m_localKey.is() && m_localKey->isValid() &&
@@ -1089,7 +1089,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
if ( lastIndex == 0 )
resolvedName = m_name + rLinkName;
else
- resolvedName = m_name + OUString( "/" ) + rLinkName;
+ resolvedName = m_name + "/" + rLinkName;
}
OUString linkTarget;
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 0f9ce337503d..66626a8eb9c4 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -640,7 +640,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
OUString linkTarget = xKey->getLinkTarget(relativKey);
OUString linkName(xKey->getKeyName().copy(xUnoKey->getKeyName().getLength()));
- linkName = linkName + OUString("/") + relativKey;
+ linkName = linkName + "/" + relativKey;
if (bRegister)
{
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index b1cbf953b77c..735cabfee01b 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -466,9 +466,9 @@ void getJavaPropsFromSafetySettings(
sal_Bool val= (sal_Bool) key_CheckSecurity->getLongValue();
OUString sProperty("stardiv.security.disableSecurity=");
if( val)
- sProperty= sProperty + OUString("false");
+ sProperty= sProperty + "false";
else
- sProperty= sProperty + OUString("true");
+ sProperty= sProperty + "true";
pjvm->pushProp( sProperty);
}
}
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index a9a68f89397d..89c884c97bc6 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -969,7 +969,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
{
OUString aStr;
aPropVal >>= aStr;
- aStr = aStr + OUString(" (Modified!)");
+ aStr += " (Modified!)";
aNewVal <<= aStr;
break;
}
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index bb6129878da8..10c69742dc39 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -129,7 +129,7 @@ void ODocumentInfoPreview::insertEntry(
if (!m_pEditWin.GetText().isEmpty()) {
m_pEditWin.InsertText(OUString("\n\n"));
}
- OUString caption(title + OUString(":\n"));
+ OUString caption(title + ":\n");
m_pEditWin.InsertText(caption);
m_pEditWin.SetAttrib(
TextAttribFontWeight(WEIGHT_BOLD), m_pEditWin.GetParagraphCount() - 2,
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index d3542881633e..285403bdf72d 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -762,7 +762,7 @@ namespace svt
if ( mpID )
{
- OUString aIDText = OUString::number( ( _nIndex + 1 ) ) + OUString( "." );
+ OUString aIDText = OUString::number( _nIndex + 1 ) + ".";
mpID->SetText( aIDText );
}
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 8e9b05349646..739adbf273e3 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -105,7 +105,7 @@ void SvxSmartTagsControl::FillMenu()
pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
// sub-menu starts with smart tag caption and separator
- const OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText;
+ const OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText;
nSubMenuPos = 0;
pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++);
pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 62be5df055ea..8196d4811b7b 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -544,7 +544,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet)
// get Productname and -version
OUString sWithoutVersion( utl::ConfigManager::getProductName() );
OUString sComplete(
- sWithoutVersion + OUString(" ") +
+ sWithoutVersion + " " +
utl::ConfigManager::getProductVersion() );
SvObjectServerList aObjS;
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index bc224b7878c0..701fe1d55a82 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -81,7 +81,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
: SfxStyleDialog(pParent,
OString("TemplateDialog") + OString::number(nRegion),
OUString("modules/swriter/ui/templatedialog") +
- OUString::number(nRegion) + OUString(".ui"),
+ OUString::number(nRegion) + ".ui",
rBase)
, nType(nRegion)
, pWrtShell(pActShell)
diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index c0f26d8aac17..b842cd2ce9c8 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -149,7 +149,7 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
{
// string type
OUString aOld = any.get<OUString>();
- OUString aNew = aOld + OUString("foo");
+ OUString aNew = aOld + "foo";
xPropSet->setPropertyValue(rName, makeAny(aNew));
}
else if (type == getCppuType<util::DateTime>())
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 988d9bd3172d..4fd1e789138a 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -93,7 +93,7 @@ void test::BootstrapFixtureBase::setUp()
{
// set UserInstallation to user profile dir in test/user-template
rtl::Bootstrap aDefaultVars;
- OUString sUserInstallURL = m_aWorkdirRootURL + OUString("/unittest");
+ OUString sUserInstallURL = m_aWorkdirRootURL + "/unittest";
aDefaultVars.set(OUString("UserInstallation"), sUserInstallURL);
m_xContext = comphelper::getProcessComponentContext();
diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx
index 9d38a09b91d9..3b613f338aa1 100644
--- a/unotest/source/cpp/filters-test.cxx
+++ b/unotest/source/cpp/filters-test.cxx
@@ -130,13 +130,13 @@ void FiltersTest::testDir(const OUString &rFilter,
{
fprintf(stderr, "File tested,Test Result,Execution Time (ms)\n");
recursiveScan(test::pass, rFilter,
- rURL + OUString("pass"),
+ rURL + "pass",
rUserData, nFilterFlags, nClipboardID, nFilterVersion);
recursiveScan(test::fail, rFilter,
- rURL + OUString("fail"),
+ rURL + "fail",
rUserData, nFilterFlags, nClipboardID, nFilterVersion);
recursiveScan(test::indeterminate, rFilter,
- rURL + OUString("indeterminate"),
+ rURL + "indeterminate",
rUserData, nFilterFlags, nClipboardID, nFilterVersion);
}
diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx
index 6193c9814f70..1935c4b26459 100644
--- a/unotest/source/cpp/toabsolutefileurl.cxx
+++ b/unotest/source/cpp/toabsolutefileurl.cxx
@@ -45,7 +45,7 @@ OUString toAbsoluteFileUrl(OUString const & relativePathname) {
throw css::uno::RuntimeException(
(OUString("osl::FileBase::getFileURLFromSystemPath(") +
relativePathname +
- OUString(") failed with ") +
+ ") failed with " +
OUString::number(e2)),
css::uno::Reference< css::uno::XInterface >());
}
@@ -54,8 +54,8 @@ OUString toAbsoluteFileUrl(OUString const & relativePathname) {
if (e2 != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
(OUString("osl::FileBase::getAbsoluteFileURL(") +
- cwd + OUString(", ") + url +
- OUString(") failed with ") +
+ cwd + ", " + url +
+ ") failed with " +
OUString::number(e2)),
css::uno::Reference< css::uno::XInterface >());
}
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 9bc6e5fde37c..3fcfc8f2b846 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -174,8 +174,8 @@ void GlobalEventConfig_Impl::Commit()
ClearNodeSet( SETNODE_BINDINGS );
Sequence< beans::PropertyValue > seqValues( 1 );
OUString sNode;
- static const OUString sPrefix(SETNODE_BINDINGS + PATHDELIMITER + OUString("BindingType['"));
- static const OUString sPostfix(OUString("']") + PATHDELIMITER + PROPERTYNAME_BINDINGURL);
+ static const OUString sPrefix(SETNODE_BINDINGS + PATHDELIMITER + "BindingType['");
+ static const OUString sPostfix("']" + PATHDELIMITER + PROPERTYNAME_BINDINGURL);
//step through the list of events
for(int i=0;it!=it_end;++it,++i)
{
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index a23c3bd41cef..96c043a9ff7f 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -124,7 +124,7 @@ getLocalizedDatTimeStr(
= pNumberFormatter->GetStandardFormat( NUMBERFORMAT_DATE, eUILang );
pNumberFormatter->GetOutputString( aDate - *pNullDate, nFormat, aTmpStr, &pColor );
- aDateTimeStr = aTmpStr + OUString(" ");
+ aDateTimeStr = aTmpStr + " ";
nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang );
pNumberFormatter->GetOutputString(
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 287f545c6bfb..131c6515f961 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -99,7 +99,7 @@ PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension)
osl::File::RC nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
if (nError != osl::File::E_None)
return NULL;
- aFileURL = maSpoolDirName + OUString("/") + aFileURL;
+ aFileURL = maSpoolDirName + "/" + aFileURL;
pFile = new osl::File (aFileURL);
nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
@@ -587,7 +587,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
InitPaperSize (rJobSetup);
OUString aPageNo = OUString::number ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
- OUString aExt = aPageNo + OUString(".ps");
+ OUString aExt = aPageNo + ".ps";
osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt);
osl::File* pPageBody = CreateSpoolFile ( OUString("psp_pgbody"), aExt);
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index a990f1fe1cc0..dbf371d673a3 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -768,7 +768,7 @@ void UnxFilePicker::sendCommand( const OUString &rCommand )
if ( m_nFilePickerWrite < 0 )
return;
- OString aUtfString = OUStringToOString( rCommand + OUString( "\n" ), RTL_TEXTENCODING_UTF8 );
+ OString aUtfString = OUStringToOString( rCommand + "\n", RTL_TEXTENCODING_UTF8 );
#if OSL_DEBUG_LEVEL > 0
::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index ed30a7dfd4e6..df174a4b6b63 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -132,13 +132,13 @@ Databases::Databases( sal_Bool showBasic,
m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ),
m_aCSS(styleSheet.toAsciiLowerCase()),
- newProdName(OUString( "$[officename]" ) ),
- newProdVersion(OUString( "$[officeversion]" ) ),
- prodName( OUString( "%PRODUCTNAME" ) ),
- prodVersion( OUString( "%PRODUCTVERSION" ) ),
- vendName( OUString( "%VENDORNAME" ) ),
- vendVersion( OUString( "%VENDORVERSION" ) ),
- vendShort( OUString( "%VENDORSHORT" ) ),
+ newProdName( "$[officename]" ),
+ newProdVersion( "$[officeversion]" ),
+ prodName( "%PRODUCTNAME" ),
+ prodVersion( "%PRODUCTVERSION" ),
+ vendName( "%VENDORNAME" ),
+ vendVersion( "%VENDORVERSION" ),
+ vendShort( "%VENDORSHORT" ),
m_aImagesZipPaths( imagesZipPaths ),
m_aSymbolsStyleName( "" )
{
@@ -434,7 +434,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
{
osl::MutexGuard aGuard( m_aMutex );
- OUString key = processLang(Language) + OUString( "/" ) + Module;
+ OUString key = processLang(Language) + "/" + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) );
@@ -443,9 +443,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
if( aPair.second && ! it->second )
{
- osl::File cfgFile( getInstallPathAsURL() +
- key +
- OUString( ".cfg" ) );
+ osl::File cfgFile( getInstallPathAsURL() + key + ".cfg" );
if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) )
it->second = 0;
@@ -836,7 +834,7 @@ KeywordInfo* Databases::getKeyword( const OUString& Database,
{
osl::MutexGuard aGuard( m_aMutex );
- OUString key = processLang(Language) + OUString( "/" ) + Database;
+ OUString key = processLang(Language) + "/" + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) );
@@ -1113,14 +1111,14 @@ void Databases::cascadingStylesheet( const OUString& Language,
fileURL =
getInstallPathAsURL() +
processLang( Language ) +
- OUString( "/" ) +
+ "/" +
aCSS +
- OUString( ".css" );
+ ".css";
else if( retry == 1 )
fileURL =
getInstallPathAsURL() +
aCSS +
- OUString( ".css" );
+ ".css";
osl::DirectoryItem aDirItem;
osl::File aFile( fileURL );
@@ -1889,7 +1887,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
bool bIsWriteAccess = false;
try
{
- OUString aCreateTestFolder = aLangURL + OUString( "CreateTestFolder" );
+ OUString aCreateTestFolder = aLangURL + "CreateTestFolder";
m_xSFA->createFolder( aCreateTestFolder );
if( m_xSFA->isFolder( aCreateTestFolder ) )
bIsWriteAccess = true;
@@ -1942,7 +1940,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
if( bIsWriteAccess )
aIndexFolder = implGetFileFromPackage( OUString( ".idxl" ), xPackage );
else
- aIndexFolder = aZipDir + OUString( "/help.idxl" );
+ aIndexFolder = aZipDir + "/help.idxl";
}
catch (const Exception &)
{
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 0acae63d9ed9..5a73ba1f6a6d 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -262,7 +262,7 @@ OUString URLParameter::get_the_jar()
return m_aJar;
}
else
- return get_module() + OUString(".jar");
+ return get_module() + ".jar";
}
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index 41defc66b4d9..df4af5a4fc2a 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -67,7 +67,7 @@ Reference< XComponentContext > createInitialComponentContext(
inst_dir.pData, &file_url.pData );
OSL_ASSERT( osl_File_E_None == rc );
- OUString unorc = file_url + OUString("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") );
+ OUString unorc = file_url + ("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") );
return defaultBootstrap_InitialComponentContext( unorc );
}
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 7f00a7f80561..1134c864fbc1 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -915,14 +915,14 @@ void XSecController::exportSignature(
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
OUString(ATTR_XMLNS)
- +OUString(":")
- +OUString(NSTAG_DC),
+ + ":"
+ + OUString(NSTAG_DC),
OUString(NS_DC));
xDocumentHandler->startElement(
OUString(NSTAG_DC)
- +OUString(":")
- +tag_Date,
+ + ":"
+ + tag_Date,
cssu::Reference< cssxs::XAttributeList > (pAttributeList));
OUStringBuffer buffer;
@@ -940,8 +940,8 @@ void XSecController::exportSignature(
xDocumentHandler->endElement(
OUString(NSTAG_DC)
- +OUString(":")
- +tag_Date);
+ + ":"
+ + tag_Date);
}
xDocumentHandler->endElement( tag_SignatureProperty );
}