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

#i105939# Side-tracked by extensive unit test slowness - fixed

Browse Source 
by properly using strbuf in svg exporter
This commit is contained in:
thb
2009-10-16 00:59:42 +02:00
parent 7bae883739
commit d3356548cf
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
basegfx/source/polygon/b2dsvgpolypolygon.cxx
View File

@@ -67,10 +67,8 @@ namespace basegfx
} }
} }
inline bool lcl_isOnNumberChar(const ::rtl::OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true) inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool bSignAllowed = true)
{ {
const sal_Unicode aChar(rStr[nPos]);
const bool bPredicate( (sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) const bool bPredicate( (sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
|| (bSignAllowed && sal_Unicode('+') == aChar) || (bSignAllowed && sal_Unicode('+') == aChar)
|| (bSignAllowed && sal_Unicode('-') == aChar) ); || (bSignAllowed && sal_Unicode('-') == aChar) );
@@ -78,6 +76,12 @@ namespace basegfx
return bPredicate; return bPredicate;
} }
inline bool lcl_isOnNumberChar(const ::rtl::OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
{
return lcl_isOnNumberChar(rStr[nPos],
bSignAllowed);
}
bool lcl_getDoubleChar(double& o_fRetval, bool lcl_getDoubleChar(double& o_fRetval,
sal_Int32& io_rPos, sal_Int32& io_rPos,
const ::rtl::OUString& rStr, const ::rtl::OUString& rStr,
@@ -233,16 +237,16 @@ namespace basegfx
lcl_skipSpacesAndCommas(io_rPos, rStr, nLen); lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
} }
void lcl_putNumberChar( ::rtl::OUString& rStr, void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr,
double fValue ) double fValue )
{ {
rStr += ::rtl::OUString::valueOf( fValue ); rStr.append( fValue );
} }
void lcl_putNumberCharWithSpace( ::rtl::OUString& rStr, void lcl_putNumberCharWithSpace( ::rtl::OUStringBuffer& rStr,
double fValue, double fValue,
double fOldValue, double fOldValue,
bool bUseRelativeCoordinates ) bool bUseRelativeCoordinates )
{ {
if( bUseRelativeCoordinates ) if( bUseRelativeCoordinates )
fValue -= fOldValue; fValue -= fOldValue;
@@ -250,11 +254,10 @@ namespace basegfx
const sal_Int32 aLen( rStr.getLength() ); const sal_Int32 aLen( rStr.getLength() );
if(aLen) if(aLen)
{ {
if( lcl_isOnNumberChar(rStr, aLen - 1, false) && if( lcl_isOnNumberChar(rStr.charAt(aLen - 1), false) &&
fValue >= 0.0 ) fValue >= 0.0 )
{ {
rStr += ::rtl::OUString::valueOf( rStr.append( sal_Unicode(' ') );
sal_Unicode(' ') );
} }
} }
@@ -879,7 +882,7 @@ namespace basegfx
bool bDetectQuadraticBeziers) bool bDetectQuadraticBeziers)
{ {
const sal_uInt32 nCount(rPolyPolygon.count()); const sal_uInt32 nCount(rPolyPolygon.count());
::rtl::OUString aResult; ::rtl::OUStringBuffer aResult;
B2DPoint aCurrentSVGPosition(0.0, 0.0); // SVG assumes (0,0) as the initial current point B2DPoint aCurrentSVGPosition(0.0, 0.0); // SVG assumes (0,0) as the initial current point
for(sal_uInt32 i(0); i < nCount; i++) for(sal_uInt32 i(0); i < nCount; i++)
@@ -896,7 +899,7 @@ namespace basegfx
// handle polygon start point // handle polygon start point
B2DPoint aEdgeStart(aPolygon.getB2DPoint(0)); B2DPoint aEdgeStart(aPolygon.getB2DPoint(0));
aResult += ::rtl::OUString::valueOf(lcl_getCommand('M', 'm', bUseRelativeCoordinates)); aResult.append(lcl_getCommand('M', 'm', bUseRelativeCoordinates));
lcl_putNumberCharWithSpace(aResult, aEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates); lcl_putNumberCharWithSpace(aResult, aEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
lcl_putNumberCharWithSpace(aResult, aEdgeStart.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates); lcl_putNumberCharWithSpace(aResult, aEdgeStart.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
aLastSVGCommand = lcl_getCommand('L', 'l', bUseRelativeCoordinates); aLastSVGCommand = lcl_getCommand('L', 'l', bUseRelativeCoordinates);
@@ -957,7 +960,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -972,7 +975,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -993,7 +996,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -1010,7 +1013,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -1049,7 +1052,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -1063,7 +1066,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -1077,7 +1080,7 @@ namespace basegfx
if(aLastSVGCommand != aCommand) if(aLastSVGCommand != aCommand)
{ {
aResult += ::rtl::OUString::valueOf(aCommand); aResult.append(aCommand);
aLastSVGCommand = aCommand; aLastSVGCommand = aCommand;
} }
@@ -1095,12 +1098,12 @@ namespace basegfx
// close path if closed poly (Z and z are equivalent here, but looks nicer when case is matched) // close path if closed poly (Z and z are equivalent here, but looks nicer when case is matched)
if(aPolygon.isClosed()) if(aPolygon.isClosed())
{ {
aResult += ::rtl::OUString::valueOf(lcl_getCommand('Z', 'z', bUseRelativeCoordinates)); aResult.append(lcl_getCommand('Z', 'z', bUseRelativeCoordinates));
} }
} }
} }
return aResult; return aResult.makeStringAndClear();
} }
} }
} }