Commit Graph

145 Commits

Author SHA1 Message Date
Kurt Zenker
edd7e2d75b INTEGRATION: CWS swobjpos04 (1.47.56); FILE MERGED
2004/06/30 14:44:35 od 1.47.56.6: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 09:01:12 od 1.47.56.5: #i28701# - correct comment
2004/05/25 07:11:45 od 1.47.56.4: remove 'merge conlfict' mark
2004/05/24 15:36:07 od 1.47.56.3: RESYNC: (1.47-1.51); FILE MERGED
resolve merge conflict
2004/05/24 12:48:41 od 1.47.56.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/05 10:26:33 od 1.47.56.1: #i28701# class <ViewShell> - Introduce new compatibility option 'Consider
	 		     wrapping style on object positioning'
2004-08-02 13:19:04 +00:00
Rüdiger Timm
a2a08f8a9a INTEGRATION: CWS aw013 (1.12.174); FILE MERGED
2004/06/24 09:35:44 aw 1.12.174.2: #i29181#
2004/06/15 16:30:33 aw 1.12.174.1: #117095#
2004-07-12 14:49:05 +00:00
Hans-Joachim Lankenau
c9b32f9390 INTEGRATION: CWS swdrawpositioning (1.16.38); FILE MERGED
2004/06/01 11:56:59 od 1.16.38.1: #i26791# - usage of new member <ViewShell::mbInConstructor>
2004-06-28 12:46:47 +00:00
Hans-Joachim Lankenau
d408c2fd28 INTEGRATION: CWS swdrawpositioning (1.12.36); FILE MERGED
2004/04/07 09:28:49 od 1.12.36.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:46:32 +00:00
Hans-Joachim Lankenau
6daad0c7ae INTEGRATION: CWS swqbugfixes01 (1.11.228); FILE MERGED
2004/05/28 06:05:45 od 1.11.228.1: #i29527# <ViewShell::Scroll()> - add flag SCROLL_NOWINDOWINVALIDATE to
	 call of method <Window::Scroll(..)> to avoid unnecessary repaints
	 due to invalidate window areas.
2004-06-28 12:01:43 +00:00
Rüdiger Timm
96fbac1c75 INTEGRATION: CWS swundo01 (1.27.98); FILE MERGED
2004/05/25 14:43:29 hbrinkm 1.27.98.1: #116912# Compile time fixes
2004-05-25 14:07:41 +00:00
Jens-Heiner Rechtien
6fff0cca3c INTEGRATION: CWS num04 (1.44.60); FILE MERGED
2004/04/07 10:53:35 hbrinkm 1.44.60.3: RESYNC: (1.44-1.46); FILE MERGED
2004/04/07 09:16:06 hbrinkm 1.44.60.2: #i23728# IsOldNumbering
2004/04/01 15:06:47 hbrinkm 1.44.60.1: #i23728#
2004-05-11 11:05:51 +00:00
Jens-Heiner Rechtien
96a66125d5 INTEGRATION: CWS swtextwrap (1.47.14); FILE MERGED
2004/04/23 07:25:39 fme 1.47.14.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:41 +00:00
Jens-Heiner Rechtien
a29c401536 INTEGRATION: CWS dialogdiet01 (1.42.124); FILE MERGED
2004/03/31 05:19:10 gyang 1.42.124.2: RESYNC: (1.42-1.46); FILE MERGED
2004/03/26 09:11:53 mwu 1.42.124.1: sw model converted. 20040326
2004-05-10 15:16:55 +00:00
Rüdiger Timm
26dee7e25a INTEGRATION: CWS swqod01 (1.46.2); FILE MERGED
2004/04/28 07:53:42 od 1.46.2.2: RESYNC: (1.46-1.47); FILE MERGED
2004/04/23 14:43:47 od 1.46.2.1: #116347# - clear and restore also line color at window before a paint
2004-05-03 13:24:37 +00:00
Sander Vesik
9ea0795c3a INTEGRATION: CWS gt04 (1.5.50); FILE MERGED
2004/03/05 13:22:29 od 1.5.50.1: #i18143# class <SwPagePreviewLayout> - implementation of switching the
	 book preview mode.
2004-04-21 08:40:41 +00:00
Rüdiger Timm
259188444e INTEGRATION: CWS swobjpos05 (1.44.16); FILE MERGED
2004/03/25 10:19:43 od 1.44.16.4: RESYNC: (1.44-1.46); FILE MERGED
resolve merge conflict.
2004/03/18 13:48:56 od 1.44.16.3: #i11860# - invalidate of the position of all objects, if option
	   'UseFormerObjectPositioning' change its value.
2004/03/15 09:11:36 od 1.44.16.2: #i11860# - correction of implementation <ViewShell::SetUseFormerObjectPositioning(..)>
2004/03/12 07:35:40 od 1.44.16.1: #i11860# - implementation of new method <ViewShell::IsFormerObjectPositioning()>
	   and <ViewShell::SetUseFormerObjectPositioning(..)>
2004-03-31 14:10:49 +00:00
Kurt Zenker
73abd01327 INTEGRATION: CWS swformatcells (1.42.110); FILE MERGED
2004/03/03 08:56:13 od 1.42.110.2: RESYNC: (1.42-1.44); FILE MERGED
resolve merge conflict.
2004/02/23 15:55:25 od 1.42.110.1: #106629# - implementation of new methods <ViewShell::IsAddParaSpacingToTableCells()>
	   and <ViewShell::SetAddParaSpacingToTableCells(..)>
2004-03-23 10:26:32 +00:00
Oliver Bolte
82f529f034 INTEGRATION: CWS os26 (1.42.42); FILE MERGED
2004/01/08 15:02:40 os 1.42.42.1: #105372# code of InsertHeader/Footer of SW/Web removed
2004-03-17 11:17:06 +00:00
Kurt Zenker
c41adc31f8 INTEGRATION: CWS swlinespacing (1.42.48); FILE MERGED
2004/01/12 15:00:40 od 1.42.48.1: #i11859# - implementation of new methods <ViewShell::IsFormerLineSpacing()>
		and <ViewShell::SetUseFormerLineSpacing(..)>
2004-02-26 16:01:29 +00:00
Kurt Zenker
bfe48f2bb0 INTEGRATION: CWS hiddentext (1.23.308); FILE MERGED
2004/02/10 09:49:58 fme 1.23.308.3: RESYNC: (1.24-1.25); FILE MERGED
2004/01/12 08:56:35 fme 1.23.308.2: RESYNC: (1.23-1.24); FILE MERGED
2004/01/07 07:14:06 os 1.23.308.1: #i23614# the callers of ViewShell::Prt() have to switch off hidden paragraphs
2004-02-26 14:37:32 +00:00
Kurt Zenker
2e6c52f09a INTEGRATION: CWS hiddentext (1.15.254); FILE MERGED
2003/12/17 15:31:34 os 1.15.254.1: #i23614# new Feature: Hidden text
2004-02-26 14:37:17 +00:00
Kurt Zenker
ab655647f4 INTEGRATION: CWS hiddentext (1.41.18); FILE MERGED
2004/01/12 08:56:22 fme 1.41.18.4: RESYNC: (1.41-1.42); FILE MERGED
2004/01/08 15:30:02 fme 1.41.18.3: #i23660# Feature - Hidden text attribute
2004/01/05 14:41:31 fme 1.41.18.2: #i23660# Feature - Hidden character attribute
2003/12/17 15:31:33 os 1.41.18.1: #i23614# new Feature: Hidden text
2004-02-26 14:37:03 +00:00
Oliver Bolte
1752e392d3 INTEGRATION: CWS vcl17 (1.23.336); FILE MERGED
2004/01/21 18:09:52 pl 1.23.336.2: RESYNC: (1.23-1.25); FILE MERGED
2003/12/15 13:04:07 ssa 1.23.336.1: #i21775# always perform rotation when landscape printing is requested
2004-02-20 07:45:38 +00:00
Oliver Bolte
4862a51996 INTEGRATION: CWS swq03 (1.11.16); FILE MERGED
2004/01/15 08:22:50 od 1.11.16.1: #i23500# - remove unnecessary method <SwViewImp::PaintFlyChilds(..)>
2004-02-16 10:59:21 +00:00
Oliver Bolte
201d1c21de INTEGRATION: CWS cellbreak (1.23.154); FILE MERGED
2003/11/18 14:01:58 fme 1.23.154.1: #i2109# Feature - Split table rows
2004-01-13 10:22:35 +00:00
Rüdiger Timm
d905624a73 INTEGRATION: CWS geordi2q12 (1.4.50); FILE MERGED
2004/01/07 12:14:52 hr 1.4.50.1: #111934#: merge CWS sw7pp2a -> SRC680
2004-01-07 15:34:14 +00:00
Vladimir Glazounov
0eb2923472 INTEGRATION: CWS vclcleanup02 (1.23.304); FILE MERGED
2003/12/04 15:56:38 mt 1.23.304.1: #i23061# Removed/Changed old StarView stuff
2004-01-06 17:20:40 +00:00
Vladimir Glazounov
239883d995 INTEGRATION: CWS aw007 (1.10.20); FILE MERGED
2003/12/09 10:02:05 aw 1.10.20.1: #114231#
Secure the InitRedraw call with Push(PUSH_LINECOLOR), Pop() calls to save/restore the SW LineColor
2003-12-16 12:06:08 +00:00
Rüdiger Timm
aca7b9a088 INTEGRATION: CWS ooo20031110 (1.21.180); FILE MERGED
2003/11/13 10:57:05 waratah 1.21.180.1: #i22301# correct the for scope problems in the code
2003-12-01 16:24:59 +00:00
Rüdiger Timm
399d2a65f3 INTEGRATION: CWS geordi2q10 (1.41.2); FILE MERGED
2003/11/27 08:56:49 rt 1.41.2.1: #111934#: join CWS sw7pp1b
2003-12-01 08:43:14 +00:00
Rüdiger Timm
944720edde INTEGRATION: CWS geordi2q10 (1.10.190); FILE MERGED
2003/11/27 08:56:49 rt 1.10.190.1: #111934#: join CWS sw7pp1b
2003-12-01 08:42:57 +00:00
Rüdiger Timm
b303ae0103 INTEGRATION: CWS geordi2q10 (1.3.298); FILE MERGED
2003/11/26 16:20:45 rt 1.3.298.1: #111934#: join CWS sw7pp1a
2003-12-01 08:42:43 +00:00
Rüdiger Timm
719553f8b4 INTEGRATION: CWS aw003 (1.37.38); FILE MERGED
2003/11/04 16:00:52 aw 1.37.38.5: RESYNC: (1.39-1.40); FILE MERGED
2003/10/23 14:39:43 aw 1.37.38.4: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 14:56:49 aw 1.37.38.3: RESYNC: (1.38-1.39); FILE MERGED
2003/06/30 18:06:59 aw 1.37.38.2: RESYNC: (1.37-1.38); FILE MERGED
2003/06/30 13:38:50 aw 1.37.38.1: #110094#
2003-11-24 15:11:38 +00:00
Rüdiger Timm
7235b83e1d INTEGRATION: CWS aw003 (1.8.6); FILE MERGED
2003/10/23 14:39:42 aw 1.8.6.6: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/14 08:24:28 aw 1.8.6.5: #111111#
2003/10/07 11:34:16 aw 1.8.6.4: #111097#
2003/08/20 11:25:04 aw 1.8.6.3: RESYNC: (1.8-1.9); FILE MERGED
2003/07/25 16:22:34 aw 1.8.6.2: #110094#
Changed Paint calls on objects to DoPaintObject to identify such cases
2003/06/30 13:38:49 aw 1.8.6.1: #110094#
2003-11-24 15:11:25 +00:00
Oliver Bolte
5bb0998df2 INTEGRATION: CWS qdiet01 (1.3.236); FILE MERGED
2003/10/09 14:48:28 mh 1.3.236.1: del: unused file, #i18390#
2003-10-20 15:52:00 +00:00
Kurt Zenker
8c16d24140 INTEGRATION: CWS extleading (1.38.36); FILE MERGED
2003/10/02 08:33:23 fme 1.38.36.7: RESYNC: (1.38-1.39); FILE MERGED
2003/07/24 11:38:24 fme 1.38.36.6: #110641# Feature - High resolution virtual device
2003/07/21 08:09:56 fme 1.38.36.5: #110641# New flag for new high resolution virtual device
2003/07/14 08:05:01 fme 1.38.36.4: #110641# Feature - External Leading
2003/07/14 07:57:58 fme 1.38.36.3: #110641# Feature - External Leading - Invalidation function added
2003/07/10 14:52:24 fme 1.38.36.2: #110641# Feature - External Leading
2003/07/08 11:43:12 fme 1.38.36.1: #110641# Feature - External Leading
2003-10-15 08:58:59 +00:00
Kurt Zenker
0503c067e7 INTEGRATION: CWS OS18 (1.38.132); FILE MERGED
2003/08/29 08:16:01 os 1.38.132.1: #i18490# set PDFExport view option separately to prevent repaint
2003-09-11 08:40:50 +00:00
Vladimir Glazounov
946b606da9 INTEGRATION: CWS sw024 (1.9.128); FILE MERGED
2003/07/18 15:48:29 fme 1.9.128.1: #110937# Avoid division by 0
2003-07-22 07:29:18 +00:00
Vladimir Glazounov
14d5dd9025 INTEGRATION: CWS aig02 (1.22.38); FILE MERGED
2003/06/26 18:08:39 od 1.22.38.1: #108784# - further adjustments for support of drawing objects in header/footer
2003-07-04 12:26:00 +00:00
Vladimir Glazounov
37d701fd91 INTEGRATION: CWS aig02 (1.8.38); FILE MERGED
2003/07/02 16:07:53 od 1.8.38.3: #108784# - further adjustments for support of drawing objects in header/footer
2003/06/26 18:09:23 od 1.8.38.2: #108784# - further adjustments for support of drawing objects in header/footer
2003/06/23 15:26:55 od 1.8.38.1: #108784# - further adjustments for supporting drawing objects in header/footer
2003-07-04 12:25:49 +00:00
Rüdiger Timm
e87dd9c039 INTEGRATION: CWS sw016 (1.14.50); FILE MERGED
2003/06/06 09:58:51 fme 1.14.50.1: #109993# Additional reference device needed for prospekt printing
2003-06-12 06:40:11 +00:00
Rüdiger Timm
e3f981b2ef INTEGRATION: CWS sw016 (1.37.46); FILE MERGED
2003/06/06 09:58:37 fme 1.37.46.1: #109993# Additional reference device needed for prospekt printing
2003-06-12 06:40:01 +00:00
Rüdiger Timm
7b5f63c700 INTEGRATION: CWS sw016 (1.19.50); FILE MERGED
2003/06/06 10:53:26 hbrinkm 1.19.50.2: RESYNC: (1.19-1.20); FILE MERGED
2003/06/06 09:58:05 fme 1.19.50.1: #109993# Additional reference device needed for prospekt printing
2003-06-12 06:39:51 +00:00
Vladimir Glazounov
c33db160ea INTEGRATION: CWS sw013 (1.19.16); FILE MERGED
2003/05/06 09:00:58 od 1.19.16.1: #i14016# <ViewShell::PrintPreViewPage(..)>/<ViewShell::PrintProspect(..)> - consider empty pages on calculation of scaling.
2003-05-28 11:52:48 +00:00
Vladimir Glazounov
a55189e7aa INTEGRATION: CWS uaa02 (1.35.10); FILE MERGED
2003/04/11 17:21:28 mt 1.35.10.1: #108656# Moved accessibility from drafts to final
2003-04-24 15:14:17 +00:00
Vladimir Glazounov
56c3755c46 INTEGRATION: CWS os8 (1.19.2.5.46); FILE MERGED
2003/04/07 22:07:33 os 1.19.2.5.46.2: RESYNC: (1.19.2.5-1.22); FILE MERGED
2003/04/03 07:12:30 os 1.19.2.5.46.1: #108583# precompiled headers removed
2003-04-17 13:48:12 +00:00
Vladimir Glazounov
9500e76761 INTEGRATION: CWS os8 (1.10.2.2.54); FILE MERGED
2003/04/07 22:06:50 os 1.10.2.2.54.2: RESYNC: (1.10.2.2-1.12); FILE MERGED
2003/04/03 07:12:30 os 1.10.2.2.54.1: #108583# precompiled headers removed
2003-04-17 13:47:59 +00:00
Vladimir Glazounov
0c24418782 INTEGRATION: CWS os8 (1.32.2.4.46); FILE MERGED
2003/04/07 22:07:27 os 1.32.2.4.46.2: RESYNC: (1.32.2.4-1.35); FILE MERGED
2003/04/03 07:12:30 os 1.32.2.4.46.1: #108583# precompiled headers removed
2003-04-17 13:47:49 +00:00
Vladimir Glazounov
389ad43a0f INTEGRATION: CWS os8 (1.16.2.2.54); FILE MERGED
2003/04/07 22:07:21 os 1.16.2.2.54.2: RESYNC: (1.16.2.2-1.18); FILE MERGED
2003/04/03 07:12:29 os 1.16.2.2.54.1: #108583# precompiled headers removed
2003-04-17 13:47:40 +00:00
Vladimir Glazounov
e11c9f0823 INTEGRATION: CWS os8 (1.20.2.3.54); FILE MERGED
2003/04/03 07:12:29 os 1.20.2.3.54.1: #108583# precompiled headers removed
2003-04-17 13:47:29 +00:00
Vladimir Glazounov
fda61842f0 INTEGRATION: CWS os8 (1.7.138); FILE MERGED
2003/04/03 07:12:29 os 1.7.138.1: #108583# precompiled headers removed
2003-04-17 13:47:20 +00:00
Vladimir Glazounov
b01267f5b1 INTEGRATION: CWS os8 (1.7.2.1.20); FILE MERGED
2003/04/03 07:12:28 os 1.7.2.1.20.1: #108583# precompiled headers removed
2003-04-17 13:47:08 +00:00
Vladimir Glazounov
2c4cbceb78 INTEGRATION: CWS os8 (1.1.1.1.46.1.112); FILE MERGED
2003/04/03 07:12:28 os 1.1.1.1.46.1.112.1: #108583# precompiled headers removed
2003-04-17 13:46:56 +00:00
Vladimir Glazounov
80f7db1be5 INTEGRATION: CWS sw009 (1.10.2.2.40); FILE MERGED
2003/03/28 11:32:29 od 1.10.2.2.40.1: #108470# <ViewShell::ViewShell(..)> - initialize print preview layout after layout is created
2003-04-17 09:14:33 +00:00