diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:58:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:58:37 +0000 |
| commit | b7e53877c5a8e53a71cbf20da817d3babc9144b5 (patch) | |
| tree | d95b7382fb01cb7b9830810c5a554e88da0786da | |
| parent | f726e88355b53fd945dade809bc2a9e9493e9ed5 (diff) | |
INTEGRATION: CWS swwarnings (1.22.148); FILE MERGED
2007/05/29 10:39:12 os 1.22.148.3: RESYNC: (1.22-1.23); FILE MERGED
2007/02/23 08:57:17 os 1.22.148.2: #i69287# FASTBOOL back
2007/02/22 15:05:35 tl 1.22.148.1: #i69287# warning-free code
| -rw-r--r-- | sw/inc/dcontact.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index c8e141a691..3adc160374 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dcontact.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2007-04-25 08:52:26 $ + * last change: $Author: hr $ $Date: 2007-09-27 07:58:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -104,7 +104,7 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); SwContact* GetUserCall( const SdrObject* ); // liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist -FASTBOOL IsMarqueeTextObj( const SdrObject& rObj ); +BOOL IsMarqueeTextObj( const SdrObject& rObj ); //Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte) class SwContact : public SdrObjUserCall, public SwClient @@ -362,6 +362,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + using SdrVirtObj::GetPlusHdl; virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const; virtual void NbcMove(const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); |