[Libreoffice-commits] core.git: svx/source
Jan Holesovsky
kendy at suse.cz
Fri Apr 12 09:49:05 PDT 2013
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9de73714775833f3ec7e7508d5fddcc8e4f19aed
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 12 18:46:17 2013 +0200
i#116001: Decrementing the iterator while comparing is not a good idea here.
When it is begin(), it will get decremented regardless the result of the test,
but probably affects only the dbgutil build.
Change-Id: I9aba1a9eea07584d8203fe16929ecb4794d2c087
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index d095dad..b648dc7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -579,8 +579,9 @@ void InsertMissingOutlinePoints( const Polygon& /*rOutlinePoly*/, const std::vec
else if ( fDistance < fLastDistance )
{
std::vector< double >::const_iterator aIter = std::lower_bound( rDistances.begin(), rDistances.end(), fLastDistance );
- if ( aIter-- != rDistances.begin() )
+ if ( aIter != rDistances.begin() )
{
+ --aIter;
if ( ( *aIter > fDistance ) && ( *aIter < fLastDistance ) )
{
Point& rPt0 = rPoly[ i - 1 ];
More information about the Libreoffice-commits
mailing list