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

coverity#705402 Improper use of negative value

Browse Source 
while at it let's avoid creating 16 OUString objects per run from
the same 8 constants.. and let's avoid parsing the source 4 times
when 1 time suffice... and of course use OUStrinBuffer to construct
the result rather than creating and recreating OUString over and over.

Change-Id: I74fdb8b51bab91a0883db65bc8c5d0e8606e2da4
Reviewed-on: https://gerrit.libreoffice.org/2326
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud
2013-02-22 01:26:15 -06:00
parent c3429a0da6
commit 7eda7576e0
1 changed files with 87 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
oox/source/ppt/pptfilterhelpers.cxx
View File

@@ -17,10 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <com/sun/star/animations/TransitionType.hpp> #include <com/sun/star/animations/TransitionType.hpp>
#include <com/sun/star/animations/TransitionSubType.hpp> #include <com/sun/star/animations/TransitionSubType.hpp>
#include <rtl/ustrbuf.hxx>
#include "pptfilterhelpers.hxx" #include "pptfilterhelpers.hxx"
namespace oox { namespace ppt { namespace oox { namespace ppt {
@@ -92,34 +91,100 @@ namespace oox { namespace ppt {
{ {
bool bRet = false; bool bRet = false;
const sal_Char* pSource[] = { "ppt_x", "ppt_y", "ppt_w", "ppt_h", NULL }; /* here we want to substitute all occurance of
const sal_Char* pDest[] = { "x", "y", "width", "height", NULL }; * [#]ppt_[xyhw] with
* x,y,height and width respectively
*/
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
sal_Int32 nLastIndex = 0;
const sal_Char** ps = pSource; nIndex = rString.indexOf("ppt_");
const sal_Char** pd = pDest; // bail out early if there is no substitution to be made
if(nIndex >= 0)
while( *ps )
{ {
const OUString aSearch( OUString::createFromAscii( *ps ) ); OUStringBuffer sRes(rString.getLength());
while( (nIndex = rString.indexOf( aSearch, nIndex )) != -1 )
do
{ {
sal_Int32 nLength = aSearch.getLength(); // copy the non matching inverval verbatim
if( nIndex && (rString.getStr()[nIndex-1] == '#' ) ) if(nIndex > nLastIndex)
{ {
nIndex--; sRes.append(rString.getStr() + nLastIndex, (nIndex - nLastIndex));
nLength++;
} }
// we are searching for ppt_[xywh] so we need and extra char behind the match
const OUString aNew( OUString::createFromAscii( *pd ) ); if(nIndex + 4 < rString.getLength())
rString = rString.replaceAt( nIndex, nLength, aNew ); {
nIndex += aNew.getLength(); switch(rString[nIndex + 4])
bRet = true; {
case (sal_Unicode)'h': // we found ppt_h
// if it was #ppt_h we already copied the #
// which we do not want in the target, so remove it
if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
{
sRes.remove(sRes.getLength() - 1, 1);
}
sRes.append("height");
bRet = true;
break;
case (sal_Unicode)'w':
if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
{
sRes.remove(sRes.getLength() - 1, 1);
}
sRes.append("width");
bRet = true;
break;
case (sal_Unicode)'x':
if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
{
sRes[sRes.getLength() - 1] = (sal_Unicode)'x';
}
else
{
sRes.append((sal_Unicode)'x');
}
bRet = true;
break;
case (sal_Unicode)'y':
if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
{
sRes[sRes.getLength() - 1] = (sal_Unicode)'y';
}
else
{
sRes.append((sal_Unicode)'y');
}
bRet = true;
break;
default:
// this was ppt_ without an interesting thing after that
// just copy it verbatim
sRes.append("ppt_");
// we are going to ajust for ppt_@ after the swtich
// so compensate for the fact we did not really process
// an extra character after ppt_
nIndex -= 1;
break;
}
}
else
{
sRes.append("ppt_");
nIndex += 4;
nLastIndex = nIndex;
break;
}
nIndex += 5;
nLastIndex = nIndex;
} }
ps++; while((nIndex = rString.indexOf("ppt_", nIndex)) > 0);
pd++; // copy the non matching tail if any
if(nLastIndex < rString.getLength())
{
sRes.append(rString.getStr() + nLastIndex, rString.getLength() - nLastIndex );
}
rString = sRes.makeStringAndClear();
} }
return bRet; return bRet;
} }