mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,017 Commits 1 Branch 0 Tags
c12cec7c286d3a7c191c47d75950175f54e90ef3
Commit Graph

327 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
f90f8e6cc5 INTEGRATION: CWS swqbugfixes04 (1.8.52); FILE MERGED 
2004/07/19 13:57:08 fme 1.8.52.1: #i27399# Automatic width of columns - consider gutter calculation in FormatWidthCols
 2004-08-02 12:06:41 +00:00
Jens-Heiner Rechtien
08d438c3dc INTEGRATION: CWS swqbugfixes04 (1.5.114); FILE MERGED 
2004/07/16 12:23:57 od 1.5.114.1: #i26250# - new method <SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(..)>
 2004-08-02 12:06:27 +00:00
Jens-Heiner Rechtien
f5efdabb93 INTEGRATION: CWS swqbugfixes04 (1.5.20); FILE MERGED 
2004/07/22 10:19:51 od 1.5.20.1: #i31805# <SwAnchoredObjectPosition::_AdjustVertRelPos>
	 - add 3rd parameter <_bCheckBottom>
 2004-08-02 12:06:14 +00:00
Rüdiger Timm
db51a27fc9 INTEGRATION: CWS aw013 (1.3.474); FILE MERGED 
2004/06/24 09:35:42 aw 1.3.474.1: #i29181#
 2004-07-12 14:48:20 +00:00
Rüdiger Timm
f0abdfe816 INTEGRATION: CWS cellborders (1.8.80); FILE MERGED 
2004/06/10 12:50:52 fme 1.8.80.3: RESYNC: (1.9-1.10); FILE MERGED
2004/05/29 19:51:07 fme 1.8.80.2: RESYNC: (1.8-1.9); FILE MERGED
2004/05/27 14:19:49 fme 1.8.80.1: #i29552# Collapsing table borders
 2004-07-12 12:33:12 +00:00
Rüdiger Timm
1c81c93e88 INTEGRATION: CWS cellborders (1.4.190); FILE MERGED 
2004/05/29 19:50:59 fme 1.4.190.2: RESYNC: (1.4-1.5); FILE MERGED
2004/05/27 14:19:48 fme 1.4.190.1: #i29552# Collapsing table borders
 2004-07-12 12:32:45 +00:00
Rüdiger Timm
b0a6d030dd INTEGRATION: CWS cellborders (1.36.48); FILE MERGED 
2004/06/10 12:50:36 fme 1.36.48.3: RESYNC: (1.37-1.38); FILE MERGED
2004/05/29 19:50:06 fme 1.36.48.2: RESYNC: (1.36-1.37); FILE MERGED
2004/05/27 14:19:48 fme 1.36.48.1: #i29552# Collapsing table borders
 2004-07-12 12:32:29 +00:00
Kurt Zenker
99fda8265e INTEGRATION: CWS swqbugfixes02 (1.10.4); FILE MERGED 
2004/06/10 09:32:02 fme 1.10.4.1: #i30006# #i29771# Splitting table rows - fallback to old behaviour if something went wrong
 2004-06-29 07:08:49 +00:00
Kurt Zenker
86ebc68408 INTEGRATION: CWS swqbugfixes02 (1.4.58); FILE MERGED 
2004/06/09 07:06:15 fme 1.4.58.1: #i29968# Remove hidden text ranges from document before sending it
 2004-06-29 07:08:37 +00:00
Hans-Joachim Lankenau
8e1539cdf3 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED 
2004/06/17 10:21:32 od 1.2.6.2: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/04/07 11:59:19 od 1.2.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:37:15 +00:00
Hans-Joachim Lankenau
cc7dd3ecce INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED 
2004/06/17 10:21:32 od 1.2.6.3: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/04/08 09:19:18 od 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED
2004/04/07 11:59:19 od 1.2.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:36:58 +00:00
Hans-Joachim Lankenau
d5ee529239 INTEGRATION: CWS swdrawpositioning (1.14.6); FILE MERGED 
2004/04/23 07:37:11 od 1.14.6.1: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
 2004-06-28 12:36:42 +00:00
Hans-Joachim Lankenau
0c1e6791cc INTEGRATION: CWS swdrawpositioning (1.6.6); FILE MERGED 
2004/04/07 11:59:19 od 1.6.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:36:26 +00:00
Hans-Joachim Lankenau
9acf8e057e INTEGRATION: CWS swdrawpositioning (1.10.38); FILE MERGED 
2004/06/01 12:04:41 od 1.10.38.3: #i26791# class <SwFlyFrm> - remove member <aRelPos>
2004/04/23 07:37:11 od 1.10.38.2: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/07 11:59:18 od 1.10.38.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:36:12 +00:00
Hans-Joachim Lankenau
1f855b6e6d INTEGRATION: CWS swdrawpositioning (1.3.156); FILE MERGED 
2004/04/07 11:59:18 od 1.3.156.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:35:58 +00:00
Hans-Joachim Lankenau
591792bb99 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED 
2004/04/07 11:59:18 od 1.2.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:35:44 +00:00
Hans-Joachim Lankenau
b8144f5cac INTEGRATION: CWS swdrawpositioning (1.3.6); FILE MERGED 
2004/06/17 10:21:32 od 1.3.6.3: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/04/08 09:18:23 od 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED
2004/04/07 11:59:17 od 1.3.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
 2004-06-28 12:35:30 +00:00
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