diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-09 23:32:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-09 23:34:54 +0200 |
| commit | 55149144cb926513ef250c87fdf0c59e11e2f6cf (patch) | |
| tree | bc1d4feb02b812854bb542bf942d521c5ce8346c /svtools | |
| parent | 24e66143ed0887bb28f359d3172735017434bdf8 (diff) | |
SfxErrorHandler::CreateString: remove pointless loops
Change-Id: I585add18ea917249df252827e0eee944e59ce410
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 97b81fde8de5..1fac294074ac 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -192,13 +192,7 @@ sal_Bool SfxErrorHandler::CreateString( { if(GetMessageString(nErrCode, rStr, nFlags)) { - for (xub_StrLen i = 0; i < rStr.getLength();) - { - if( rStr.indexOf(OUString("$(ARG1)"), i) == -1 ) - break; - rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg(), i); - i = i + pMsgInfo->GetMessageArg().getLength(); - } + rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg()); return sal_True; } } @@ -206,35 +200,19 @@ sal_Bool SfxErrorHandler::CreateString( { StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr); if(pStringInfo) - for (xub_StrLen i = 0; i < rStr.getLength();) - { - if( rStr.indexOf("$(ARG1)", i) == -1 ) - break; - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), - pStringInfo->GetErrorString(), i); - i = i + pStringInfo->GetErrorString().getLength(); - } + { + rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), + pStringInfo->GetErrorString()); + } else { TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo, pErr); if (pTwoStringInfo) - for (sal_uInt16 i = 0; i < rStr.getLength();) - { - sal_uInt16 nArg1Pos = rStr.indexOf(rtl::OUString("$(ARG1)"), i); - sal_uInt16 nArg2Pos = rStr.indexOf(rtl::OUString("$(ARG2)"), i); - if (nArg1Pos < nArg2Pos) - { - rStr = rStr.replaceAt(nArg1Pos, 7, pTwoStringInfo->GetArg1()); - i = nArg1Pos + pTwoStringInfo->GetArg1().getLength(); - } - else if (nArg2Pos < nArg1Pos) - { - rStr = rStr.replaceAt(nArg2Pos, 7, pTwoStringInfo->GetArg2()); - i = nArg2Pos + pTwoStringInfo->GetArg2().getLength(); - } - else break; - } + { + rStr = rStr.replaceAll("$(ARG1)", pTwoStringInfo->GetArg1()); + rStr = rStr.replaceAll("$(ARG2)", pTwoStringInfo->GetArg2()); + } } return sal_True; } |