mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,310 Commits 1 Branch 0 Tags
ca04cfcd673d64ad9e30fae6aff9ba8b305dda25
Commit Graph

767 Commits

Author SHA1 Message Date
Kurt Zenker
7f34f54863 INTEGRATION: CWS swautowidth (1.71.62); FILE MERGED 
2004/04/27 08:05:29 fme 1.71.62.3: RESYNC: (1.71-1.72); FILE MERGED
2004/04/06 08:37:04 fme 1.71.62.2: #i9046# Feature - Automatic frame width
2004/04/05 13:09:13 fme 1.71.62.1: i27205# Feature - Automatic frame width
 2004-05-18 13:53:10 +00:00
Kurt Zenker
ff79e89e87 INTEGRATION: CWS swautowidth (1.82.70); FILE MERGED 
2004/04/27 08:04:33 fme 1.82.70.2: RESYNC: (1.82-1.83); FILE MERGED
2004/04/05 13:09:13 fme 1.82.70.1: i27205# Feature - Automatic frame width
 2004-05-18 13:52:55 +00:00
Kurt Zenker
c7e80d09a1 INTEGRATION: CWS swundo01 (1.15.34); FILE MERGED 
2004/01/06 23:53:35 hbrinkm 1.15.34.2: RESYNC: (1.15-1.16); FILE MERGED
2004/01/06 15:34:15 hbrinkm 1.15.34.1: #111840#
 2004-05-18 13:04:34 +00:00
Rüdiger Timm
b029a730f4 INTEGRATION: CWS hbqea101 (1.9.78); FILE MERGED 
2004/04/26 13:38:30 hbrinkm 1.9.78.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:23:48 +00:00
Rüdiger Timm
c2b9acebc6 INTEGRATION: CWS hbqea101 (1.25.78); FILE MERGED 
2004/04/26 13:38:30 hbrinkm 1.25.78.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:23:35 +00:00
Rüdiger Timm
301f76ca06 INTEGRATION: CWS hbqea101 (1.14.530); FILE MERGED 
2004/04/26 13:38:30 hbrinkm 1.14.530.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:23:18 +00:00
Rüdiger Timm
e9a2f691d7 INTEGRATION: CWS hbqea101 (1.61.194); FILE MERGED 
2004/05/05 14:57:22 hbrinkm 1.61.194.2: RESYNC: (1.61-1.62); FILE MERGED
2004/04/26 13:38:30 hbrinkm 1.61.194.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:23:04 +00:00
Rüdiger Timm
262a4aa490 INTEGRATION: CWS hbqea101 (1.92.40); FILE MERGED 
2004/05/05 14:57:12 hbrinkm 1.92.40.2: RESYNC: (1.92-1.93); FILE MERGED
2004/04/26 13:38:29 hbrinkm 1.92.40.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:22:48 +00:00
Rüdiger Timm
116fecd55b INTEGRATION: CWS hbqea101 (1.34.78); FILE MERGED 
2004/05/05 14:56:52 hbrinkm 1.34.78.2: RESYNC: (1.34-1.35); FILE MERGED
2004/04/26 13:38:29 hbrinkm 1.34.78.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
 2004-05-17 15:18:14 +00:00
Jens-Heiner Rechtien
fb3ac91b21 INTEGRATION: CWS num04 (1.44.36); FILE MERGED 
2004/04/07 09:06:15 hbrinkm 1.44.36.2: #i23728#
2004/04/01 15:04:53 hbrinkm 1.44.36.1: #i23728#
 2004-05-11 10:32:43 +00:00
Jens-Heiner Rechtien
0822bcd6a1 INTEGRATION: CWS num04 (1.61.178); FILE MERGED 
2004/04/07 09:04:39 hbrinkm 1.61.178.3: #i23728#
2004/04/01 15:01:13 hbrinkm 1.61.178.2: #i23728#
2004/03/31 15:50:28 hbrinkm 1.61.178.1: #i23727#
 2004-05-11 10:32:30 +00:00
Jens-Heiner Rechtien
23f698ecee INTEGRATION: CWS swtextwrap (1.43.100); FILE MERGED 
2004/04/23 07:25:38 fme 1.43.100.1: #108724# #i13832# #i24135# Compatibility flag - text wrapping around objects anchored in header and text wrapping of text in header/footer
 2004-05-11 10:28:25 +00:00
Rüdiger Timm
8ec6b55df4 INTEGRATION: CWS swqod01 (1.3.180); FILE MERGED 
2004/03/26 11:35:21 od 1.3.180.2: RESYNC: (1.3-1.4); FILE MERGED
2004/03/03 09:56:12 od 1.3.180.1: #i16128# rename method <WidowsAndOrphans::IsBreakNow> to
	 <WidowsAndOrphans::IsBreakNowWidAndOrh>
 2004-05-03 13:24:25 +00:00
Rüdiger Timm
f3e5310f25 INTEGRATION: CWS swqod01 (1.12.92); FILE MERGED 
2004/03/26 11:35:14 od 1.12.92.2: RESYNC: (1.12-1.14); FILE MERGED
resolve merge conflicts.
2004/03/03 09:58:53 od 1.12.92.1: #i16128# method <WidowsAndOrphans::IsBreakNow> has been renamed -
	 new name <WidowsAndOrphans::IsBreakNowWidAndOrh>
 2004-05-03 13:24:13 +00:00
Rüdiger Timm
5a49210365 INTEGRATION: CWS swqod01 (1.44.42); FILE MERGED 
2004/04/28 07:50:15 od 1.44.42.4: RESYNC: (1.46-1.47); FILE MERGED
2004/03/26 11:33:42 od 1.44.42.3: RESYNC: (1.45-1.46); FILE MERGED
2004/03/03 12:35:42 od 1.44.42.2: RESYNC: (1.44-1.45); FILE MERGED
2004/03/03 09:54:37 od 1.44.42.1: #i16128# <SwTxtFrm::FormatAdjust(..)> - call base class method
	 <SwTxtFrmBreak::IsBreakNow(..)> instead of method
	 <WidowsAndOrphans::IsBreakNow(..)> to get a break, even if due
	 to widow rule no enough lines exists.
 2004-05-03 13:24:01 +00:00
Oliver Bolte
7edaf2ba80 INTEGRATION: CWS wordcount (1.47.86); FILE MERGED 
2004/04/06 13:08:01 fme 1.47.86.1: #i27302# Feature - Word count for current selection
 2004-04-27 12:42:37 +00:00
Sander Vesik
5f82359586 INTEGRATION: CWS vertcell (1.78.86); FILE MERGED 
2004/03/10 09:54:12 fme 1.78.86.2: RESYNC: (1.78-1.79); FILE MERGED
2004/02/06 12:44:54 fme 1.78.86.1: #i16944# Vertical formatting for individual cell frames
 2004-04-21 08:57:26 +00:00
Jens-Heiner Rechtien
cd47adb1bb INTEGRATION: CWS swnum02 (1.10.530); FILE MERGED 
2004/02/20 14:12:54 hbrinkm 1.10.530.1: #23726#
 2004-04-07 11:44:35 +00:00
Jens-Heiner Rechtien
493c216d49 INTEGRATION: CWS swnum02 (1.61.62); FILE MERGED 
2004/03/03 14:04:53 hbrinkm 1.61.62.2: #i23726#
2004/02/20 14:12:25 hbrinkm 1.61.62.1: #23726#
 2004-04-07 11:44:24 +00:00
Rüdiger Timm
6171e17d30 INTEGRATION: CWS swobjpos05 (1.71.4); FILE MERGED 
2004/03/18 13:47:41 od 1.71.4.1: #i11860# - implementation of method to calculate/keep the height of the
	   last line.
 2004-03-31 14:10:37 +00:00
Rüdiger Timm
6bb99fb160 INTEGRATION: CWS swobjpos05 (1.46.14); FILE MERGED 
2004/03/18 13:45:35 od 1.46.14.1: #i11860# method <SwTxtFrm::Format(..)> - call method <_CalcHeightOfLastLine()>
	 at the end of the formatting to calculate and keep the value of
	 the height of the last line.
 2004-03-31 14:10:19 +00:00
Rüdiger Timm
f1b03b31fd INTEGRATION: CWS swobjpos05 (1.34.14); FILE MERGED 
2004/03/18 13:43:47 od 1.34.14.1: #114789# method <SwTxtFrm::GetTopOfLine(..)> - corrections.
 2004-03-31 14:10:05 +00:00
Kurt Zenker
b6e5757565 INTEGRATION: CWS tabstops (1.17.44); FILE MERGED 
2003/12/05 11:08:27 fme 1.17.44.2: #114143# tab stop compatibility
2003/11/28 12:33:25 fme 1.17.44.1: #114143# Tab stop compatibility
 2004-03-25 11:53:39 +00:00
Kurt Zenker
df927a307c INTEGRATION: CWS tabstops (1.34.256); FILE MERGED 
2003/12/05 11:07:55 fme 1.34.256.1: #114143# tab stop compatibility
 2004-03-25 11:53:27 +00:00
Kurt Zenker
1e79fcc53e INTEGRATION: CWS tabstops (1.3.466); FILE MERGED 
2003/11/28 12:33:25 fme 1.3.466.1: #114143# Tab stop compatibility
 2004-03-25 11:53:13 +00:00
Kurt Zenker
43416b9bc7 INTEGRATION: CWS tabstops (1.11.466); FILE MERGED 
2003/11/28 12:32:24 fme 1.11.466.1: #114143# Tab stop compatibility
 2004-03-25 11:53:00 +00:00
Kurt Zenker
e1e46a9d5f INTEGRATION: CWS tabstops (1.79.44); FILE MERGED 
2004/02/16 08:17:24 fme 1.79.44.3: RESYNC: (1.80-1.81); FILE MERGED
2003/12/05 14:35:04 fme 1.79.44.2: RESYNC: (1.79-1.80); FILE MERGED
2003/11/28 12:32:23 fme 1.79.44.1: #114143# Tab stop compatibility
 2004-03-25 11:52:47 +00:00
Kurt Zenker
e70a0222d4 INTEGRATION: CWS tabstops (1.90.58); FILE MERGED 
2004/02/16 08:17:05 fme 1.90.58.4: RESYNC: (1.90-1.91); FILE MERGED
2003/12/05 11:07:07 fme 1.90.58.3: #114143# tab stop compatibility
2003/12/02 07:22:58 fme 1.90.58.2: #114143# Tab stop compatibility - Number recognition for decimal tabs
2003/11/28 12:32:47 fme 1.90.58.1: #114143# Tab stop compatibility
 2004-03-25 11:52:33 +00:00
Kurt Zenker
124242a8b9 INTEGRATION: CWS swformatcells (1.3.166); FILE MERGED 
2004/03/02 15:28:30 od 1.3.166.1: #106629# <SwTxtFrmBreak::SetRstHeight(..)> - consider bottom margin
 2004-03-23 10:26:17 +00:00
Kurt Zenker
398ba8f269 INTEGRATION: CWS swformatcells (1.12.72); FILE MERGED 
2004/03/02 15:28:30 od 1.12.72.1: #106629# <SwTxtFrmBreak::SetRstHeight(..)> - consider bottom margin
 2004-03-23 10:26:00 +00:00
Oliver Bolte
a1c20ba6e9 INTEGRATION: CWS fmebugs01 (1.12.52); FILE MERGED 
2004/03/05 10:03:00 fme 1.12.52.1: #114798# Calculation of footnote bottom line should consider non-splittable table rows
 2004-03-17 11:51:39 +00:00
Oliver Bolte
e41740c10c INTEGRATION: CWS fmebugs01 (1.37.52); FILE MERGED 
2004/03/08 11:22:02 fme 1.37.52.2: #114798# Calculation of footnote bottom line should consider non-splittable table - second try
2004/03/05 10:02:59 fme 1.37.52.1: #114798# Calculation of footnote bottom line should consider non-splittable table rows
 2004-03-17 11:51:27 +00:00
Oliver Bolte
a63f179afd INTEGRATION: CWS fmebugs01 (1.13.146); FILE MERGED 
2004/03/05 15:06:16 fme 1.13.146.2: RESYNC: (1.13-1.14); FILE MERGED
2004/02/09 15:13:57 fme 1.13.146.1: #i13507# Justified alignment for lines containing manual breaks
 2004-03-17 11:51:12 +00:00
Oliver Bolte
050f5ce607 INTEGRATION: CWS fmebugs01 (1.32.146); FILE MERGED 
2004/03/05 15:06:04 fme 1.32.146.2: RESYNC: (1.32-1.33); FILE MERGED
2004/02/09 15:13:58 fme 1.32.146.1: #i13507# Justified alignment for lines containing manual breaks
 2004-03-17 11:50:58 +00:00
Oliver Bolte
07dcbed5fb INTEGRATION: CWS fmebugs01 (1.15.104); FILE MERGED 
2004/02/09 15:13:57 fme 1.15.104.1: #i13507# Justified alignment for lines containing manual breaks
 2004-03-17 11:50:46 +00:00
Oliver Bolte
807b614896 INTEGRATION: CWS fmebugs01 (1.90.146); FILE MERGED 
2004/03/05 15:03:18 fme 1.90.146.2: RESYNC: (1.90-1.91); FILE MERGED
2004/02/09 15:13:55 fme 1.90.146.1: #i13507# Justified alignment for lines containing manual breaks
 2004-03-17 11:50:32 +00:00
Jens-Heiner Rechtien
a394e29369 INTEGRATION: CWS swobjpos03 (1.7.176); FILE MERGED 
2003/11/10 13:28:44 od 1.7.176.2: #113049# - further improvements to the isolated object positioning algorithms
2003/10/27 13:04:05 od 1.7.176.1: merging changes from swobjpos02
 2004-03-08 13:03:25 +00:00
Jens-Heiner Rechtien
3487d457fc INTEGRATION: CWS swobjpos03 (1.22.56); FILE MERGED 
2004/02/16 10:02:40 od 1.22.56.3: RESYNC: (1.22-1.24); FILE MERGED
resolve merge conflicts.
2003/11/10 13:31:07 od 1.22.56.2: #113049# - further improvements to the isolated object positioning algorithms
2003/10/27 13:04:03 od 1.22.56.1: merging changes from swobjpos02
 2004-03-08 13:03:11 +00:00
Jens-Heiner Rechtien
fc8ccfc3a2 INTEGRATION: CWS swobjpos03 (1.41.152); FILE MERGED 
2004/02/16 10:00:35 od 1.41.152.3: RESYNC: (1.41-1.44); FILE MERGED
resolve merge conflicts.
2003/11/21 09:43:13 od 1.41.152.2: #113949# <SwTxtFrm::Format(..)> - adjustment for isolated positioning algorithms
#i22341# <SwTxtFrm::Format(..)> - use new method
		<SwFlyAtCntFrm::CheckCharRectAndTopOfLine()>
2003/10/27 13:04:02 od 1.41.152.1: merging changes from swobjpos02
 2004-03-08 13:02:57 +00:00
Jens-Heiner Rechtien
1dd7d53340 INTEGRATION: CWS swobjpos03 (1.32.8); FILE MERGED 
2004/02/02 11:06:27 od 1.32.8.3: #i22341# <SwTxtFrm::GetTopOfLine(..)> - adjust behavior of method.
2003/11/21 09:40:24 od 1.32.8.2: #i22341# <SwTxtFrm::GetTopOfLine()> - implementation
2003/10/27 13:04:01 od 1.32.8.1: merging changes from swobjpos02
 2004-03-08 13:02:43 +00:00
Jens-Heiner Rechtien
25c0b184d9 INTEGRATION: CWS swnum01 (1.37.102); FILE MERGED 
2004/02/23 11:37:30 hbrinkm 1.37.102.5: RESYNC: (1.41-1.43); FILE MERGED
2003/12/17 17:26:23 hbrinkm 1.37.102.4: RESYNC: (1.37-1.41); FILE MERGED
2003/11/06 14:38:50 hbrinkm 1.37.102.3: #i3232#
2003/07/10 14:14:08 hbrinkm 1.37.102.2: #110778# a / 2 * 2 == a is not a tautology
2003/07/10 14:09:44 hbrinkm 1.37.102.1: #107529# a / 2 * 2 == a is not a tautology
 2004-03-08 11:26:35 +00:00
Rüdiger Timm
7a2e139e85 #115793# (Fix by OD) 2004-03-04 09:57:43 +00:00
Kurt Zenker
5b95d4e19f #100000# declare variable i once 2004-03-01 12:25:11 +00:00
Kurt Zenker
7cfd9c2607 INTEGRATION: CWS swlinespacing (1.67.10); FILE MERGED 
2004/01/12 14:58:57 od 1.67.10.1: #i11859# - adjustments and improvement for new consideration of the
		line spacing (option "Use OOo 1.1 line spacing")
 2004-02-26 16:01:15 +00:00
Kurt Zenker
74d7634c58 INTEGRATION: CWS swlinespacing (1.39.64); FILE MERGED 
2004/02/06 08:37:32 od 1.39.64.2: RESYNC: (1.39-1.40); FILE MERGED
2004/01/12 14:56:00 od 1.39.64.1: #i11859# - use new method <SwLineLayout::MaxAscentDescent(..)>
 2004-02-26 16:01:02 +00:00
Kurt Zenker
ad7e52ea46 INTEGRATION: CWS swlinespacing (1.17.94); FILE MERGED 
2004/01/12 14:53:56 od 1.17.94.1: #i11859# class <SwLineLayout> - new method <MaxAscentDescent(..)>
 2004-02-26 16:00:44 +00:00
Kurt Zenker
9bc3eec310 INTEGRATION: CWS swlinespacing (1.43.84); FILE MERGED 
2004/01/12 14:52:39 od 1.43.84.1: #i11859# - implementation of new method <SwLineLayout::MaxAscentDescent(..)
 2004-02-26 16:00:32 +00:00
Kurt Zenker
b75556692f INTEGRATION: CWS hiddentext (1.66.16); FILE MERGED 
2004/02/16 08:49:51 fme 1.66.16.8: RESYNC: (1.67-1.68); FILE MERGED
2004/01/20 12:13:42 od 1.66.16.7: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:11:17 od 1.66.16.6: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:28:26 fme 1.66.16.5: #i23660# Feature - hidden character attribute
2004/01/12 09:04:07 fme 1.66.16.4: RESYNC: (1.66-1.67); FILE MERGED
2004/01/09 15:03:06 fme 1.66.16.3: #i23660# Feature - Hidden character attribute - Footnotes in hidden text
2004/01/05 14:35:24 fme 1.66.16.2: #i23660# Feature - Hidden character attribute
2003/12/16 15:47:45 fme 1.66.16.1: #i20197# Hidden text attribute
 2004-02-26 14:33:54 +00:00
Kurt Zenker
de16df3402 INTEGRATION: CWS hiddentext (1.40.2); FILE MERGED 
2004/02/16 08:49:42 fme 1.40.2.3: RESYNC: (1.40-1.41); FILE MERGED
2004/01/20 12:13:39 od 1.40.2.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:28:26 fme 1.40.2.1: #i23660# Feature - hidden character attribute
 2004-02-26 14:33:39 +00:00
Kurt Zenker
6a11a40a66 INTEGRATION: CWS hiddentext (1.34.56); FILE MERGED 
2004/01/05 14:35:20 fme 1.34.56.1: #i23660# Feature - Hidden character attribute
 2004-02-26 14:33:24 +00:00