diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/view/drbezob.cxx | |
| parent | Removed header reference that no longer exists. (diff) | |
| parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
| download | core-c61cd1a5a26de1d1f62389988b00229c04e36693.tar.gz core-c61cd1a5a26de1d1f62389988b00229c04e36693.zip | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/view/drbezob.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/view/drbezob.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index b8c6924f79e7..19c6c0e57fdb 100644..100755 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -126,7 +126,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); mpView->GetAttributes( aAttrSet ); - rSet.Put(aAttrSet, FALSE); // <- FALSE, damit DontCare-Status uebernommen wird + rSet.Put(aAttrSet, sal_False); // <- sal_False, damit DontCare-Status uebernommen wird FunctionReference xFunc( mpViewSh->GetCurrentFunction() ); @@ -134,13 +134,13 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { if(xFunc->ISA(FuSelection)) { - USHORT nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, TRUE)); + sal_uInt16 nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); + rSet.Put(SfxBoolItem(nEditMode, sal_True)); } else if (xFunc->ISA(FuConstructBezierPolygon)) { - USHORT nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, TRUE)); + sal_uInt16 nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); + rSet.Put(SfxBoolItem(nEditMode, sal_True)); } } @@ -188,8 +188,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,FALSE)); break; // Button reingedrueckt = Kurve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,TRUE)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button reingedrueckt = Kurve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; default: break; } } @@ -205,9 +205,9 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSmooth) { case SDRPATHSMOOTH_DONTCARE : break; - case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, TRUE)); break; - case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,TRUE)); break; - case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,TRUE)); break; + case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, sal_True)); break; + case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,sal_True)); break; + case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,sal_True)); break; } } if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible()) @@ -220,8 +220,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,FALSE)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,TRUE)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; default: break; } } @@ -242,7 +242,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) void BezierObjectBar::Execute(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch (nSId) { |