diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-02-08 11:49:29 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2011-02-08 11:49:29 +0100 |
commit | 9730661364792059168a06bfbaacf47fc8daf53c (patch) | |
tree | fbf76ee668cb02107f1c6599088607963e102339 /sw/inc/dcontact.hxx | |
parent | aed400f208fbf9ba2ce943030f84e6c993f482fb (diff) | |
parent | 40bb208a5db70bd9ab1b877c911f537e4cb68afc (diff) |
CWS gnumake3: pull in cws removetooltypes01
Diffstat (limited to 'sw/inc/dcontact.hxx')
-rw-r--r-- | sw/inc/dcontact.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 5406fb042e95..7d5fec3e37c0 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -84,8 +84,8 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); // OD 2004-03-31 #i26791# - change return type SwContact* GetUserCall( const SdrObject* ); -// liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist -BOOL IsMarqueeTextObj( const SdrObject& rObj ); +// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist +sal_Bool IsMarqueeTextObj( const SdrObject& rObj ); //Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte) class SwContact : public SdrObjUserCall, public SwClient @@ -346,7 +346,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const; + virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; virtual void NbcMove(const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); @@ -421,7 +421,7 @@ class SwDrawContact : public SwContact // method <_Changed(..)> bool mbUserCallActive : 1; // event type, which is handled for <mpSdrObjHandledByCurrentUserCall>. - // Note: value only valid, if <mbUserCallActive> is TRUE. + // Note: value only valid, if <mbUserCallActive> is sal_True. SdrUserCallType meEventTypeOfCurrentUserCall; friend class NestedUserCallHdl; |