diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:01:51 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:01:51 +0000 |
commit | 3298d82bf1ebd75ab8642f89edd9cf0af9bec945 (patch) | |
tree | 64ea0fad4b74cdd8300c8259ad409adaba6006c0 /svx/source/svdraw/svdocapt.cxx | |
parent | 32ad172f9a2fd4fa98828e19b8c9bf6e3ff5e95d (diff) |
INTEGRATION: CWS dr12 (1.15.308); FILE MERGED
2004/06/21 17:09:24 jmarmion 1.15.308.1: #i25335# add support for fixed tail in Calc svdcaption objects.
Diffstat (limited to 'svx/source/svdraw/svdocapt.cxx')
-rw-r--r-- | svx/source/svdraw/svdocapt.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 9ad62da2693f..5a88caa2e7ac 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdocapt.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2003-11-24 16:56:30 $ + * last change: $Author: hr $ $Date: 2004-09-08 14:01:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -240,23 +240,26 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj); SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE) + mbSpecialTextBoxShadow(FALSE), + mbFixedTail(FALSE) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE) + mbSpecialTextBoxShadow(FALSE), + mbFixedTail(FALSE) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE) + mbSpecialTextBoxShadow(FALSE), + mbFixedTail(FALSE) { - aTailPoly[0]=rTail; + aTailPoly[0]=maFixedTailPos=rTail; } SdrCaptionObj::~SdrCaptionObj() @@ -757,6 +760,8 @@ void SdrCaptionObj::NbcMove(const Size& rSiz) { SdrRectObj::NbcMove(rSiz); MovePoly(aTailPoly,rSiz); + if(mbFixedTail) + SetTailPos(GetFixedTailPos()); } void SdrCaptionObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) @@ -764,6 +769,8 @@ void SdrCaptionObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fr SdrRectObj::NbcResize(rRef,xFact,yFact); ResizePoly(aTailPoly,rRef,xFact,yFact); ImpRecalcTail(); + if(mbFixedTail) + SetTailPos(GetFixedTailPos()); } void SdrCaptionObj::NbcSetRelativePos(const Point& rPnt) |