summaryrefslogtreecommitdiff
path: root/svx/source/toolbars
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/toolbars')
-rw-r--r--svx/source/toolbars/extrusionbar.cxx36
-rw-r--r--svx/source/toolbars/fontworkbar.cxx28
2 files changed, 32 insertions, 32 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 191e91dcb05e..eb37bc6e892f 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -546,9 +546,9 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
if (pSdrView)
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
- for(i=0; i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -625,7 +625,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sViewPoint( "ViewPoint" );
@@ -638,7 +638,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
double fFinalSkewAngle = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -776,7 +776,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sProjectionMode( "ProjectionMode" );
@@ -786,7 +786,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
sal_Int32 nFinalProjection = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -832,7 +832,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sShadeMode( "ShadeMode" );
@@ -844,7 +844,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
sal_Int32 nFinalSurface = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -920,7 +920,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sDepth( "Depth" );
@@ -930,7 +930,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
double fFinalDepth = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -1000,7 +1000,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sFirstLightDirection( "FirstLightDirection" );
@@ -1016,7 +1016,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
int nFinalDirection = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -1081,7 +1081,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sBrightness( "Brightness" );
@@ -1091,7 +1091,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
int nFinalLevel = -1;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -1149,7 +1149,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
static const OUString sExtrusion( "Extrusion" );
static const OUString sExtrusionColor( "Color" );
@@ -1161,7 +1161,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
Color aFinalColor;
bool bHasCustomShape = false;
- for(i=0;i<nCount; i++)
+ for(size_t i=0; i<nCount; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -1224,10 +1224,10 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
static const OUString sExtrusion( "Extrusion" );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
bool bFound = false;
- for(i=0;(i<nCount) && !bFound ; i++)
+ for(size_t i=0;(i<nCount) && !bFound ; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 24a1c25b927c..8bf103061ddc 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -51,10 +51,10 @@ using namespace ::com::sun::star::uno;
void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
sal_Int32 nAlignment = -1;
- for( i = 0; i < nCount; i++ )
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -88,10 +88,10 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
sal_Int32 nCharacterSpacing = -1;
- for( i = 0; i < nCount; i++ )
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -113,10 +113,10 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
bool bChecked = false;
- for( i = 0; i < nCount; i++ )
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -132,11 +132,11 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
OUString aFontWorkShapeType;
- for( i = 0; i < nCount; i++ )
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA( SdrObjCustomShape ) )
@@ -225,9 +225,9 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
static const OUString sTextPath( "TextPath" );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+ const size_t nCount = rMarkList.GetMarkCount();
bool bFound = false;
- for(i=0;(i<nCount) && !bFound ; i++)
+ for(size_t i=0; (i<nCount) && !bFound ; ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -449,8 +449,8 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
if ( !aCustomShape.isEmpty() )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uInt32 nCount = rMarkList.GetMarkCount(), i;
- for( i = 0; i < nCount; i++ )
+ const size_t nCount = rMarkList.GetMarkCount();
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
@@ -525,8 +525,8 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- for( i = 0; i < nCount; i++ )
+ const size_t nCount = rMarkList.GetMarkCount();
+ for( size_t i = 0; i < nCount; ++i )
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if( pObj->ISA(SdrObjCustomShape) )
generated by cgit (git 2.34.1) at 2024-07-25 21:36:50 +0000