Commit Graph

40 Commits

Author SHA1 Message Date
Vladimir Glazounov
1b6c84b2af INTEGRATION: CWS os51 (1.39.52); FILE MERGED
2005/01/20 15:20:00 od 1.39.52.1: #118546# - environment of anchored object, which doesn't follows the text
	   flow is always the page frame
2005-02-16 16:01:15 +00:00
Vladimir Glazounov
d19fd7ce23 INTEGRATION: CWS swqbugfixes10 (1.38.4); FILE MERGED
2004/11/29 16:09:31 od 1.38.4.2: #i34753# - no <MakeObjPos()> for at-page and at-fly anchored Writer fly
	   frame under certain conditions.
2004/11/29 15:36:45 od 1.38.4.1: #i37068# - handling of <mbNoMoveOnCheckClip>
2004-12-23 09:07:54 +00:00
Oliver Bolte
9832771cfe INTEGRATION: CWS swqbugfixes09 (1.37.108); FILE MERGED
2004/11/03 12:22:53 od 1.37.108.3: #114798# <SwFlyFreeFrm::MakeAll> - guard on invalidate position, if
         Writer fly frame is clipped.
2004/11/01 08:34:18 od 1.37.108.2: #i36347# class <SwFlyFreeFrm> - new member <mbNoCheckClip> and
         its dependence on call of method <CheckClip(..)>
2004/10/18 06:51:07 od 1.37.108.1: #i26945# <CalcClipRect(..)> - correction due to object positioning
2004-11-16 14:45:55 +00:00
Kurt Zenker
f85a48bbf1 INTEGRATION: CWS swobjpos04 (1.30.88); FILE MERGED
2004/07/14 07:33:17 od 1.30.88.8: resolve merge conflict
2004/07/13 01:35:03 od 1.30.88.7: RESYNC: (1.30-1.36); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:38 od 1.30.88.6: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:23 od 1.30.88.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:56 od 1.30.88.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 13:41:11 od 1.30.88.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 13:11:31 od 1.30.88.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:34 od 1.30.88.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:09:33 +00:00
Hans-Joachim Lankenau
92c0017265 #i10000# fix merge problems 2004-06-30 14:20:18 +00:00
Kurt Zenker
81279eef1c INTEGRATION: CWS swqbugfixes02 (1.31.18); FILE MERGED
2004/06/16 19:18:14 fme 1.31.18.2: RESYNC: (1.31-1.32); FILE MERGED
2004/06/04 13:20:07 od 1.31.18.1: #i29879# <SwFlyFreeFrm::~SwFlyFreeFrm()> - remove also to-frame anchored
	 Writer fly frames from its page.
2004-06-29 07:09:02 +00:00
Hans-Joachim Lankenau
98647bc244 INTEGRATION: CWS swdrawpositioning (1.29.6); FILE MERGED
2004/06/21 07:23:02 od 1.29.6.4: RESYNC: (1.30-1.32); FILE MERGED
2004/04/23 09:12:54 od 1.29.6.3: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/08 09:20:39 od 1.29.6.2: RESYNC: (1.29-1.30); FILE MERGED
2004/04/07 12:07:09 od 1.29.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:54:56 +00:00
Hans-Joachim Lankenau
2b3a19b1b8 INTEGRATION: CWS swqbugfixes01 (1.30.100); FILE MERGED
2004/06/04 10:42:22 od 1.30.100.2: RESYNC: (1.30-1.31); FILE MERGED
2004/06/02 07:17:27 od 1.30.100.1: #i29778# method <CalcClipRect(..)> - no calculation of upper frames any more
2004-06-28 11:59:45 +00:00
Oliver Bolte
d2d16d13fe INTEGRATION: CWS fmebugs02 (1.30.48); FILE MERGED
2004/05/19 12:53:49 fme 1.30.48.1: #i29333# Do not set size attribute of ole objects the 0
2004-06-04 07:51:44 +00:00
Kurt Zenker
b87a57240a INTEGRATION: CWS swautowidth (1.30.16); FILE MERGED
2004/04/05 13:09:08 fme 1.30.16.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:59 +00:00
Oliver Bolte
7e7bb07652 INTEGRATION: CWS fmebugs01 (1.24.112); FILE MERGED
2004/03/05 15:08:57 fme 1.24.112.2: RESYNC: (1.24-1.26); FILE MERGED
2004/03/05 09:55:24 fme 1.24.112.1: #111909# Objects anchored as character may exceed right margins
2004-03-17 11:49:35 +00:00
Jens-Heiner Rechtien
4ab35e9fb1 #100000#: backout revision 1.27 2004-03-08 14:56:32 +00:00
Jens-Heiner Rechtien
08f0c8caa3 INTEGRATION: CWS swobjpos03 (1.23.56); FILE MERGED
2004/02/16 10:09:32 od 1.23.56.4: RESYNC: (1.23-1.25); FILE MERGED
resolve merge conflicts.
2003/11/21 09:36:30 od 1.23.56.3: #113049# - further adjustment for isolated positioning algorithms
2003/11/10 13:23:52 od 1.23.56.2: #113049# - further improvements to the isolated object positioning algorithms
#i22305# <CalcClipRect(..)> - consider 'Follow text flow' for to-frame
	 anchored Writer fly frames.
2003/10/27 13:03:54 od 1.23.56.1: merging changes from swobjpos02
2004-03-08 13:00:43 +00:00
Kurt Zenker
ab7319cefd INTEGRATION: CWS os24 (1.23.82); FILE MERGED 2004-03-08 12:30:16 +00:00
Kurt Zenker
155743c51f INTEGRATION: CWS hiddentext (1.24.18); FILE MERGED
2004/02/16 08:50:54 fme 1.24.18.2: RESYNC: (1.24-1.25); FILE MERGED
2004/01/19 10:09:14 od 1.24.18.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:25 +00:00
Jens-Heiner Rechtien
7c7e5788da INTEGRATION: CWS swobjpos02 (1.22.52); FILE MERGED
2004/01/13 13:31:20 od 1.22.52.5: RESYNC: (1.23-1.24); FILE MERGED
2003/11/18 11:01:06 od 1.22.52.4: #110978# - further adjustments for isolated object positioning algorithms
2003/10/15 12:49:53 od 1.22.52.3: RESYNC: (1.22-1.23); FILE MERGED
resolved conflicts.
2003/10/09 15:06:54 od 1.22.52.2: #110978# - further adjustments for isolated positioning algorithm
2003/10/02 10:38:09 od 1.22.52.1: #i18732# method <CalcClipRect(..)> - adjustments for new option 'FollowTextFlow'
	 and alignment at page areas.
2004-02-02 17:21:32 +00:00
Rüdiger Timm
d7a639b51c INTEGRATION: CWS aw003 (1.20.6); FILE MERGED
2003/10/23 14:39:29 aw 1.20.6.5: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 15:02:25 aw 1.20.6.4: RESYNC: (1.22-1.23); FILE MERGED
2003/08/20 11:30:26 aw 1.20.6.3: RESYNC: (1.21-1.22); FILE MERGED
2003/06/30 18:11:34 aw 1.20.6.2: RESYNC: (1.20-1.21); FILE MERGED
2003/06/30 13:38:29 aw 1.20.6.1: #110094#
2003-11-24 15:05:38 +00:00
Oliver Bolte
cef959f8b0 INTEGRATION: CWS geordi2q04 (1.22.106); FILE MERGED
2003/09/02 10:38:03 rt 1.22.106.1: #111934#: Join CWS sw7pp1.
2003-09-04 10:47:26 +00:00
Vladimir Glazounov
d7982bdbe0 INTEGRATION: CWS aig02 (1.20.38); FILE MERGED
2003/06/24 08:43:19 od 1.20.38.3: RESYNC: (1.20-1.21); FILE MERGED
2003/06/23 15:25:52 od 1.20.38.2: #108784# - further adjustments for supporting drawing objects in header/footer
2003/05/22 10:52:14 od 1.20.38.1: #108784# class <SwPageFrm> - adjustments for drawing objects in header/footer
2003-07-04 12:21:56 +00:00
Vladimir Glazounov
856947b762 INTEGRATION: CWS sw015 (1.20.34); FILE MERGED
2003/05/20 08:31:43 fme 1.20.34.2: #109653# No proportional scaling of graphics and OLE in footer or header
2003/05/19 09:03:34 fme 1.20.34.1: #109653# Proportional scaling of graphics
2003-06-10 12:18:23 +00:00
Vladimir Glazounov
18200568bc INTEGRATION: CWS os8 (1.19.142); FILE MERGED
2003/04/03 07:10:57 os 1.19.142.1: #108583# precompiled headers removed
2003-04-17 13:12:19 +00:00
Andreas Martens
9afb6809ec Fix #100979#: Loop in footer 2002-09-12 08:26:38 +00:00
Andreas Martens
575d34a105 Fix #99869#: Resize of non fitting OLE objects 2002-07-05 05:58:53 +00:00
Andreas Martens
fb152ddf98 Fix #100828#: Squared frames 2002-07-02 13:35:02 +00:00
Michael Brauer
a006e8e1f2 #95586#: Accessible tables and optimization 2002-05-03 11:40:10 +00:00
Michael Brauer
98edffc1f7 #95586#: accessible frames 2002-04-05 11:18:25 +00:00
Andreas Martens
8ef7f9fa34 Fix: Repositioning and resizing of fly frames in vertical environment 2001-12-20 15:26:16 +00:00
Andreas Martens
4ddb013b3b New: Drawing objects as character in vertical environment 2001-12-14 09:46:38 +00:00
Andreas Martens
5f2d4dc8a8 New: Fly frames in vertical environment 2001-12-13 11:59:48 +00:00
Andreas Martens
d1780138fe New: Fly frames in vertical layout 2001-12-12 15:51:56 +00:00
Andreas Martens
78dfaf1682 New: Fly frames in vertical layout 2001-12-12 13:45:02 +00:00
Andreas Martens
52b8127632 Fix #94624#: Append the fly frames to the right page 2001-11-13 13:20:30 +00:00
Andreas Martens
02507e5e11 Fix #94350#: Loops and GPFs with fly frames 2001-11-07 13:12:46 +00:00
Andreas Martens
81ed757e4a Fix #91397#: Fly in fly causes loop 2001-10-22 08:04:03 +00:00
Andreas Martens
4f46844376 Fix #i1511#: No ASSERT when clipping object 2001-08-24 13:33:38 +00:00
Andreas Martens
c3bd4a7714 Fix #89170#: A twip is more than nothing 2001-07-04 10:01:33 +00:00
Andreas Martens
40f77b4f0d Fix #83523#: Positioning and resizing of objects (as characters) 2001-04-26 09:36:13 +00:00
Andreas Martens
80a5663f73 Fix: Don't clip under MINLAY width 2000-12-14 08:47:00 +00:00
Andreas Martens
e11c2fdfe7 Fix #79735#: Loop with fly in headerframe 2000-10-31 10:01:43 +00:00
Jens-Heiner Rechtien
84a3db80b4 initial import 2000-09-18 23:08:29 +00:00