summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuconstr.cxx3
-rw-r--r--sd/source/ui/func/fucopy.cxx8
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx5
-rw-r--r--sd/source/ui/func/fuoaprms.cxx7
-rw-r--r--sd/source/ui/func/fuolbull.cxx4
-rw-r--r--sd/source/ui/func/fupoor.cxx2
-rw-r--r--sd/source/ui/func/fusel.cxx5
-rw-r--r--sd/source/ui/func/futext.cxx2
8 files changed, 16 insertions, 20 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 8a16803424af..50e5c9bee598 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -187,9 +187,8 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
// toggle between selection and rotation
SdrObject* pSingleObj = NULL;
- sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
- if (nMarkCount==1)
+ if (mpView->GetMarkedObjectList().GetMarkCount()==1)
{
pSingleObj = mpView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
}
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index e237f82e21f4..c4bc3d791c1f 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -183,7 +183,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
}
const SdrMarkList aMarkList( mpView->GetMarkedObjectList() );
- const sal_uLong nMarkCount = aMarkList.GetMarkCount();
+ const size_t nMarkCount = aMarkList.GetMarkCount();
SdrObject* pObj = NULL;
// calculate number of possible copies
@@ -221,10 +221,10 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// get newly selected objects
SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() );
- sal_uLong j, nCopyMarkCount = aMarkList.GetMarkCount();
+ const size_t nCopyMarkCount = aMarkList.GetMarkCount();
// set protection flags at marked copies to null
- for( j = 0; j < nCopyMarkCount; j++ )
+ for( size_t j = 0; j < nCopyMarkCount; ++j )
{
pObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj();
@@ -250,7 +250,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// set protection flags at marked copies to original values
if( nMarkCount == nCopyMarkCount )
{
- for( j = 0; j < nMarkCount; j++ )
+ for( size_t j = 0; j < nMarkCount; ++j )
{
SdrObject* pSrcObj = aMarkList.GetMark( j )->GetMarkedSdrObj();
SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj();
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 137923f6bbb0..dcf5ad77ecd5 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -109,7 +109,7 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
{
// if we text hit another shape than the one currently selected, unselect the old one now
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
- if( rMarkList.GetMarkCount() >= 1 )
+ if( rMarkList.GetMarkCount() > 0 )
{
if( rMarkList.GetMarkCount() == 1 )
{
@@ -272,9 +272,8 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet )
{
const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList();
- const sal_uLong nMarkCount = rMarkList.GetMarkCount();
- if( nMarkCount == 1 )
+ if( rMarkList.GetMarkCount() == 1 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
if( pObj && rDrawViewShell.GetDrawView()->SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 7af1159e8c01..0f1e27d7185d 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -78,8 +78,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
::svl::IUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager();
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
- sal_uLong nCount = rMarkList.GetMarkCount();
- sal_uLong nObject = 0;
+ const size_t nCount = rMarkList.GetMarkCount();
short nAnimationSet = ATTR_MISSING;
short nEffectSet = ATTR_MISSING;
@@ -176,7 +175,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
}
// if necessary, inspect more objects
- for( nObject = 1; nObject < nCount; nObject++ )
+ for( size_t nObject = 1; nObject < nCount; ++nObject )
{
pMark = rMarkList.GetMark( nObject );
SdrObject* pObject = pMark->GetMarkedSdrObj();
@@ -672,7 +671,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pUndoMgr->AddUndoAction(mpDoc->GetSdrUndoFactory().CreateUndoMoveObject( *pRunningObj, aDistance));
}
- for (nObject = 0; nObject < nCount; nObject++)
+ for (size_t nObject = 0; nObject < nCount; ++nObject)
{
SdrObject* pObject = rMarkList.GetMark(nObject)->GetMarkedSdrObj();
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 19b80cf0270a..790ac72413a5 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -319,9 +319,9 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
if( mpView )
{
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
- const sal_uInt32 nCount = rMarkList.GetMarkCount();
+ const size_t nCount = rMarkList.GetMarkCount();
- for(sal_uInt32 nNum = 0; nNum < nCount; nNum++)
+ for(size_t nNum = 0; nNum < nCount; ++nNum)
{
SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj();
if( pObj->GetObjInventor() == SdrInventor )
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index a7cee8354098..d91aa0527915 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -556,7 +556,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
// restore point with focus
SdrHdl* pNewOne = 0L;
- for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++)
+ for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a)
{
SdrHdl* pAct = rHdlList.GetHdl(a);
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 6347f5189778..0b0c1d41eb47 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -675,9 +675,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* Toggle between selection and rotation
**************************************************************/
SdrObject* pSingleObj = NULL;
- sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
- if (nMarkCount==1)
+ if (mpView->GetMarkedObjectList().GetMarkCount()==1)
{
pSingleObj = mpView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
}
@@ -803,7 +802,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pHdl = NULL;
mpWindow->ReleaseMouse();
SdrObject* pSingleObj = NULL;
- sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ const size_t nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index b13949d3785a..cafa2da771b7 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1361,7 +1361,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo
{
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
- for( sal_uInt32 nMark = 0; nMark < rMarkList.GetMarkCount(); nMark++ )
+ for( size_t nMark = 0; nMark < rMarkList.GetMarkCount(); ++nMark )
{
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( rMarkList.GetMark(nMark)->GetMarkedSdrObj() );
if( pTextObj )
generated by cgit (git 2.34.1) at 2025-02-01 17:47:15 +0000