canvas/source/cairo/cairo_devicehelper.cxx | 4 --
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 29 ++++------------
chart2/source/tools/ObjectIdentifier.cxx | 3 -
chart2/workbench/addin/sampleaddin.cxx | 4 --
comphelper/source/container/embeddedobjectcontainer.cxx | 3 -
comphelper/source/misc/mimeconfighelper.cxx | 3 -
comphelper/source/xml/ofopxmlhelper.cxx | 3 -
connectivity/source/commontools/dbtools.cxx | 3 -
connectivity/source/drivers/ado/APreparedStatement.cxx | 6 +--
connectivity/source/drivers/file/fcomp.cxx | 3 -
connectivity/source/drivers/hsqldb/HDriver.cxx | 5 --
connectivity/source/drivers/hsqldb/HTable.cxx | 4 --
cppu/source/uno/lbenv.cxx | 4 --
13 files changed, 22 insertions(+), 52 deletions(-)
New commits:
commit efef273e2c61b19a63572a71b103e3b1490f15af
Author: nadith <nadmali...@gmail.com>
Date: Fri Jul 29 12:22:18 2016 +0530
tdf#100726: Improve readability of OUString concatenation
this bug fixed in the modules between canvas - cppu
Change-Id: I2022b022897dafde20251352376e3facdb9b8d75
Reviewed-on: https://gerrit.libreoffice.org/27663
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx
b/canvas/source/cairo/cairo_devicehelper.cxx
index 2f214ad..0400c2c 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -236,9 +236,7 @@ namespace cairocanvas
if( mpRefDevice )
{
- OUString aFilename("dbg_frontbuffer");
- aFilename += OUString::number(nFilePostfixCount);
- aFilename += ".bmp";
+ OUString aFilename = "dbg_frontbuffer" +
OUString::number(nFilePostfixCount) + ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index a70894b..3eccea9 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -489,11 +489,9 @@ OUString ObjectNameProvider::getHelpText( const OUString&
rObjectCID, const Refe
{
OUString aNewLine( "\n" );
- aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX);
- aRet+=aNewLine;
- aRet+=SCH_RESSTR(STR_TIP_DATASERIES);
- aRet+=aNewLine;
- aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
+ aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + aNewLine
+ + SCH_RESSTR(STR_TIP_DATASERIES) + aNewLine
+ + SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
}
else
aRet=SCH_RESSTR(STR_TIP_DATAPOINT);
@@ -637,9 +635,7 @@ OUString ObjectNameProvider::getHelpText( const OUString&
rObjectCID, const Refe
Reference< chart2::XRegressionCurve > xCurve(
RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
if( xCurve.is())
{
- aRet += " (";
- aRet +=
RegressionCurveHelper::getRegressionCurveName(xCurve);
- aRet += " )";
+ aRet += " (" +
RegressionCurveHelper::getRegressionCurveName(xCurve) + " )";
}
}
}
@@ -790,19 +786,15 @@ OUString ObjectNameProvider::getNameForCID(
case OBJECTTYPE_DATA_CURVE:
case OBJECTTYPE_DATA_CURVE_EQUATION:
{
- OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel );
- aRet += " ";
+ OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ) +
" ";
if( eType == OBJECTTYPE_DATA_POINT || eType ==
OBJECTTYPE_DATA_LABEL )
{
aRet += getName( OBJECTTYPE_DATA_POINT );
sal_Int32 nPointIndex =
ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
- aRet += " ";
- aRet += OUString::number(nPointIndex+1);
-
+ aRet += " " + OUString::number(nPointIndex+1);
if( eType == OBJECTTYPE_DATA_LABEL )
{
- aRet += " ";
- aRet += getName( OBJECTTYPE_DATA_LABEL );
+ aRet += " " + getName( OBJECTTYPE_DATA_LABEL );
}
}
else if (eType == OBJECTTYPE_DATA_CURVE || eType ==
OBJECTTYPE_DATA_CURVE_EQUATION)
@@ -810,8 +802,7 @@ OUString ObjectNameProvider::getNameForCID(
Reference< chart2::XDataSeries > xSeries(
ObjectIdentifier::getDataSeriesForCID( rObjectCID , xModel ));
Reference< chart2::XRegressionCurveContainer > xCurveCnt(
xSeries, uno::UNO_QUERY );
- aRet += " ";
- aRet += getName(eType);
+ aRet += " " + getName(eType);
if( xCurveCnt.is())
{
@@ -819,9 +810,7 @@ OUString ObjectNameProvider::getNameForCID(
Reference< chart2::XRegressionCurve > xCurve(
RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
if( xCurve.is())
{
- aRet += " (";
- aRet +=
RegressionCurveHelper::getRegressionCurveName(xCurve);
- aRet += ")";
+ aRet += " (" +
RegressionCurveHelper::getRegressionCurveName(xCurve) + ")";
}
}
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 23db4ea..94862b2 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1169,8 +1169,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub(
ObjectType eSubObjectType
, const OUString& rDragMethodServiceName
, const OUString& rDragParameterString )
{
- OUString aChildParticle( getStringForType( eSubObjectType ) );
- aChildParticle+=("=");
+ OUString aChildParticle = getStringForType( eSubObjectType ) + ("=");
return createClassifiedIdentifierForParticles(
rSeriesParticle, aChildParticle
diff --git a/chart2/workbench/addin/sampleaddin.cxx
b/chart2/workbench/addin/sampleaddin.cxx
index d2cce930..a136747 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -41,9 +41,7 @@ sal_Bool SAL_CALL component_writeInfo(
{
try
{
- OUString aImpl( "/" );
- aImpl += SampleAddIn::getImplementationName_Static();
- aImpl += "/UNO/SERVICES";
+ OUString aImpl = "/" +
SampleAddIn::getImplementationName_Static() + "/UNO/SERVICES";
uno::Reference< registry::XRegistryKey> xNewKey(
reinterpret_cast<registry::XRegistryKey*>( pRegistryKey
)->createKey( aImpl ) );
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 8207e5a..1e62e83 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -218,8 +218,7 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName()
sal_Int32 i=1;
do
{
- aStr = aPersistName;
- aStr += OUString::number( i++ );
+ aStr = aPersistName + OUString::number( i++ );
}
while( HasEmbeddedObject( aStr ) );
// TODO/LATER: should we consider deleted objects?
diff --git a/comphelper/source/misc/mimeconfighelper.cxx
b/comphelper/source/misc/mimeconfighelper.cxx
index ecd82fe..e4fd84c 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -57,8 +57,7 @@ OUString
MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
- aResult += OUString::number( nDigit1, 16 );
- aResult += OUString::number( nDigit2, 16 );
+ aResult += OUString::number( nDigit1, 16 ) + OUString::number(
nDigit2, 16 );
}
}
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx
b/comphelper/source/xml/ofopxmlhelper.cxx
index b50c30e..02f5815 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -98,8 +98,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > >
ReadRelationsInfoSequence(
const uno::Reference< uno::XComponentContext >& rContext )
throw( uno::Exception )
{
- OUString aStringID = "_rels/";
- aStringID += aStreamName;
+ OUString aStringID = "_rels/" + aStreamName;
return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT,
rContext );
}
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 1c1dbfe..ea7849e 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1396,8 +1396,7 @@ OUString createUniqueName( const Sequence< OUString >&
_rNames, const OUString&
while ( aUsedNames.find( sName ) != aUsedNames.end() )
{
- sName = _rBaseName;
- sName += OUString::number( ++nPos );
+ sName = _rBaseName + OUString::number( ++nPos );
}
return sName;
}
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 0e4b78b..b915a38 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -194,8 +194,7 @@ void OPreparedStatement::setParameter(sal_Int32
parameterIndex, const DataTypeEn
m_pParameters->get_Count(&nCount);
if(nCount < (parameterIndex-1))
{
- OUString sDefaultName( "parame" );
- sDefaultName += OUString::number(parameterIndex);
+ OUString sDefaultName = "parame" + OUString::number(parameterIndex);
ADOParameter* pParam =
m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
if(pParam)
{
@@ -461,8 +460,7 @@ void
OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
{
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":")
,SQLNodeType::Punctuation,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
- OUString sParameterName = _sDefaultName;
- sParameterName += OUString::number(++_rParameterCount);
+ OUString sParameterName = _sDefaultName +
OUString::number(++_rParameterCount);
pChildNode->append(new OSQLParseNode(
sParameterName,SQLNodeType::Name,0));
}
else
diff --git a/connectivity/source/drivers/file/fcomp.cxx
b/connectivity/source/drivers/file/fcomp.cxx
index c89abee..38eae60 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -476,8 +476,7 @@ OOperand*
OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
(SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") ||
SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) &&
pPredicateNode->getChild(1)->getNodeType() == SQLNodeType::IntNum)
{ // if -1 or +1 is there
- OUString aValue(pPredicateNode->getChild(0)->getTokenValue());
- aValue += pPredicateNode->getChild(1)->getTokenValue();
+ OUString aValue = pPredicateNode->getChild(0)->getTokenValue() +
pPredicateNode->getChild(1)->getTokenValue();
pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue);
}
else if( SQL_ISRULE(pPredicateNode,set_fct_spec) &&
SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"{") )
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 3da4193..af24d31 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -323,10 +323,7 @@ namespace connectivity
Sequence< PropertyValue > aConnectionArgs;
aProperties >>= aConnectionArgs;
-
- OUString sConnectURL("jdbc:hsqldb:");
-
- sConnectURL += sSystemPath;
+ OUString sConnectURL = "jdbc:hsqldb:" + sSystemPath;
Reference<XConnection> xOrig;
try
{
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx
b/connectivity/source/drivers/hsqldb/HTable.cxx
index 4f479a15..8a2aea6 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -260,9 +260,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const
OUString& colName, const Refe
void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName,
const Reference<XPropertySet>& _xDescriptor)
{
- OUString sSql = getAlterTableColumnPart();
-
- sSql += " ALTER COLUMN ";
+ OUString sSql = getAlterTableColumnPart() + " ALTER COLUMN ";
#if OSL_DEBUG_LEVEL > 0
try
{
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 978f463..bc5d628 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -924,9 +924,7 @@ inline void EnvironmentsData::getEnvironment(
*ppEnv = nullptr;
}
- OUString aKey(
- OUString::number( reinterpret_cast< sal_IntPtr >(pContext) ) );
- aKey += rEnvDcp;
+ OUString aKey = OUString::number( reinterpret_cast< sal_IntPtr >(pContext)
) + rEnvDcp;
// try to find registered mapping
OUString2EnvironmentMap::const_iterator const iFind(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
