From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 16:11:35 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from svx
---
svx/source/svdraw/svdpoev.cxx | 48 +++++++++++++++++++++----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
(limited to 'svx/source/svdraw/svdpoev.cxx')
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 3a3942319661..64c9d35cb6cf 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -51,8 +51,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
{
eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE;
- bSetMarkedPointsSmoothPossible=FALSE;
- bSetMarkedSegmentsKindPossible=FALSE;
+ bSetMarkedPointsSmoothPossible=sal_False;
+ bSetMarkedSegmentsKindPossible=sal_False;
}
void SdrPolyEditView::ImpClearVars()
@@ -73,7 +73,7 @@ SdrPolyEditView::~SdrPolyEditView()
void SdrPolyEditView::ImpCheckPolyPossibilities()
{
ImpResetPolyPossibilityFlags();
- const ULONG nMarkAnz(GetMarkedObjectCount());
+ const sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
if(nMarkAnz && !ImpIsFrameHandles())
{
@@ -84,7 +84,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
bool bSegmFuz(false);
basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
- for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+ for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
{
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -214,9 +214,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
- ULONG nMarkAnz(GetMarkedObjectCount());
+ sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
- for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -249,9 +249,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
- ULONG nMarkAnz(GetMarkedObjectCount());
+ sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
- for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -275,7 +275,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
}
}
-BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
{
ForcePossibilities();
return bSetMarkedPointsSmoothPossible;
@@ -287,7 +287,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const
return eMarkedPointsSmooth;
}
-BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
{
ForcePossibilities();
return bSetMarkedSegmentsKindPossible;
@@ -299,7 +299,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const
return eMarkedSegmentsKind;
}
-BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const
+sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
{
return HasMarkedPoints();
}
@@ -310,7 +310,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
{
BrkAction();
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
const bool bUndo = IsUndoEnabled();
if( bUndo )
@@ -319,7 +319,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
}
- for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
+ for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
{
nMarkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -400,7 +400,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
- MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE);
+ MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True);
}
if(nNewPt0Idx)
@@ -555,7 +555,7 @@ void SdrPolyEditView::ShutMarkedObjects()
CloseMarkedObjects();
}
-void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance)
+void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
{
if (AreObjectsMarked())
{
@@ -564,12 +564,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp
BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints());
bool bChg=false;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
- BOOL bClosed=pO->IsClosedObj();
+ sal_Bool bClosed=pO->IsClosedObj();
if (pO->IsPolyObj() && (bClosed==bOpen) || bToggle)
{
if( bUndo )
@@ -605,13 +605,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
{
const bool bUndo = IsUndoEnabled();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedPoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
if (nPtAnz!=0 && pPath!=NULL)
{
@@ -685,7 +685,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditMove));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -707,7 +707,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -729,7 +729,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
--
cgit
From 27681d609137cc1c8b8957ada9b2b54061311cec Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Fri, 21 Jan 2011 13:06:20 +0100
Subject: removetooltypes01: #i112600# Fix build problems on non-pro
---
svx/source/svdraw/svdpoev.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'svx/source/svdraw/svdpoev.cxx')
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 64c9d35cb6cf..75be5919b114 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -406,7 +406,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx)
{
// Korrektur notwendig?
- DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
+ DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
if(!bKorregFlag)
{
bKorregFlag = sal_True;
--
cgit