diff options
| author | Armin Weiss <aw@openoffice.org> | 2002-09-26 12:11:57 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2002-09-26 12:11:57 +0000 |
| commit | f001ae3ec6608f80ca70032a10d3a60e1ec785ff (patch) | |
| tree | d987831fa694f1445a849185c33d448545f67d88 /svx/source/svdraw/svdotxed.cxx | |
| parent | bcb0e66a297860bbc9f1f2ae87fbaa1a32c5ac77 (diff) | |
#101684# new flag at text object to see if it is in edit mode
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index dc1eeca732eb..7088a0df0682 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotxed.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: aw $ $Date: 2002-09-13 15:07:04 $ + * last change: $Author: aw $ $Date: 2002-09-26 13:11:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,9 @@ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) if (pEdtOutl!=NULL) return FALSE; // Textedit laeuft evtl. schon an einer anderen View! pEdtOutl=&rOutl; + // #101684# + mbInEditMode = TRUE; + USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; @@ -209,7 +212,12 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p if (!IsAutoGrowHeight()) { nMaxHgt=aAnkSiz.Height(); nMinHgt=nMaxHgt; } SdrTextAniKind eAniKind=GetTextAniKind(); SdrTextAniDirection eAniDirection=GetTextAniDirection(); - if (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE) { + + // #101684# + BOOL bInEditMode = IsInEditMode(); + + if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) + { // Grenzenlose Papiergroesse fuer Laufschrift if (eAniDirection==SDRTEXTANI_LEFT || eAniDirection==SDRTEXTANI_RIGHT) nMaxWdt=1000000; if (eAniDirection==SDRTEXTANI_UP || eAniDirection==SDRTEXTANI_DOWN) nMaxHgt=1000000; @@ -295,6 +303,9 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) UINT32 nStat = rOutl.GetControlWord(); nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); + + // #101684# + mbInEditMode = FALSE; } SdrObject* SdrTextObj::CheckTextEditHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const |