Rüdiger Timm
6b81358512
INTEGRATION: CWS ooo20040509 (1.1.1.1.728); FILE MERGED
...
2004/05/07 16:56:33 cmc 1.1.1.1.728.1: #i9055# trivial -Wall member init reorder
2004-06-16 08:39:35 +00:00
Rüdiger Timm
a41fd2e90f
INTEGRATION: CWS ooo20040509 (1.2.726); FILE MERGED
...
2004/05/07 16:27:48 cmc 1.2.726.1: #i9055# trivial -Wall member init reorder
2004-06-16 08:39:04 +00:00
Oliver Bolte
383befd30e
INTEGRATION: CWS fmebugs02 (1.40.10); FILE MERGED
...
2004/04/19 11:37:58 fme 1.40.10.1: #i27145# Invalidate printing area of frame behind section frame during PasteTree to get correct upper distance
2004-06-04 07:44:05 +00:00
Oliver Bolte
0c6dafd07e
INTEGRATION: CWS fmebugs02 (1.36.10); FILE MERGED
...
2004/04/19 11:37:57 fme 1.36.10.1: #i27145# Invalidate printing area of frame behind section frame during PasteTree to get correct upper distance
2004-06-04 07:43:48 +00:00
Oliver Bolte
22b1704504
INTEGRATION: CWS tableintable (1.7.68); FILE MERGED
...
2004/05/17 13:18:31 fme 1.7.68.2: RESYNC: (1.7-1.9); FILE MERGED
2004/02/26 15:55:56 fme 1.7.68.1: #i25679# Feature - Table in table
2004-06-01 06:43:18 +00:00
Kurt Zenker
f09910aee4
INTEGRATION: CWS swautowidth (1.10.70); FILE MERGED
...
2004/04/05 13:09:06 fme 1.10.70.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:00 +00:00
Rüdiger Timm
ae8d380ff5
INTEGRATION: CWS hbqea101 (1.39.78); FILE MERGED
...
2004/05/05 14:54:35 hbrinkm 1.39.78.2: RESYNC: (1.39-1.40); FILE MERGED
2004/04/26 13:38:27 hbrinkm 1.39.78.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:16:43 +00:00
Rüdiger Timm
233afa1b5a
INTEGRATION: CWS hbqea101 (1.12.170); FILE MERGED
...
2004/05/05 14:54:04 hbrinkm 1.12.170.2: RESYNC: (1.12-1.13); FILE MERGED
2004/04/26 13:38:27 hbrinkm 1.12.170.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:16:28 +00:00
Rüdiger Timm
1e86708e11
INTEGRATION: CWS hbqea101 (1.12.144); FILE MERGED
...
2004/04/26 13:38:27 hbrinkm 1.12.144.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:16:13 +00:00
Rüdiger Timm
4850bb515c
INTEGRATION: CWS hbqea101 (1.3.660); FILE MERGED
...
2004/04/26 13:38:27 hbrinkm 1.3.660.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:15:56 +00:00
Rüdiger Timm
272d3a4829
INTEGRATION: CWS hbqea101 (1.7.170); FILE MERGED
...
2004/04/26 13:38:27 hbrinkm 1.7.170.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:15:42 +00:00
Rüdiger Timm
8147070d5c
INTEGRATION: CWS hbqea101 (1.35.144); FILE MERGED
...
2004/05/05 14:53:26 hbrinkm 1.35.144.2: RESYNC: (1.35-1.36); FILE MERGED
2004/04/26 13:38:27 hbrinkm 1.35.144.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:15:26 +00:00
Rüdiger Timm
b0862e295e
INTEGRATION: CWS hbqea101 (1.10.92); FILE MERGED
...
2004/04/26 13:38:26 hbrinkm 1.10.92.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:15:11 +00:00
Rüdiger Timm
07a524dbc6
INTEGRATION: CWS hbqea101 (1.3.170); FILE MERGED
...
2004/05/05 14:53:46 hbrinkm 1.3.170.2: RESYNC: (1.3-1.4); FILE MERGED
2004/04/26 13:38:26 hbrinkm 1.3.170.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:14:56 +00:00
Rüdiger Timm
37d1143035
INTEGRATION: CWS gt03 (1.7.18); FILE MERGED
...
2004/04/20 09:27:19 gt 1.7.18.3: RESYNC: (1.7-1.8); FILE MERGED
2004/04/16 08:12:50 fme 1.7.18.2: #26165# Feature - Multiple headline rows in tables
2004/03/11 14:55:05 fme 1.7.18.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:46:31 +00:00
Rüdiger Timm
92e7b056ef
INTEGRATION: CWS gt03 (1.4.18); FILE MERGED
...
2004/04/16 08:12:50 fme 1.4.18.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:46:15 +00:00
Rüdiger Timm
eee2c5680c
INTEGRATION: CWS binfilter (1.4.292); FILE MERGED
...
2003/07/08 17:24:16 aw 1.4.292.1: #110680#
2004-05-03 12:13:31 +00:00
Rüdiger Timm
67ae528b54
INTEGRATION: CWS binfilter (1.3.290); FILE MERGED
...
2003/07/08 17:24:16 aw 1.3.290.1: #110680#
2004-05-03 12:13:16 +00:00
Oliver Bolte
26f4a3aea1
INTEGRATION: CWS wordcount (1.3.86); FILE MERGED
...
2004/04/06 13:08:00 fme 1.3.86.1: #i27302# Feature - Word count for current selection
2004-04-27 12:42:22 +00:00
Sander Vesik
3dddc76115
INTEGRATION: CWS vertcell (1.3.34); FILE MERGED
...
2004/02/05 14:51:39 fme 1.3.34.2: #i16944# Vertical formatting for individual cell frames
2004/02/04 14:17:55 fme 1.3.34.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:55:30 +00:00
Rüdiger Timm
462743e754
INTEGRATION: CWS swobjpos05 (1.39.14); FILE MERGED
...
2004/03/18 13:22:45 od 1.39.14.1: #i11860# class <SwTxtFrm> - new member and methods to keep/calculate
height of last line to avoid formatting of text frame, if
this information is needed by someone.
2004-03-31 14:08:12 +00:00
Rüdiger Timm
f7d8e2324f
INTEGRATION: CWS swobjpos05 (1.2.14); FILE MERGED
...
2004/03/18 13:17:28 od 1.2.14.1: #i11860# - remove unnecessary method declarations
2004-03-31 14:08:00 +00:00
Rüdiger Timm
9d3405b8a0
INTEGRATION: CWS swobjpos05 (1.12.128); FILE MERGED
...
2004/03/18 13:16:46 od 1.12.128.1: #i11860# class <SwRootFrm> - new method <InvalidateAllObjPos()>
2004-03-31 14:07:46 +00:00
Rüdiger Timm
7aba27e174
INTEGRATION: CWS swobjpos05 (1.35.92); FILE MERGED
...
2004/03/18 13:15:51 od 1.35.92.1: #i11860# class <SwFrm> - new method <InvalidateObjPos()>
2004-03-31 14:07:32 +00:00
Rüdiger Timm
659d0fd179
INTEGRATION: CWS swobjpos05 (1.3.128); FILE MERGED
...
2004/03/25 10:24:37 od 1.3.128.2: RESYNC: (1.3-1.4); FILE MERGED
resolve merge conflict.
2004/03/18 13:14:57 od 1.3.128.1: #i11860# class <SwFlowFrm> - new methods for determination of the different
upper space amounts.
2004-03-31 14:07:18 +00:00
Rüdiger Timm
97702553e3
INTEGRATION: CWS swobjpos05 (1.3.14); FILE MERGED
...
2004/03/18 13:13:15 od 1.3.14.1: #i11860# class <SwAnchoredObjectPosition> - new method <_GetTopForObjPos(..)>
2004-03-31 14:07:02 +00:00
Kurt Zenker
ca541bb833
INTEGRATION: CWS swformatcells (1.3.72); FILE MERGED
...
2004/03/02 15:16:16 od 1.3.72.1: #106629# class <SwFlowFrm> - new method <CalcLowerSpace(..)>
2004-03-23 10:24:41 +00:00
Oliver Bolte
a5b7a319ba
INTEGRATION: CWS fmebugs01 (1.7.52); FILE MERGED
...
2004/03/05 10:02:59 fme 1.7.52.1: #114798# Calculation of footnote bottom line should consider non-splittable table rows
2004-03-17 11:48:25 +00:00
Oliver Düsterhoff
7e73cdb26d
merge changes of swobjpos03 to head
2004-03-11 12:05:04 +00:00
Jens-Heiner Rechtien
cdf928d4dc
INTEGRATION: CWS ooo20040225 (1.24.82); FILE MERGED
...
2004/02/16 18:28:54 khendricks 1.24.82.1: adding in fix for Issue 23500 so that more testing can
be done with doc files with embedded graphics
2004-03-09 10:14:14 +00:00
Jens-Heiner Rechtien
73ef145987
INTEGRATION: CWS swmergeborders (1.35.44); FILE MERGED
...
2004/02/26 15:46:59 od 1.35.44.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
with next paragraph'
2004-03-09 08:54:07 +00:00
Jens-Heiner Rechtien
fd99c148de
INTEGRATION: CWS swmergeborders (1.12.8); FILE MERGED
...
2004/02/26 15:46:58 od 1.12.8.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
with next paragraph'
2004-03-09 08:53:11 +00:00
Jens-Heiner Rechtien
3d529d34f9
INTEGRATION: CWS swobjpos03 (1.32.38); FILE MERGED
...
2004/02/16 10:14:52 od 1.32.38.4: RESYNC: (1.32-1.35); FILE MERGED
2004/02/02 11:04:02 od 1.32.38.3: #i22341# <SwTxtFrm::GetTopOfLine(..)> - adjust description due to
change of behavior of method.
2003/11/21 09:30:57 od 1.32.38.2: #i22341# - add method <SwTxtFrm::GetTopOfLine()>
2003/10/27 13:03:38 od 1.32.38.1: merging changes from swobjpos02
2004-03-08 12:59:14 +00:00
Jens-Heiner Rechtien
a28fb5b1b6
INTEGRATION: CWS swobjpos03 (1.1.2); FILE ADDED
...
2003/11/10 13:02:13 od 1.1.2.1: #113049# - further improvements to the isolated object positioning algorithms
2004-03-08 12:59:02 +00:00
Jens-Heiner Rechtien
3458654cf1
INTEGRATION: CWS swobjpos03 (1.1.2); FILE ADDED
...
2004/02/17 13:59:52 od 1.1.2.3: correction due to merge conflicts.
2003/11/21 09:30:04 od 1.1.2.2: #i22341# - add member <mnToCharTopOfLine> and method <ToCharToOfLine()>
2003/11/10 13:01:16 od 1.1.2.1: #113049# - further improvements to the isolated object positioning algorithms
2004-03-08 12:58:51 +00:00
Jens-Heiner Rechtien
caae9a62cc
INTEGRATION: CWS swobjpos03 (1.4.58); FILE MERGED
...
2004/02/05 13:12:07 od 1.4.58.4: #113049# - correct of member <SwFlyAtCntFrm::mpVertPosOrientFrm>
2003/11/21 09:28:54 od 1.4.58.3: #i22341# - adjustments for vertical alignment at top of line
2003/11/10 13:10:07 od 1.4.58.2: #113049# - further improvements to the isolated object positioning algorithms
2003/10/27 13:03:33 od 1.4.58.1: merging changes from swobjpos02
2004-03-08 12:58:18 +00:00
Jens-Heiner Rechtien
fd07479803
INTEGRATION: CWS swobjpos03 (1.1.2); FILE ADDED
...
2003/11/10 12:59:02 od 1.1.2.1: #113049# - further improvements to the isolated object positioning algorithms
2004-03-08 12:57:55 +00:00
Jens-Heiner Rechtien
c81472012e
INTEGRATION: CWS swobjpos03 (1.1.2); FILE ADDED
...
2003/11/10 13:00:16 od 1.1.2.1: #113049# - further improvements to the isolated object positioning algorithms
2004-03-08 12:57:45 +00:00
Kurt Zenker
aaa494cf63
INTEGRATION: CWS swlinespacing (1.33.10); FILE MERGED
...
2004/02/06 08:46:52 od 1.33.10.2: RESYNC: (1.33-1.34); FILE MERGED
2004/01/12 09:32:44 od 1.33.10.1: #i11859# class <SwTxtFrm> - new methods <GetHeightOfLastLineForPropLineSpacing()>
and <InvalidateNextPrtArea()>
2004-02-26 15:59:37 +00:00
Kurt Zenker
c2c6eecb8a
INTEGRATION: CWS swlinespacing (1.10.310); FILE MERGED
...
2004/02/06 08:45:15 od 1.10.310.2: RESYNC: (1.10-1.11); FILE MERGED
2004/01/12 09:29:36 od 1.10.310.1: #i11859# class <SwCntntNotify> - new private members <mbChkHeightOfLastLine>
and <mnHeightOfLastLine>
2004-02-26 15:59:24 +00:00
Kurt Zenker
55d269693e
INTEGRATION: CWS hiddentext (1.2.480); FILE MERGED
...
2003/12/16 15:43:53 fme 1.2.480.1: #i20197# Hidden text attribute
2004-02-26 14:29:03 +00:00
Kurt Zenker
5bfd21f088
INTEGRATION: CWS hiddentext (1.32.84); FILE MERGED
...
2004/02/16 08:52:56 fme 1.32.84.6: RESYNC: (1.34-1.35); FILE MERGED
2004/02/10 09:59:29 fme 1.32.84.5: RESYNC: (1.33-1.34); FILE MERGED
2004/01/19 10:05:51 od 1.32.84.4: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:27:41 fme 1.32.84.3: #i23660# Feature - hidden character attribute
2004/01/12 09:14:10 fme 1.32.84.2: RESYNC: (1.32-1.33); FILE MERGED
2004/01/09 15:01:18 fme 1.32.84.1: #i23660# Feature - Hidden character attribute - Footnotes in hidden text
2004-02-26 14:28:51 +00:00
Kurt Zenker
07516ae0e8
INTEGRATION: CWS hiddentext (1.4.506); FILE MERGED
...
2004/01/05 14:30:07 fme 1.4.506.1: #i23660# Feature - Hidden character attribute
2004-02-26 14:28:39 +00:00
Kurt Zenker
00397c0dc2
INTEGRATION: CWS hiddentext (1.2.56); FILE MERGED
...
2004/01/09 15:00:45 fme 1.2.56.4: #i23660# Feature - Hidden character attribute - Optimization
2004/01/08 15:00:50 fme 1.2.56.3: #i23660# Feature - Hidden text attribute
2004/01/05 14:29:59 fme 1.2.56.2: #i23660# Feature - Hidden character attribute
2003/12/16 15:43:52 fme 1.2.56.1: #i20197# Hidden text attribute
2004-02-26 14:28:26 +00:00
Kurt Zenker
d218f797c6
INTEGRATION: CWS hiddentext (1.4.482); FILE MERGED
...
2003/12/16 15:43:22 fme 1.4.482.1: #i20197# Hidden text attribute
2004-02-26 14:28:14 +00:00
Kurt Zenker
26ae25f7ea
INTEGRATION: CWS hiddentext (1.7.304); FILE MERGED
...
2004/02/16 08:52:13 fme 1.7.304.5: RESYNC: (1.7-1.8); FILE MERGED
2004/02/12 13:34:23 od 1.7.304.4: #110582# - correction on hiding objects, which are anchored to hidden paragraphs
2004/02/12 12:25:38 fme 1.7.304.3: #i23660# Feature - hidden character attribute
2004/01/20 12:08:11 od 1.7.304.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:05:50 od 1.7.304.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:28:03 +00:00
Oliver Bolte
79c6e6b82d
INTEGRATION: CWS swq03 (1.23.70); FILE MERGED
...
2004/01/29 11:25:53 fme 1.23.70.2: RESYNC: (1.23-1.24); FILE MERGED
2004/01/15 08:24:04 od 1.23.70.1: #i23500# class <SwViewImp> - remove method <PaintFlyChilds(..)>
2004-02-16 10:57:46 +00:00
Oliver Bolte
6016a6edc3
INTEGRATION: CWS swq03 (1.11.24); FILE MERGED
...
2004/02/02 09:21:35 fme 1.11.24.1: #i24097# NotifyBackground if frame changes its printing area
2004-02-16 10:57:33 +00:00
Oliver Bolte
f8413334c2
INTEGRATION: CWS swq03 (1.7.350); FILE MERGED
...
2004/02/02 09:21:34 fme 1.7.350.1: #i24097# NotifyBackground if frame changes its printing area
2004-02-16 10:57:21 +00:00
Jens-Heiner Rechtien
267cbd8d37
INTEGRATION: CWS swobjpos02 (1.31.108); FILE MERGED
...
2004/01/21 08:52:25 od 1.31.108.4: RESYNC: (1.33-1.34); FILE MERGED
2004/01/13 13:37:43 od 1.31.108.3: RESYNC: (1.32-1.33); FILE MERGED
2003/10/15 12:51:08 od 1.31.108.2: RESYNC: (1.31-1.32); FILE MERGED
2003/10/09 14:52:59 od 1.31.108.1: #110978# <SwTxtFrm::GetFrmAtOfst(..)> - adjust signature
2004-02-02 17:19:56 +00:00