diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 09:12:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 09:12:23 +0000 |
| commit | 3373a7707ed507be94347bcd072e6a303319f6f1 (patch) | |
| tree | df5211d52588740f72e955537eb9ff820f4b4ff8 /svx/source/svdraw/svdotext.cxx | |
| parent | 877663df6693536f58cc52eec062f20f97f4c681 (diff) | |
INTEGRATION: CWS aw018 (1.66.70); FILE MERGED
2004/09/15 12:40:21 aw 1.66.70.1: #i33696#
Diffstat (limited to 'svx/source/svdraw/svdotext.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 0ccddb99f698..5fad5234e002 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotext.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: hr $ $Date: 2004-08-03 13:22:23 $ + * last change: $Author: hr $ $Date: 2004-10-12 10:12:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -841,6 +841,12 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho const SfxItemSet& rSet = GetObjectItemSet(); sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); + // #i33696# + // Remember TextObject currently set at the DrawOutliner, it WILL be + // replaced during calculating the outline since it uses an own paint + // and that one uses the DrawOutliner, too. + const SdrTextObj* pLastTextObject = rOutliner.GetTextObj(); + if(bShadowOn) { // #86258# force shadow off @@ -854,6 +860,13 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho TakeContour(*pContourXPP); } + // #i33696# + // restore remembered text object + if(pLastTextObject != rOutliner.GetTextObj()) + { + rOutliner.SetTextObj(pLastTextObject); + } + if (aGeo.nDrehWink!=0) // Unrotate! RotateXPoly(*pContourXPP,rAnchorRect.TopLeft(),-aGeo.nSin,aGeo.nCos); pContourXPP->Move(-aRef.X(),-aRef.Y()); @@ -1006,7 +1019,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS if( !pTestObj || !bHitTest || pTestObj != this || pTestObj->GetOutlinerParaObject() != pOutlinerParaObject ) { -// if( bHitTest ) + if( bHitTest ) // #i33696# take back fix #i27510# rOutliner.SetTextObj( this ); rOutliner.SetUpdateMode(TRUE); |