[Libreoffice-commits] core.git: 4 commits - canvas/source connectivity/source cui/source dbaccess/source desktop/source dtrans/source extensions/source framework/source helpcompiler/source jvmfwk/source mysqlc/source reportdesign/source sal/qa sc/qa scripting/source sc/source sdext/source sfx2/source sot/source starmath/source stoc/source stoc/test svl/source svtools/source svx/source svx/workben sw/qa sw/source test/source tools/source ucb/source unotest/source unotools/source uui/source vcl/generic vcl/source vcl/unx xmlhelp/source xmloff/source xmlscript/test xmlsecurity/source
Noel Grandin
noel at peralex.com
Tue Dec 17 01:57:28 PST 2013
canvas/source/vcl/spritedevicehelper.cxx | 2
connectivity/source/commontools/FValue.cxx | 2
connectivity/source/commontools/TIndexes.cxx | 6 -
connectivity/source/commontools/TTableHelper.cxx | 2
connectivity/source/commontools/dbtools2.cxx | 25 +++----
connectivity/source/commontools/formattedcolumnvalue.cxx | 2
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/drivers/ado/AStatement.cxx | 2
connectivity/source/drivers/macab/MacabRecords.cxx | 14 ++--
connectivity/source/drivers/mork/MConnection.cxx | 4 -
connectivity/source/drivers/mork/MNSFolders.cxx | 2
connectivity/source/drivers/mork/MStatement.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4 -
connectivity/source/drivers/mysql/YUsers.cxx | 2
connectivity/source/parse/sqlnode.cxx | 4 -
cui/source/customize/cfg.cxx | 4 -
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 4 -
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 -
dbaccess/source/ui/misc/WCopyTable.cxx | 4 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 18 ++---
desktop/source/app/appinit.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/migration/migration.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4 -
dtrans/source/cnttype/mcnttype.cxx | 2
extensions/source/update/check/updatecheckconfig.cxx | 2
framework/source/services/license.cxx | 4 -
helpcompiler/source/HelpIndexer.cxx | 4 -
jvmfwk/source/fwkutil.cxx | 3
mysqlc/source/mysqlc_general.cxx | 4 -
reportdesign/source/filter/xml/xmlCell.cxx | 4 -
reportdesign/source/filter/xml/xmlExport.cxx | 4 -
reportdesign/source/filter/xml/xmlFixedContent.cxx | 4 -
reportdesign/source/ui/dlg/Navigator.cxx | 4 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 4 -
sal/qa/osl/file/osl_File.cxx | 6 -
sc/qa/unit/helper/qahelper.cxx | 4 -
sc/source/core/tool/charthelper.cxx | 2
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 4 -
sc/source/ui/app/inputwin.cxx | 4 -
sc/source/ui/condformat/condformatdlg.cxx | 2
sc/source/ui/condformat/condformathelper.cxx | 8 +-
sc/source/ui/navipi/content.cxx | 4 -
sc/source/ui/optdlg/calcoptionsdlg.cxx | 4 -
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/vba/vbahelper.cxx | 4 -
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
scripting/source/provider/URIHelper.cxx | 2
sdext/source/minimizer/optimizerdialogcontrols.cxx | 2
sdext/source/minimizer/pppoptimizerdialog.cxx | 6 -
sdext/source/pdfimport/test/tests.cxx | 2
sdext/source/presenter/PresenterHelper.cxx | 8 +-
sfx2/source/inet/inettbc.cxx | 2
sfx2/source/menu/mnuitem.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 2
starmath/source/cfgitem.cxx | 8 +-
starmath/source/mathmlexport.cxx | 2
stoc/source/defaultregistry/defaultregistry.cxx | 6 -
stoc/source/implementationregistration/implreg.cxx | 2
stoc/source/javavm/javavm.cxx | 4 -
stoc/source/namingservice/namingservice.cxx | 4 -
stoc/test/testintrosp.cxx | 2
svl/source/numbers/zforlist.cxx | 16 ++---
svtools/source/contnr/DocumentInfoPreview.cxx | 2
svtools/source/control/roadmap.cxx | 2
svtools/source/filter/exportdialog.cxx | 4 -
svx/source/mnuctrls/SmartTagCtl.cxx | 2
svx/workben/msview/xmlconfig.cxx | 2
sw/qa/core/macros-test.cxx | 2
sw/source/ui/config/optload.cxx | 2
sw/source/ui/fldui/flddb.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/lingu/olmenu.cxx | 2
test/source/beans/xpropertyset.cxx | 2
tools/source/fsys/urlobj.cxx | 2
ucb/source/ucp/ftp/ftpurl.cxx | 3
unotest/source/cpp/bootstrapfixturebase.cxx | 2
unotest/source/cpp/filters-test.cxx | 6 -
unotest/source/cpp/toabsolutefileurl.cxx | 6 -
unotools/source/config/eventcfg.cxx | 4 -
uui/source/iahndl-ssl.cxx | 2
vcl/generic/print/printerjob.cxx | 4 -
vcl/source/filter/FilterConfigItem.cxx | 2
vcl/unx/kde/UnxFilePicker.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 32 ++++------
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2
xmloff/source/core/unoatrcn.cxx | 2
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/draw/ximpstyl.cxx | 6 -
xmloff/source/transform/TransformerBase.cxx | 2
xmlscript/test/imexp.cxx | 2
xmlsecurity/source/helper/xsecctl.cxx | 12 +--
100 files changed, 199 insertions(+), 208 deletions(-)
New commits:
commit 2ac31b06ae4895fe5d9be51403774a96b89919af
Author: Noel Grandin <noel at peralex.com>
Date: Fri Dec 13 11:24:35 2013 +0200
Unnecessary use of OUString constructor inside OUStringBuffer constructor
Convert code like:
OUStringBuffer sVal(OUString("0x"));
to:
OUStringBuffer sVal("0x");
Change-Id: Idc5a3f6a8bf1dc33f93c2b488f866c8ea58d582a
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index f39299b..4d176be 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1011,7 +1011,7 @@ OUString ORowSetValue::getString( ) const
case DataType::VARBINARY:
case DataType::LONGVARBINARY:
{
- OUStringBuffer sVal(OUString("0x"));
+ OUStringBuffer sVal("0x");
Sequence<sal_Int8> aSeq(getSequence());
const sal_Int8* pBegin = aSeq.getConstArray();
const sal_Int8* pEnd = pBegin + aSeq.getLength();
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index f9aa564..41e8652 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -136,7 +136,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
else
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
- OUStringBuffer aSql( OUString("CREATE "));
+ OUStringBuffer aSql( "CREATE " );
OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( );
OUString aDot( "." );
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 59f7349..56fd92d 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -206,7 +206,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern)
{
- OUStringBuffer aSql(OUString("CREATE TABLE "));
+ OUStringBuffer aSql("CREATE TABLE ");
OUString sCatalog,sSchema,sTable,sComposedName;
Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index bce8331..2e02ef5 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -750,7 +750,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
OUStringBuffer aSql( "INSERT INTO " + m_aComposedTableName + " ( ");
// set values and column names
- OUStringBuffer aValues(OUString(" VALUES ( "));
+ OUStringBuffer aValues(" VALUES ( ");
static OUString aPara("?,");
OUString aQuote = getIdentifierQuoteString();
static OUString aComma(",");
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b0c984e..4d8bc17 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2880,7 +2880,7 @@ OUString OQueryDesignView::getStatement()
aCriteriaListStr = aTmp;
}
// ----------------- construct statement ----------------------
- OUStringBuffer aSqlCmd(OUString("SELECT "));
+ OUStringBuffer aSqlCmd("SELECT ");
if(rController.isDistinct())
aSqlCmd.append(" DISTINCT ");
aSqlCmd.append(aFieldListStr);
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 3309449..01b2ca6 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -705,7 +705,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
nScTab = rDoc.GetTableCount();
rDoc.MakeTable( nScTab );
- OUStringBuffer aDummyName(OUString("DPCache"));
+ OUStringBuffer aDummyName("DPCache");
if( maTabName.getLength() > 0 )
aDummyName.append( '_' ).append( maTabName );
OUString aName = aDummyName.makeStringAndClear();
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index f2c8fea..4e7fb50 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -951,7 +951,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue
{
sal_uInt16 nViewID(GetViewFrame()->GetCurViewId());
pSeq[0].Name = OUString(SC_VIEWID);
- OUStringBuffer sBuffer(OUString(SC_VIEW));
+ OUStringBuffer sBuffer(SC_VIEW);
::sax::Converter::convertNumber(sBuffer,
static_cast<sal_Int32>(nViewID));
pSeq[0].Value <<= sBuffer.makeStringAndClear();
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 9f74c84..7c91dfb 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2612,7 +2612,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
{
sal_uInt16 nViewID(pViewShell->GetViewFrame()->GetCurViewId());
pSettings[SC_VIEW_ID].Name = OUString(SC_VIEWID);
- OUStringBuffer sBuffer(OUString(SC_VIEW));
+ OUStringBuffer sBuffer(SC_VIEW);
::sax::Converter::convertNumber(sBuffer,
static_cast<sal_Int32>(nViewID));
pSettings[SC_VIEW_ID].Value <<= sBuffer.makeStringAndClear();
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 64aac3e..aa97878 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -142,7 +142,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
if ( nFileSizeSource && nFileSizeDest )
{
- OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") );
+ OUStringBuffer sBuf( "Your Presentation has been minimized from:" );
sBuf.append( OUString::number( nFileSizeSource >> 10 ) );
sBuf.append( "KB to " );
sBuf.append( OUString::number( nFileSizeDest >> 10 ) );
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index f99885b..c5582a1 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -131,7 +131,7 @@ void SwMacrosTest::testVba()
OUString aFileName;
createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
- OUStringBuffer sMsg( OUString("Failed to load ") );
+ OUStringBuffer sMsg( "Failed to load " );
sMsg.append ( aFileName );
CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 99f0eeb..441770d 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4661,7 +4661,7 @@ bool INetURLObject::setFSysPath(OUString const & rFSysPath,
break;
}
- OUStringBuffer aSynAbsURIRef(OUString("file://"));
+ OUStringBuffer aSynAbsURIRef("file://");
switch (eStyle)
{
commit 8548abbac5139569818516ca198c8086f4d1fd1f
Author: Noel Grandin <noel at peralex.com>
Date: Fri Dec 13 11:10:10 2013 +0200
Remove unnecessary use of OUString constructor in OUStringBuffer::append calls
Convert code like
aStrBuffer.append(OUString(" AS "));
to
aStrBuffer.append(" AS ");
Change-Id: I8c1884b5a875f40f0b5e511b6ef38c6c8eeee656
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index e208813..59f7349 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -156,7 +156,7 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const
OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
if ( !aDefault.isEmpty() )
{
- aSql.append(OUString(" DEFAULT "));
+ aSql.append(" DEFAULT ");
aSql.append(sPreFix);
aSql.append(aDefault);
aSql.append(sPostFix);
@@ -188,7 +188,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
aSql.append(createStandardTypePart(xColProp, _xConnection, _sCreatePattern));
if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
- aSql.append(OUString(" NOT NULL"));
+ aSql.append(" NOT NULL");
if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty())
{
@@ -221,7 +221,7 @@ OUString createStandardCreateStatement(const Reference< XPropertySet >& descript
::dbtools::throwFunctionSequenceException(_xConnection);
aSql.append(sComposedName);
- aSql.append(OUString(" ("));
+ aSql.append(" (");
// columns
Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -301,7 +301,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(OUString(" PRIMARY KEY "));
+ aSql.append(" PRIMARY KEY ");
aSql.append(generateColumnNames(xColumns,xMetaData));
}
else if(nKeyType == KeyType::UNIQUE)
@@ -311,7 +311,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(OUString(" UNIQUE "));
+ aSql.append(" UNIQUE ");
aSql.append(generateColumnNames(xColumns,xMetaData));
}
else if(nKeyType == KeyType::FOREIGN)
@@ -323,7 +323,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(OUString(" FOREIGN KEY "));
+ aSql.append(" FOREIGN KEY ");
OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
::dbtools::qualifiedNameComponents(xMetaData,
sRefTable,
@@ -342,16 +342,16 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
switch(nDeleteRule)
{
case KeyRule::CASCADE:
- aSql.append(OUString(" ON DELETE CASCADE "));
+ aSql.append(" ON DELETE CASCADE ");
break;
case KeyRule::RESTRICT:
- aSql.append(OUString(" ON DELETE RESTRICT "));
+ aSql.append(" ON DELETE RESTRICT ");
break;
case KeyRule::SET_NULL:
- aSql.append(OUString(" ON DELETE SET NULL "));
+ aSql.append(" ON DELETE SET NULL ");
break;
case KeyRule::SET_DEFAULT:
- aSql.append(OUString(" ON DELETE SET DEFAULT "));
+ aSql.append(" ON DELETE SET DEFAULT ");
break;
default:
;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c99585b..4f56f30 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -459,7 +459,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
if (nCount == 2)
{
if ( rParam.aMetaData.generateASBeforeCorrelationName() )
- rString.append(OUString(" AS "));
+ rString.append(" AS ");
m_aChildren[1]->impl_parseNodeToString_throw( rString, rParam, false );
}
bHandled = true;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index d5e8756..b0c984e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2882,14 +2882,14 @@ OUString OQueryDesignView::getStatement()
// ----------------- construct statement ----------------------
OUStringBuffer aSqlCmd(OUString("SELECT "));
if(rController.isDistinct())
- aSqlCmd.append(OUString(" DISTINCT "));
+ aSqlCmd.append(" DISTINCT ");
aSqlCmd.append(aFieldListStr);
- aSqlCmd.append(OUString(" FROM "));
+ aSqlCmd.append(" FROM ");
aSqlCmd.append(aTableListStr);
if (!aCriteriaListStr.isEmpty())
{
- aSqlCmd.append(OUString(" WHERE "));
+ aSqlCmd.append(" WHERE ");
aSqlCmd.append(aCriteriaListStr.makeStringAndClear());
}
Reference<XDatabaseMetaData> xMeta;
@@ -2903,7 +2903,7 @@ OUString OQueryDesignView::getStatement()
// ----------------- construct GroupBy and attachen ------------
if(!aHavingStr.isEmpty())
{
- aSqlCmd.append(OUString(" HAVING "));
+ aSqlCmd.append(" HAVING ");
aSqlCmd.append(aHavingStr.makeStringAndClear());
}
// ----------------- construct sorting and attach ------------
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 3be8f7a..9e5b9d6 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -89,7 +89,7 @@ OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY);
if ( xFixedText.is() )
{
- sName.append(OUString(" : "));
+ sName.append(" : ");
sName.append(xFixedText->getLabel());
}
else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) )
@@ -97,7 +97,7 @@ OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
ReportFormula aFormula( xReportModel->getDataField() );
if ( aFormula.isValid() )
{
- sName.append(OUString(" : "));
+ sName.append(" : ");
sName.append( aFormula.getUndecoratedContent() );
}
}
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 1378e72..7666c34 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -524,8 +524,8 @@ void ScBootstrapFixture::createFileURL(
void ScBootstrapFixture::createCSVPath(const OUString& aFileBase, OUString& rCSVPath)
{
OUStringBuffer aBuffer( getSrcRootPath());
- aBuffer.append(m_aBaseString).append(OUString("/contentCSV/"));
- aBuffer.append(aFileBase).append(OUString("csv"));
+ aBuffer.append(m_aBaseString).append("/contentCSV/");
+ aBuffer.append(aFileBase).append("csv");
rCSVPath = aBuffer.makeStringAndClear();
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index eadcd3b..d1b5af3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4248,14 +4248,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF));
break;
case SC_COND_BETWEEN:
- aCond.append(OUString("between("));
+ aCond.append("between(");
aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF));
aCond.append(',');
aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF));
aCond.append(')');
break;
case SC_COND_NOTBETWEEN:
- aCond.append(OUString("not-between("));
+ aCond.append("not-between(");
aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF));
aCond.append(',');
aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF));
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b32fb5d..0407276 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2107,9 +2107,9 @@ namespace {
OUString createLocalRangeName(const OUString& rName, const OUString& rTableName)
{
OUStringBuffer aString (rName);
- aString.append(OUString(" ("));
+ aString.append(" (");
aString.append(rTableName);
- aString.append(OUString(")"));
+ aString.append(")");
return aString.makeStringAndClear();
}
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 907c1b6..80c51b7 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -369,7 +369,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond
mpLastEdit(NULL)
{
OUStringBuffer aTitle( GetText() );
- aTitle.append(OUString(" "));
+ aTitle.append(" ");
OUString aRangeString;
rRange.Format(aRangeString, SCA_VALID, pDoc, pDoc->GetAddressConvention());
aTitle.append(aRangeString);
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index ad1c1cb..3d5f0f8 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -126,13 +126,13 @@ OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, c
else
{
aBuffer.append(getTextForType(CONDITION));
- aBuffer.append(OUString(" "));
+ aBuffer.append(" ");
aBuffer.append(getExpression(static_cast<sal_Int32>(eMode)));
- aBuffer.append(OUString(" "));
+ aBuffer.append(" ");
if(eMode == SC_COND_BETWEEN || eMode == SC_COND_NOTBETWEEN)
{
aBuffer.append(pEntry->GetExpression(rPos, 0));
- aBuffer.append(OUString(" and "));
+ aBuffer.append(" and ");
aBuffer.append(pEntry->GetExpression(rPos, 1));
}
else if(eMode <= SC_COND_NOTEQUAL || eMode >= SC_COND_BEGINS_WITH)
@@ -169,7 +169,7 @@ OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int
OUString aStr1, OUString aStr2 )
{
OUStringBuffer aBuffer(getTextForType(eType));
- aBuffer.append(OUString(" "));
+ aBuffer.append(" ");
if(eType == CONDITION)
{
// workaround missing FORMULA option in the conditions case
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index e8c11f5..b305e56 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -830,9 +830,9 @@ namespace {
OUString createLocalRangeName(const OUString& rName, const OUString& rTableName)
{
OUStringBuffer aString (rName);
- aString.append(OUString(" ("));
+ aString.append(" (");
aString.append(rTableName);
- aString.append(OUString(")"));
+ aString.append(")");
return aString.makeStringAndClear();
}
}
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index cc94e5a..fbe9542 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -597,11 +597,11 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike )
start++;
break;
case '*':
- sResult.append(OUString(".*"));
+ sResult.append(".*");
start++;
break;
case '#':
- sResult.append(OUString("[0-9]"));
+ sResult.append("[0-9]");
start++;
break;
case '~':
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 4d5a7a5..6b49525 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -246,7 +246,7 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI)
OUStringBuffer buf(120);
buf.append(m_sBaseURI);
- buf.append(OUString("/"));
+ buf.append("/");
buf.append(getLanguagePath(sLanguagePart));
OUString result = buf.makeStringAndClear();
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 3e5d95e..86aae05 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -597,7 +597,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
aVal.setLength( nX + 2 );
aVal[nX] = nSeparator;
}
- aVal.append( OUString(" MB") );
+ aVal.append( " MB" );
return aVal.makeStringAndClear();
}
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 1cfc874..64aac3e 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -144,9 +144,9 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
{
OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") );
sBuf.append( OUString::number( nFileSizeSource >> 10 ) );
- sBuf.append( OUString("KB to ") );
+ sBuf.append( "KB to " );
sBuf.append( OUString::number( nFileSizeDest >> 10 ) );
- sBuf.append( OUString("KB.") );
+ sBuf.append( "KB." );
OUString sResult( sBuf.makeStringAndClear() );
SAL_INFO("sdext.minimizer", sResult );
}
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index a1cb317..93c3a53 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -353,7 +353,7 @@ namespace
virtual void endText()
{
- m_aTextOut.append( OUString("\n") );
+ m_aTextOut.append( "\n" );
}
virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 6531d8d..7fb713d 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -993,7 +993,7 @@ void SmXMLExport::ExportBlank(const SmNode *pNode, int /*nLevel*/)
// (see SmBlankNode::IncreaseBy for how pTemp->nNum is set).
OUStringBuffer sStrBuf;
::sax::Converter::convertDouble(sStrBuf, pTemp->GetBlankNum() * .5);
- sStrBuf.append(OUString("em"));
+ sStrBuf.append("em");
AddAttribute(XML_NAMESPACE_MATH, XML_WIDTH, sStrBuf.getStr());
}
commit 909b27df488f3c84ab8e5be9a7513a83b7c4b0c1
Author: Noel Grandin <noel at peralex.com>
Date: Fri Dec 13 10:54:12 2013 +0200
remove unnecessary double calls to OUString constructor
Change-Id: Ib2690e3ec9987b97363687b61fe8ddae4ace9058
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ca012d1..e208813 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -248,7 +248,6 @@ namespace
OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData)
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
- static const OUString sComma(OUString(","));
const OUString sQuote(_xMetaData->getIdentifierQuoteString());
OUString sSql( " (" );
@@ -259,7 +258,7 @@ namespace
{
if ( (_xColumns->getByIndex(i) >>= xColProp) && xColProp.is() )
sSql += ::dbtools::quoteName(sQuote,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))))
- + sComma;
+ + ",";
}
if ( nColCount )
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 820c57e..5c89a71 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -156,7 +156,7 @@ namespace dbtools
// get the format key of our bound field
Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW );
bool bHaveFieldFormat = false;
- const OUString sFormatKeyProperty( OUString( "FormatKey" ) );
+ const OUString sFormatKeyProperty( "FormatKey" );
if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
{
bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey );
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 791a06b..f80bc1e 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -169,7 +169,7 @@ namespace dbtools
xComposer->setElementaryQuery( sStatement );
// the sort order
- const OUString sPropOrder( OUString( "Order" ) );
+ const OUString sPropOrder( "Order" );
if ( ::comphelper::hasProperty( sPropOrder, xQuery ) )
{
OUString sOrder;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index c4790a5..77a9020 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
//map mailing lists as views
_rStrings->push_back( aTableName ); // Table name
if (!bIsMailList) {
- OUString aTableType(OUString("TABLE"));
+ OUString aTableType("TABLE");
_rTypes->push_back( aTableType ); // Table type
}
else
{
- OUString aTableType(OUString("VIEW"));
+ OUString aTableType("VIEW");
_rTypes->push_back( aTableType ); // Table type
}
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 6f13f4a..c99585b 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1747,7 +1747,7 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode
SQL_ISTOKEN(pODBCNodeChild, T) ||
SQL_ISTOKEN(pODBCNodeChild, TS) ))
{
- OUString suQuote(OUString("'"));
+ OUString suQuote("'");
if (rParam.bPredicate)
{
if (rParam.aMetaData.shouldEscapeDateTime())
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 1d6c9f5..cec9b91 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -107,7 +107,7 @@ void Desktop::InitApplicationServiceManager()
SAL_INFO( "desktop.app", "desktop (cd100003) ::createApplicationServiceManager" );
Reference<XMultiServiceFactory> sm;
#ifdef ANDROID
- OUString aUnoRc( OUString( "file:///assets/program/unorc" ) );
+ OUString aUnoRc( "file:///assets/program/unorc" );
sm.set(
cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(),
UNO_QUERY_THROW);
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 26bf5a8..7a3e485 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -247,7 +247,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
try
{
- OUString aPropertyNameRole( OUString("Role") );
+ OUString aPropertyNameRole( "Role" );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() );
sal_Int32 nRange=0;
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 2f3685e1..270386d 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt
uno::Any aWrap = aNULL();
try
{
- OUString aPropName( OUString( SC_UNONAME_WRAP ) );
+ OUString aPropName( SC_UNONAME_WRAP );
if (!isAmbiguous( aPropName ))
{
aWrap = mxPropertySet->getPropertyValue(aPropName);
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index e7cec07..eb6de6a 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -102,7 +102,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*
if ( xDispatchProvider.is() )
{
URL aTargetURL;
- OUString aTarget( OUString("_default"));
+ OUString aTarget( "_default" );
aTargetURL.Complete = aName;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 57c972f..d210c6f 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -435,7 +435,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
xDisp = xDesktop->queryDispatch( aTargetURL, OUString(), 0 );
else
{
- OUString aTargetFrame( OUString("_blank") );
+ OUString aTargetFrame( "_blank" );
::framework::MenuConfiguration::Attributes* pMenuAttributes =
(::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 57886b7..a381af9 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -444,7 +444,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
sal_Int32 nProps = aNames.getLength();
- OUString aDelim( OUString( (sal_Unicode) '/' ) );
+ OUString aDelim( "/" );
OUString *pName = aNames.getArray();
for (sal_Int32 i = 0; i < nProps; ++i)
{
@@ -580,7 +580,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
PropertyValue *pValues = aValues.getArray();
PropertyValue *pVal = pValues;
- OUString aDelim( OUString( (sal_Unicode) '/' ) );
+ OUString aDelim( "/" );
std::vector< SmSym >::const_iterator aIt( rNewSymbols.begin() );
std::vector< SmSym >::const_iterator aEnd( rNewSymbols.end() );
while (aIt != aEnd)
@@ -670,7 +670,7 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
Sequence< OUString > aNames = lcl_GetFontPropertyNames();
sal_Int32 nProps = aNames.getLength();
- OUString aDelim( OUString( (sal_Unicode) '/' ) );
+ OUString aDelim( "/" );
OUString *pName = aNames.getArray();
for (sal_Int32 i = 0; i < nProps; ++i)
{
@@ -746,7 +746,7 @@ void SmMathConfig::SaveFontFormatList()
PropertyValue *pValues = aValues.getArray();
PropertyValue *pVal = pValues;
- OUString aDelim( OUString( (sal_Unicode) '/' ) );
+ OUString aDelim( "/" );
for (size_t i = 0; i < nCount; ++i)
{
OUString aFntFmtId( rFntFmtList.GetFontFormatId( i ) );
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 31639fb..98be298 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -52,7 +52,7 @@ namespace stoc_namingservice
static Sequence< OUString > ns_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(SERVICENAME);
+ seqNames.getArray()[0] = SERVICENAME;
return seqNames;
}
@@ -100,7 +100,7 @@ public:
throw(::com::sun::star::uno::RuntimeException);
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static()
{
- OUString aStr( OUString(SERVICENAME) );
+ OUString aStr( SERVICENAME );
return Sequence< OUString >( &aStr, 1 );
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 4517ef7..edb0137 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1807,10 +1807,10 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
if (LocaleDataWrapper::areChecksEnabled() &&
rCode.Index != NF_CURRENCY_1000DEC2_CCC )
{
- OUString aMsg(OUString("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index ") +
- OUString::number( rCode.Index) +
- OUString(":\n") +
- rCode.Code);
+ OUString aMsg = "SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index " +
+ OUString::number( rCode.Index) +
+ ":\n" +
+ rCode.Code;
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
}
}
@@ -1827,10 +1827,10 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
{
if (LocaleDataWrapper::areChecksEnabled())
{
- OUString aMsg( OUString("SvNumberFormatter::ImpInsertFormat: bad format code, index " ) +
- OUString::number( rCode.Index ) +
- OUString("\n") +
- rCode.Code);
+ OUString aMsg = "SvNumberFormatter::ImpInsertFormat: bad format code, index " +
+ OUString::number( rCode.Index ) +
+ "\n" +
+ rCode.Code;
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
}
delete pFormat;
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index fe152ff..d8f6f9f 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -217,8 +217,8 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd
pFilterOptions = new FilterConfigItem( &aFilterData );
}
- const OUString sLogicalWidth(OUString("LogicalWidth"));
- const OUString sLogicalHeight(OUString("LogicalHeight"));
+ const OUString sLogicalWidth("LogicalWidth");
+ const OUString sLogicalHeight("LogicalHeight");
if ( mbIsPixelFormat )
{
pFilterOptions->WriteInt32(OUString("PixelWidth"), static_cast< sal_Int32 >( maSize.Width ) );
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index c88ec42..62ba86a 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -191,7 +191,7 @@ void SAL_CALL ConfigHandler::startElement(const OUString& aName, const Reference
if( !pElement.get() )
{
- OUString aMessage( OUString( "unknown config element: ") );
+ OUString aMessage( "unknown config element: " );
aMessage += aName;
errorThrow( aMessage );
}
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 863a715..f477134 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
void SwFldDBPage::FillUserData()
{
- OUString sData(OUString(USER_DATA_VERSION));
+ OUString sData(USER_DATA_VERSION);
sData += ";";
sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 528d45f..693a8e5 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -330,7 +330,7 @@ SwSpellPopup::SwSpellPopup(
}
}
- OUString aIgnoreSelection( OUString( SW_RES( STR_IGNORE_SELECTION ) ) );
+ OUString aIgnoreSelection( SW_RES( STR_IGNORE_SELECTION ) );
OUString aSpellingAndGrammar = RetrieveLabelFromCommand( ".uno:SpellingAndGrammarDialog" );
SetItemText( MN_SPELLING_DLG, aSpellingAndGrammar );
sal_uInt16 nItemPos = GetItemPos( MN_IGNORE_WORD );
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 5ad33cc..b8b06f0 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -165,8 +165,7 @@ void FTPURL::parse(const OUString& url)
*p1++ = ch;
*p1 = 0;
- OUString aExpr(OUString(buffer,strlen(buffer),
- RTL_TEXTENCODING_UTF8));
+ OUString aExpr(buffer, strlen(buffer), RTL_TEXTENCODING_UTF8);
sal_Int32 l = aExpr.indexOf('@');
m_aHost = aExpr.copy(1+l);
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 6cb59e0..c9472bf 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -110,7 +110,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree )
Reference< XMultiServiceFactory > xCfgProv = theDefaultProvider::get( xContext );
- OUString sTree(OUString("/org.openoffice.") + rSubTree);
+ OUString sTree = "/org.openoffice." + rSubTree;
if ( ImpIsTreeAvailable(xCfgProv, sTree) )
{
Any aAny;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index fb60d44..25c120a 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2308,7 +2308,7 @@ void SchXMLExportHelper_Impl::exportAxis(
bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid,
bool bExportContent )
{
- static const OUString sNumFormat( OUString( "NumberFormat" ));
+ static const OUString sNumFormat( "NumberFormat" );
std::vector< XMLPropertyState > aPropertyStates;
SvXMLElementExport* pAxis = NULL;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index e9e3c59..9f0c3e7 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -353,7 +353,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
{
if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" )
{
- OUString aPropName( OUString("StartingAngle") );
+ OUString aPropName( "StartingAngle" );
uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) );
if( !aAStartingAngle.hasValue() )
xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ;
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index c6e4c4d..1445874 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -256,7 +256,7 @@ OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( un
uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void)
throw( uno::RuntimeException )
{
- OUString aSN( OUString( "com.sun.star.xml.AttributeContainer" ) );
+ OUString aSN( "com.sun.star.xml.AttributeContainer" );
uno::Sequence< OUString > aNS( &aSN, 1L );
return aNS;
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 32ed660..ade0d57 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4769,7 +4769,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
try
{
sal_Bool bBool = sal_False;
- const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) );
+ const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US );
xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool;
if( bBool )
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 14a0d08..866dc8c 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3834,7 +3834,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
{
try
{
- const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) );
+ const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US );
xProps->setPropertyValue( sAPIPropertyName, Any( maTemplateStylesUsed[i] ) );
}
catch(const Exception&)
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index b8ce62c..a210fee 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1219,7 +1219,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co
{
uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW );
OUString sPrefix(rMaster.GetDisplayName());
- sPrefix += OUString('-');
+ sPrefix += "-";
ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix);
}
catch (const uno::Exception&)
@@ -1235,7 +1235,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const
{
if(GetSdImport().GetLocalDocStyleFamilies().is()) try
{
- const OUString sGraphicStyleName(OUString("graphics"));
+ const OUString sGraphicStyleName("graphics");
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW );
ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString());
@@ -1250,7 +1250,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
{
if(GetSdImport().GetLocalDocStyleFamilies().is()) try
{
- const OUString sCellStyleName(OUString("cell"));
+ const OUString sCellStyleName("cell");
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW );
ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString());
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 487ed5b..6915862 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1374,7 +1374,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI,
if( bPackage && bSupportPackage )
{
- OUString sTmp( OUString( '#' ) );
+ OUString sTmp( '#' );
if( rURI.startsWith( "./" ) )
rURI = rURI.copy( 2 );
sTmp += rURI;
commit 08fe82e59cbc598d2683d72877653316c1e41962
Author: Noel Grandin <noel at peralex.com>
Date: Fri Dec 13 09:29:22 2013 +0200
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
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index a92150a..982042b 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 6c89a81..f9aa564 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 98dde62..e7e4da0 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 c02397e..404101e 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 364213d..802a15a 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 d9ea6a7..7895637 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 029d9e3..71a0149 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 e498128..2418877 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 029d9e3..71a0149 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 90ee347..a841819 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 54f745c..fc817d6 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 7e705ae..cbd9b18 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 2020719..39c1594 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 1366981..012096d 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 d728f25..053fa5c 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 fcf8732..d5e8756 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 dd10ae0..0ced6a1 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 974515f..03e5743 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 e268c0e..dd35330 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 015a77f..1e95d92 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 198414a..f0f7ce1 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 e26591c..043322d 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 28833be..9333aeb 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 e17079a..d7ca9ff 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 6caccde..ba33047 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 f955494..65e4d51 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 c2c9a03..c61afd8 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 ba3bab9..e0197fe 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 1ab4f29..bfc6d9f 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 d7341e4..11ce5ec 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 eefb7f6..93d8010 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 1e5fae0..1032689 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 9f9d50d..9c43143 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 d6e5dbe..cf41a8d 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 0f9ce33..66626a8 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 b1cbf95..735cabf 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 a9a68f8..89c884c 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 bb61298..10c6974 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 d354288..285403b 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 8e9b053..739adbf 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 62be5df..8196d48 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 bc224b7..701fe1d 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 c0f26d8..b842cd2 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 988d9bd..4fd1e78 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 9d38a09..3b613f3 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 6193c98..1935c4b 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 9bc6e5f..3fcfc8f 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 a23c3bd..96c043a 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 287f545..131c651 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 a990f1f..dbf371d 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 ed30a7d..df174a4 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 0acae63..5a73ba1 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 41defc6..df4af5a 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 7f00a7f..1134c86 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 );
}
More information about the Libreoffice-commits
mailing list