mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#100726: Improve readability of OUString concatenation

Browse Source 
this bug fixed in the modules between canvas - cppu

Change-Id: I2022b022897dafde20251352376e3facdb9b8d75
Reviewed-on: https://gerrit.libreoffice.org/27663
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
nadith
2016-07-29 12:22:18 +05:30
committed by Noel Grandin
parent dadb28a2fb
commit efef273e2c
13 changed files with 22 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
canvas/source/cairo/cairo_devicehelper.cxx
View File

@@ -236,9 +236,7 @@ namespace cairocanvas
if( mpRefDevice ) if( mpRefDevice )
{ {
OUString aFilename("dbg_frontbuffer"); OUString aFilename = "dbg_frontbuffer" + OUString::number(nFilePostfixCount) + ".bmp";
aFilename += OUString::number(nFilePostfixCount);
aFilename += ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); SvFileStream aStream( aFilename, STREAM_STD_READWRITE );

29
chart2/source/controller/dialogs/ObjectNameProvider.cxx
View File

@@ -489,11 +489,9 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{ {
OUString aNewLine( "\n" ); OUString aNewLine( "\n" );
aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX); aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + aNewLine
aRet+=aNewLine; + SCH_RESSTR(STR_TIP_DATASERIES) + aNewLine
aRet+=SCH_RESSTR(STR_TIP_DATASERIES); + SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
aRet+=aNewLine;
aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES);
} }
else else
aRet=SCH_RESSTR(STR_TIP_DATAPOINT); 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) ); Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
if( xCurve.is()) if( xCurve.is())
{ {
aRet += " ("; aRet += " (" + RegressionCurveHelper::getRegressionCurveName(xCurve) + " )";
aRet += RegressionCurveHelper::getRegressionCurveName(xCurve);
aRet += " )";
} }
} }
} }
@@ -790,19 +786,15 @@ OUString ObjectNameProvider::getNameForCID(
case OBJECTTYPE_DATA_CURVE: case OBJECTTYPE_DATA_CURVE:
case OBJECTTYPE_DATA_CURVE_EQUATION: case OBJECTTYPE_DATA_CURVE_EQUATION:
{ {
OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ) + " ";
aRet += " ";
if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL ) if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL )
{ {
aRet += getName( OBJECTTYPE_DATA_POINT ); aRet += getName( OBJECTTYPE_DATA_POINT );
sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID ); sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
aRet += " "; aRet += " " + OUString::number(nPointIndex+1);
aRet += OUString::number(nPointIndex+1);
if( eType == OBJECTTYPE_DATA_LABEL ) 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) 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::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xModel ));
Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
aRet += " "; aRet += " " + getName(eType);
aRet += getName(eType);
if( xCurveCnt.is()) if( xCurveCnt.is())
{ {
@@ -819,9 +810,7 @@ OUString ObjectNameProvider::getNameForCID(
Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) ); Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
if( xCurve.is()) if( xCurve.is())
{ {
aRet += " ("; aRet += " (" + RegressionCurveHelper::getRegressionCurveName(xCurve) + ")";
aRet += RegressionCurveHelper::getRegressionCurveName(xCurve);
aRet += ")";
} }
} }
} }

3
chart2/source/tools/ObjectIdentifier.cxx
View File

@@ -1169,8 +1169,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
, const OUString& rDragMethodServiceName , const OUString& rDragMethodServiceName
, const OUString& rDragParameterString ) , const OUString& rDragParameterString )
{ {
OUString aChildParticle( getStringForType( eSubObjectType ) ); OUString aChildParticle = getStringForType( eSubObjectType ) + ("=");
aChildParticle+=("=");
return createClassifiedIdentifierForParticles( return createClassifiedIdentifierForParticles(
rSeriesParticle, aChildParticle rSeriesParticle, aChildParticle

4
chart2/workbench/addin/sampleaddin.cxx
View File

@@ -41,9 +41,7 @@ sal_Bool SAL_CALL component_writeInfo(
{ {
try try
{ {
OUString aImpl( "/" ); OUString aImpl = "/" + SampleAddIn::getImplementationName_Static() + "/UNO/SERVICES";
aImpl += SampleAddIn::getImplementationName_Static();
aImpl += "/UNO/SERVICES";
uno::Reference< registry::XRegistryKey> xNewKey( uno::Reference< registry::XRegistryKey> xNewKey(
reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) ); reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) );

3
comphelper/source/container/embeddedobjectcontainer.cxx
View File

@@ -218,8 +218,7 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName()
sal_Int32 i=1; sal_Int32 i=1;
do do
{ {
aStr = aPersistName; aStr = aPersistName + OUString::number( i++ );
aStr += OUString::number( i++ );
} }
while( HasEmbeddedObject( aStr ) ); while( HasEmbeddedObject( aStr ) );
// TODO/LATER: should we consider deleted objects? // TODO/LATER: should we consider deleted objects?

3
comphelper/source/misc/mimeconfighelper.cxx
View File

@@ -57,8 +57,7 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 ); sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16; sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
aResult += OUString::number( nDigit1, 16 ); aResult += OUString::number( nDigit1, 16 ) + OUString::number( nDigit2, 16 );
aResult += OUString::number( nDigit2, 16 );
} }
} }

3
comphelper/source/xml/ofopxmlhelper.cxx
View File

@@ -98,8 +98,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence(
const uno::Reference< uno::XComponentContext >& rContext ) const uno::Reference< uno::XComponentContext >& rContext )
throw( uno::Exception ) throw( uno::Exception )
{ {
OUString aStringID = "_rels/"; OUString aStringID = "_rels/" + aStreamName;
aStringID += aStreamName;
return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, rContext ); return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, rContext );
} }

3
connectivity/source/commontools/dbtools.cxx
View File

@@ -1396,8 +1396,7 @@ OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString&
while ( aUsedNames.find( sName ) != aUsedNames.end() ) while ( aUsedNames.find( sName ) != aUsedNames.end() )
{ {
sName = _rBaseName; sName = _rBaseName + OUString::number( ++nPos );
sName += OUString::number( ++nPos );
} }
return sName; return sName;
} }

6
connectivity/source/drivers/ado/APreparedStatement.cxx
View File

@@ -194,8 +194,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
m_pParameters->get_Count(&nCount); m_pParameters->get_Count(&nCount);
if(nCount < (parameterIndex-1)) if(nCount < (parameterIndex-1))
{ {
OUString sDefaultName( "parame" ); OUString sDefaultName = "parame" + OUString::number(parameterIndex);
sDefaultName += OUString::number(parameterIndex);
ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val); ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
if(pParam) if(pParam)
{ {
@@ -461,8 +460,7 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
{ {
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQLNodeType::Punctuation,0); OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQLNodeType::Punctuation,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode); delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
OUString sParameterName = _sDefaultName; OUString sParameterName = _sDefaultName + OUString::number(++_rParameterCount);
sParameterName += OUString::number(++_rParameterCount);
pChildNode->append(new OSQLParseNode( sParameterName,SQLNodeType::Name,0)); pChildNode->append(new OSQLParseNode( sParameterName,SQLNodeType::Name,0));
} }
else else

3
connectivity/source/drivers/file/fcomp.cxx
View File

@@ -476,8 +476,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
(SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) && (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) &&
pPredicateNode->getChild(1)->getNodeType() == SQLNodeType::IntNum) pPredicateNode->getChild(1)->getNodeType() == SQLNodeType::IntNum)
{ // if -1 or +1 is there { // if -1 or +1 is there
OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); OUString aValue = pPredicateNode->getChild(0)->getTokenValue() + pPredicateNode->getChild(1)->getTokenValue();
aValue += pPredicateNode->getChild(1)->getTokenValue();
pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue); pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue);
} }
else if( SQL_ISRULE(pPredicateNode,set_fct_spec) && SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"{") ) else if( SQL_ISRULE(pPredicateNode,set_fct_spec) && SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"{") )

5
connectivity/source/drivers/hsqldb/HDriver.cxx
View File

@@ -323,10 +323,7 @@ namespace connectivity
Sequence< PropertyValue > aConnectionArgs; Sequence< PropertyValue > aConnectionArgs;
aProperties >>= aConnectionArgs; aProperties >>= aConnectionArgs;
OUString sConnectURL = "jdbc:hsqldb:" + sSystemPath;
OUString sConnectURL("jdbc:hsqldb:");
sConnectURL += sSystemPath;
Reference<XConnection> xOrig; Reference<XConnection> xOrig;
try try
{ {

4
connectivity/source/drivers/hsqldb/HTable.cxx
View File

@@ -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) void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
{ {
OUString sSql = getAlterTableColumnPart(); OUString sSql = getAlterTableColumnPart() + " ALTER COLUMN ";
sSql += " ALTER COLUMN ";
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
try try
{ {

4
cppu/source/uno/lbenv.cxx
View File

@@ -924,9 +924,7 @@ inline void EnvironmentsData::getEnvironment(
*ppEnv = nullptr; *ppEnv = nullptr;
} }
OUString aKey( OUString aKey = OUString::number( reinterpret_cast< sal_IntPtr >(pContext) ) + rEnvDcp;
OUString::number( reinterpret_cast< sal_IntPtr >(pContext) ) );
aKey += rEnvDcp;
// try to find registered mapping // try to find registered mapping
OUString2EnvironmentMap::const_iterator const iFind( OUString2EnvironmentMap::const_iterator const iFind(