diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:39:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:39:12 +0000 |
| commit | a0426e62879c8ed6275138e7640411597e77cdcb (patch) | |
| tree | 751efb05959c92a6b49e246350c2d1fb414b97e1 /svx/source/svdraw/svdmark.cxx | |
| parent | 6e1b285e31175cde3b12c964a9091c6c12c760e2 (diff) | |
INTEGRATION: CWS warnings01 (1.6.178); FILE MERGED
2006/02/22 20:47:22 aw 1.6.178.1: #i55991# Adaptions to warning free code
Diffstat (limited to 'svx/source/svdraw/svdmark.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmark.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 593c8d2896c4..1f4d5207039a 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdmark.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2005-10-05 14:41:42 $ + * last change: $Author: hr $ $Date: 2006-06-19 16:39:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -596,8 +596,8 @@ const XubString& SdrMarkList::GetMarkDescription() const for(sal_uInt32 i = 1; i < GetMarkCount() && bEq; i++) { - SdrMark* pMark = GetMark(i); - pMark->GetObj()->TakeObjNamePlural(aStr1); + SdrMark* pMark2 = GetMark(i); + pMark2->GetObj()->TakeObjNamePlural(aStr1); bEq = aNam.Equals(aStr1); } @@ -684,12 +684,12 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const for(sal_uInt32 i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) { - const SdrMark* pMark = GetMark(i); - const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints(); + const SdrMark* pMark2 = GetMark(i); + const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints(); if(pPts && pPts->GetCount()) { - pMark->GetObj()->TakeObjNamePlural(aStr1); + pMark2->GetObj()->TakeObjNamePlural(aStr1); bEq = aNam.Equals(aStr1); } } |