diff options
| author | Noel Grandin <noel@peralex.com> | 2013-12-13 09:29:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-12-17 11:49:03 +0200 |
| commit | 08fe82e59cbc598d2683d72877653316c1e41962 (patch) | |
| tree | 5eeace3006ef2bfd58a5d97a000f336b8b06099c /reportdesign | |
| parent | fc985c30048d410ab68a55af64f56df85547a6bf (diff) | |
Remove unnecessary use of OUString constructor in + expressions
Convert code like
aFilename = OUString::number(nFilePostfixCount) + OUString(".bmp");
to
aFilename = OUString::number(nFilePostfixCount) + ".bmp";
Change-Id: I03f513ad1c8ec8846b2afbdc67ab12525ed07e50
Diffstat (limited to 'reportdesign')
4 files changed, 7 insertions, 9 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index f9554944b7b7..65e4d51ffa44 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext( } break; case XML_TOK_PAGE_NUMBER: - m_sText += s_sStringConcat + OUString(" PageNumber()"); + m_sText += s_sStringConcat + " PageNumber()"; break; case XML_TOK_PAGE_COUNT: - m_sText += s_sStringConcat + OUString(" PageCount()"); + m_sText += s_sStringConcat + " PageCount()"; break; case XML_TOK_FORMATTED_TEXT: { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index c2c9a0326045..c61afd807798 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1572,7 +1572,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0"))); OUString sCountName = sFunction + "_count_" + sExpression; xCountFunction->setName(sCountName); - xCountFunction->setFormula(OUString("rpt:[") + sCountName + OUString("] + 1")); + xCountFunction->setFormula( "rpt:[" + sCountName + "] + 1" ); exportFunction(xCountFunction); sExpression = sCountName; // The reference to sCountName in the formula of sFunctionName refers to the *old* value @@ -1587,7 +1587,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG ; } if ( sFunctionName.isEmpty() ) - sFunctionName = sFunction + OUString("_") + sExpression; + sFunctionName = sFunction + "_" + sExpression; if ( !sFunction.isEmpty() ) { sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'}; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index ba3bab90cb01..e0197fe25f74 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( 0x0020, sal_True ); break; case XML_TOK_PAGE_NUMBER: - m_sPageText += s_sStringConcat + OUString(" PageNumber()"); + m_sPageText += s_sStringConcat + " PageNumber()"; m_bFormattedField = true; break; case XML_TOK_PAGE_COUNT: - m_sPageText += s_sStringConcat + OUString(" PageCount()"); + m_sPageText += s_sStringConcat + " PageCount()"; m_bFormattedField = true; break; default: diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 1ab4f298772f..bfc6d9f73873 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -131,9 +131,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin // ----------------------------------------------------------------------------- OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { - OUString sQuotedFunctionName("["); - sQuotedFunctionName += _sFunction + OUString("]"); - return sQuotedFunctionName; + return "[" + _sFunction + "]"; } // ----------------------------------------------------------------------------- OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction) |