summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-19 17:06:06 +0200
committerNoel Grandin <noel@peralex.com>2013-11-20 10:07:32 +0200
commit52bbd9cc00b5a1e15e4f96b5c5fa5e75855692c1 (patch)
tree72d0d1d16806f1c785a4f79ea2c0cdfe54bb8101 /sc
parent3af99e4d59d89c343965a928681a30f36b1007d2 (diff)
remove unnecessary RTL_CONSTASCII_STRINGPARAM in appendAscii calls
Convert code like: aStrBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ln(x)" )); to: aStrBuf.append( "ln(x)" ); which compiles down to the same code. Change-Id: I24c7cb45ceb32fd7cd6ec7ed203c2a5d746f1c5c
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/dpoutput.cxx2
-rw-r--r--sc/source/core/data/dputil.cxx2
-rw-r--r--sc/source/core/data/postit.cxx2
-rw-r--r--sc/source/core/tool/compiler.cxx4
-rw-r--r--sc/source/core/tool/dbdata.cxx4
-rw-r--r--sc/source/filter/oox/querytablebuffer.cxx4
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx22
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx2
-rw-r--r--sc/source/ui/vba/vbahyperlink.cxx2
-rw-r--r--sc/source/ui/view/viewutil.cxx2
11 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index ab95110cf579..cb43eccd54db 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1543,7 +1543,7 @@ OUString lcl_GetDataFieldName( const OUString& rSourceName, sheet::GeneralFuncti
return OUString();
OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) );
- aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+ aRet.append(" - ");
aRet.append(rSourceName);
return aRet.makeStringAndClear();
}
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index b2171f1e4643..40cfafb0e5da 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -366,7 +366,7 @@ OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc
if (nId)
{
aRet.append(ScGlobal::GetRscString(nId)); // function name
- aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+ aRet.append(" - ");
}
aRet.append(rName); // field name
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 1cf598c8c081..cbff1e6cc82e 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -804,7 +804,7 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
if( pNote && !pNote->IsCaptionShown() )
{
if( !aBuffer.isEmpty() )
- aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\n--------\n" ) ).append( pNote->GetText() );
+ aBuffer.append( "\n--------\n" ).append( pNote->GetText() );
pNoteCaption = pNote->GetOrCreateCaption( rPos );
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1668973ce555..e68cf55d6ae3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -635,10 +635,10 @@ static OUString lcl_makeExternalNameStr(const OUString& rFile, const OUString& r
aBuf.append( '[');
aBuf.append( "'" + aFile + "'" + OUString(cSep));
if (bODF)
- aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "$$'"));
+ aBuf.append( "$$'" );
aBuf.append( aName);
if (bODF)
- aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "']"));
+ aBuf.append( "']" );
return aBuf.makeStringAndClear();
}
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 97e24b047d67..5eb88b320fea 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -231,14 +231,14 @@ OUString ScDBData::GetOperations() const
if (mpSortParam->maKeyState[0].bDoSort)
{
if (!aBuf.isEmpty())
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuf.append(", ");
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SORT));
}
if (mpSubTotal->bGroupActive[0] && !mpSubTotal->bRemoveOnly)
{
if (!aBuf.isEmpty())
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuf.append(", ");
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SUBTOTAL));
}
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 5b2e9b10d5d1..d4d489b6e79a 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -72,7 +72,7 @@ void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTable
{
if( !rTables.isEmpty() )
rTables.append( ';' );
- rTables.appendAscii( RTL_CONSTASCII_STRINGPARAM( "HTML__" ) ).append( rTableName );
+ rTables.append( "HTML__" ).append( rTableName );
}
}
@@ -82,7 +82,7 @@ void lclAppendWebQueryTableIndex( OUStringBuffer& rTables, sal_Int32 nTableIndex
{
if( !rTables.isEmpty() )
rTables.append( ';' );
- rTables.appendAscii( RTL_CONSTASCII_STRINGPARAM( "HTML_" ) ).append( nTableIndex );
+ rTables.append( "HTML_" ).append( nTableIndex );
}
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 60953a040d95..c713e2a16d51 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -116,43 +116,43 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR);
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+ aBuf.append(" 1");
pLbConnect1->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+ aBuf.append(" 2");
pLbConnect2->SetAccessibleName(aBuf.makeStringAndClear());
sAccName = SC_RESSTR(RID_FILTER_FIELDNAME);
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+ aBuf.append(" 1");
pLbField1->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+ aBuf.append(" 2");
pLbField2->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+ aBuf.append(" 3");
pLbField3->SetAccessibleName(aBuf.makeStringAndClear());
sAccName = SC_RESSTR(RID_FILTER_CONDITION);
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+ aBuf.append(" 1");
pLbCond1->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+ aBuf.append(" 2");
pLbCond2->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+ aBuf.append(" 3");
pLbCond3->SetAccessibleName(aBuf.makeStringAndClear());
sAccName = SC_RESSTR(RID_FILTER_VALUE);
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+ aBuf.append(" 1");
pEdVal1->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+ aBuf.append(" 2");
pEdVal2->SetAccessibleName(aBuf.makeStringAndClear());
aBuf.append(sAccName);
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+ aBuf.append(" 3");
pEdVal3->SetAccessibleName(aBuf.makeStringAndClear());
pLbCopyArea->SetAccessibleName(ScResId(STR_COPY_AREA_TO));
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 82a9e02117a3..bdf57025a2d6 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -161,7 +161,7 @@ void ScFilterOptionsMgr::Init()
if ( !theDbName.startsWith(STR_DB_LOCAL_NONAME) )
{
- theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
+ theDbArea.append(" (");
theDbArea.append(theDbName).append(')');
pFtDbArea->SetText( theDbArea.makeStringAndClear() );
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 6b8490760875..98b6be62473d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1688,7 +1688,7 @@ void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc,
{
OUStringBuffer aReplacement;
if (bValue)
- aReplacement.appendAscii(RTL_CONSTASCII_STRINGPARAM("###"));
+ aReplacement.append("###");
else
aReplacement.append(aString);
//truncate to the number of characters that should fit, even in the
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index a021ec568569..63710bd8d44c 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -76,7 +76,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch
{
OUStringBuffer aBuffer( aUrlComp.first );
if( !aUrlComp.second.isEmpty() )
- aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " - " ) ).append( aUrlComp.second );
+ aBuffer.append( " - " ).append( aUrlComp.second );
aTextToDisplay = aBuffer.makeStringAndClear();
}
}
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 9857b1ff2a94..cad155d32dfb 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -162,7 +162,7 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
if ( rSettings.HasComment() )
{
OUStringBuffer aBuf(rAction.GetComment());
- aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
+ aBuf.append(" (");
OUString aTmp;
rAction.GetDescription(aTmp, &rDocument);
aBuf.append(aTmp);