diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 14:38:43 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 14:38:43 +0200 |
| commit | 1ddbd702ae05d51e391a312552778be808fde8da (patch) | |
| tree | 0cd8ca8a28460fd922ee02b3f40b4a12d2af4b78 /svx | |
| parent | 11ecb2ba487e9ff85ee61d01808f0a33dc025e1f (diff) | |
| parent | 86423ced17e0444f63e6a8bd5ef779717b11a7ee (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xpoly.cxx | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index b7595b9e5f..63a10022e7 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -627,7 +627,7 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom ) if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) ) { - nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber; + nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1; GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName, nLastFileNumber, FALSE, FALSE, TRUE, 0, FALSE ); diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index c84ca62b6c..0fb2aba264 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -1444,17 +1444,14 @@ void XPolygon::Rotate20() long nPntCnt = pImpXPolygon->nPoints; long nIndex0 = 0; - for (long nPoints = 1; - nPoints < nPntCnt; - nPoints ++) + for (long nPoints = 1; nPoints < nPntCnt; ++nPoints) { - Point &rPnt = pImpXPolygon->pPointAry[nPoints]; + const Point &rPnt = pImpXPolygon->pPointAry[nPoints]; - if ((rPnt.X () < fMinX) || (fMinX == rPnt.X ()) && - (fMinY >= rPnt.Y ())) + if ( (rPnt.X() < fMinX) || (fMinX == rPnt.X() && fMinY >= rPnt.Y()) ) { - fMinX = rPnt.X (); - fMinY = rPnt.Y (); + fMinX = rPnt.X(); + fMinY = rPnt.Y(); nIndex0 = nPoints; } } |