diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
tree | 7d938fd9373eb827095787955e2feffca942b8fd /svx/source/svdraw/svdedtv2.cxx | |
parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) |
fix mis-merge all-around.
Diffstat (limited to 'svx/source/svdraw/svdedtv2.cxx')
-rwxr-xr-x | svx/source/svdraw/svdedtv2.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 4d002d1ba888..a27d1d1b4a4f 100755 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -828,7 +828,7 @@ void SdrEditView::DistributeMarkedObjects() SvxDistributeVertical eVer = pDlg->GetDistributeVer(); ImpDistributeEntryList aEntryList; ImpDistributeEntryList::iterator itEntryList; - UINT32 nFullLength; + sal_uInt32 nFullLength; const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -875,7 +875,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else @@ -969,7 +970,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else |