summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdogrp.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdogrp.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdogrp.cxx166
1 files changed, 83 insertions, 83 deletions
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 13b37db6f4bb..7c49d50784e9 100644..100755
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -46,14 +46,14 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
#include <svx/svdobj.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdattrx.hxx> // NotPersistItems
#include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx" // StringCache
-#include "svdstr.hrc" // Objektname
+#include "svx/svdglob.hxx" // StringCache
+#include "svx/svdstr.hrc" // Objektname
#include <svx/svxids.hrc>
#include <svl/whiter.hxx>
@@ -101,10 +101,10 @@ SdrObjGroup::SdrObjGroup()
pSub=new SdrObjList(NULL,NULL);
pSub->SetOwnerObj(this);
pSub->SetListKind(SDROBJLIST_GROUPOBJ);
- bRefPoint=FALSE;
+ bRefPoint=sal_False;
nDrehWink=0;
nShearWink=0;
- bClosedObj=FALSE;
+ bClosedObj=sal_False;
}
@@ -115,51 +115,51 @@ SdrObjGroup::~SdrObjGroup()
void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=FALSE;
+ rInfo.bNoContortion=sal_False;
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =FALSE;
- if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =FALSE;
- if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =FALSE;
- if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =FALSE;
- if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =FALSE;
- if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =FALSE;
- if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =FALSE;
- if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =FALSE;
- if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =FALSE;
- if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =FALSE;
- if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =FALSE;
- if (aInfo.bNoContortion ) rInfo.bNoContortion =TRUE;
- if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =FALSE;
+ if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =sal_False;
+ if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =sal_False;
+ if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =sal_False;
+ if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =sal_False;
+ if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =sal_False;
+ if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =sal_False;
+ if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =sal_False;
+ if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =sal_False;
+ if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =sal_False;
+ if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =sal_False;
+ if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =sal_False;
+ if (aInfo.bNoContortion ) rInfo.bNoContortion =sal_True;
+ if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =sal_False;
if(!aInfo.bCanConvToContour)
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bCanConvToContour = sal_False;
- if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =FALSE;
- if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE;
- if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE;
+ if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =sal_False;
+ if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False;
+ if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False;
}
if (nObjAnz==0) {
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoContortion =TRUE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoContortion =sal_True;
}
if(nObjAnz != 1)
{
// only allowed if single object selected
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
}
}
@@ -170,9 +170,9 @@ void SdrObjGroup::SetBoundRectDirty()
// not re-creatable view data
}
-UINT16 SdrObjGroup::GetObjIdentifier() const
+sal_uInt16 SdrObjGroup::GetObjIdentifier() const
{
- return UINT16(OBJ_GRUP);
+ return sal_uInt16(OBJ_GRUP);
}
@@ -181,8 +181,8 @@ SdrLayerID SdrObjGroup::GetLayer() const
bool b1st = true;
SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer());
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrLayerID nLay1=pOL->GetObj(i)->GetLayer();
if (b1st) { nLay=nLay1; b1st = false; }
else if (nLay1!=nLay) return 0;
@@ -195,8 +195,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer)
{
SdrObject::NbcSetLayer(nLayer);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
pOL->GetObj(i)->NbcSetLayer(nLayer);
}
}
@@ -260,7 +260,7 @@ Point SdrObjGroup::GetRefPoint() const
void SdrObjGroup::SetRefPoint(const Point& rPnt)
{
- bRefPoint=TRUE;
+ bRefPoint=sal_True;
aRefPoint=rPnt;
}
@@ -384,7 +384,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const
bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
@@ -431,8 +431,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
MovePoint(aRefPoint,rSiz);
if (pSub->GetObjCount()!=0) {
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcMove(rSiz);
}
@@ -463,8 +463,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
ResizePoint(aRefPoint,rRef,xFact,yFact);
if (pSub->GetObjCount()!=0) {
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcResize(rRef,xFact,yFact);
}
@@ -477,48 +477,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
nDrehWink=NormAngle360(nDrehWink+nWink);
RotatePoint(aRefPoint,rRef,sn,cs);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcRotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcMirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
nShearWink+=nWink;
ShearPoint(aRefPoint,rRef,tn);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcShear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
@@ -528,8 +528,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
MovePoint(aRefPoint,aSiz);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcSetAnchorPos(rPnt);
}
@@ -575,8 +575,8 @@ void SdrObjGroup::Move(const Size& rSiz)
if (pSub->GetObjCount()!=0) {
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Move(rSiz);
@@ -621,8 +621,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
if (pSub->GetObjCount()!=0) {
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
@@ -647,14 +647,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nDrehWink=NormAngle360(nDrehWink+nWink);
RotatePoint(aRefPoint,rRef,sn,cs);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
@@ -664,7 +664,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -674,13 +674,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
@@ -690,7 +690,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -700,14 +700,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nShearWink+=nWink;
ShearPoint(aRefPoint,rRef,tn);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
@@ -717,7 +717,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -734,8 +734,8 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
MovePoint(aRefPoint,aSiz);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt);
@@ -777,12 +777,12 @@ void SdrObjGroup::ReformatText()
pSub->ReformatAllTextObjects();
}
-SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
{
SdrObject* pGroup = new SdrObjGroup;
pGroup->SetModel(GetModel());
- for(UINT32 a=0;a<pSub->GetObjCount();a++)
+ for(sal_uInt32 a=0;a<pSub->GetObjCount();a++)
{
SdrObject* pIterObj = pSub->GetObj(a);
SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier);
generated by cgit (git 2.34.1) at 2024-07-19 07:53:58 +0000