Commit Graph

766 Commits

Author SHA1 Message Date
Oliver Bolte
7eb0ccf31b INTEGRATION: CWS swqbugfixes06 (1.43.6); FILE MERGED
2004/08/25 15:01:35 od 1.43.6.2: #i3317# class <NotifyLayoutOfPageInProgress> - reset temporarly application
        of straightforward positioning process for each object on the page
2004/08/24 08:09:05 od 1.43.6.1: #i33313# - correct notification of drawing layer about changes at a
           drawing object
2004-09-09 09:58:01 +00:00
Oliver Bolte
67f4a5a693 INTEGRATION: CWS swqbugfixes06 (1.66.6); FILE MERGED
2004/08/26 08:09:44 od 1.66.6.2: RESYNC: (1.66-1.67); FILE MERGED
2004/08/25 14:59:16 od 1.66.6.1: #i3317# <Notify_Background(..)> - process always complete area.
2004-09-09 09:57:44 +00:00
Oliver Bolte
de500b9d5c INTEGRATION: CWS swqbugfixes06 (1.10.6); FILE MERGED
2004/08/12 14:22:56 od 1.10.6.1: #i28795# <SwFlyInCntFrm::MakeObjPos()> - no <::DeepCalc()> and
         <GetAnchorFrm()->GetFormatted()> any more.
2004-09-09 09:57:16 +00:00
Oliver Bolte
2eabaa0891 INTEGRATION: CWS swqbugfixes06 (1.41.6); FILE MERGED
2004/08/26 08:09:35 od 1.41.6.3: RESYNC: (1.41-1.42); FILE MERGED
2004/08/25 14:56:19 od 1.41.6.2: #i3317# - apply temporarly straightforward positioning process, if
          position oscillation is detected or object overlaps with previous
          column.
2004/08/12 14:22:56 od 1.41.6.1: #i28795# <SwFlyInCntFrm::MakeObjPos()> - no <::DeepCalc()> and
         <GetAnchorFrm()->GetFormatted()> any more.
2004-09-09 09:57:01 +00:00
Oliver Bolte
09fe1fcd31 INTEGRATION: CWS swqbugfixes06 (1.63.6); FILE MERGED
2004/08/25 14:57:59 od 1.63.6.2: #i3317# <CalcCntnt(..)> - correction: restart layout process, if position
        of anchored object is locked after it's positioned.
2004/08/24 08:09:05 od 1.63.6.1: #i33313# - correct notification of drawing layer about changes at a
           drawing object
2004-09-09 09:56:46 +00:00
Oliver Bolte
92720007d6 INTEGRATION: CWS swqbugfixes06 (1.4.6); FILE MERGED
2004/08/30 12:53:51 od 1.4.6.2: RESYNC: (1.4-1.5); FILE MERGED
2004/08/25 14:53:29 od 1.4.6.1: #i3317# class <SwAnchoredObject> - implementation for applying temporarly
        the straightforward positioning process.
2004-09-09 09:56:32 +00:00
Oliver Bolte
dcd26dd2c8 INTEGRATION: CWS swqbugfixes06 (1.3.6); FILE MERGED
2004/08/31 06:16:25 od 1.3.6.6: finishing resolution of merge conflicts.
2004/08/30 12:53:41 od 1.3.6.5: RESYNC: (1.3-1.4); FILE MERGED
2004/08/25 14:55:32 od 1.3.6.4: #i3317# - apply temporarly straightforward positioning process, if
          position oscillation is detected or object overlaps with previous
          column.
2004/08/24 08:07:25 od 1.3.6.3: #i33313# <SwAnchoredDrawObject::AdjustPositioningAttr(..)>
         - handle new parameter <_pNewObjRect>
2004/08/12 14:51:35 od 1.3.6.2: #i32270# <SwAnchoredDrawObject::InvalidateObjPos()> - also invalidate page
	 frame, at which the drawing object is registered at.
2004/08/12 14:24:56 od 1.3.6.1: #i28795# <SwAnchoredDrawObject::MakeObjPos()> - adapt positioning algorithm
         for at-paragraph|at-character anchored Writer fly frames for
         drawing objects.
2004-09-09 09:56:17 +00:00
Jens-Heiner Rechtien
fd697d4dda INTEGRATION: CWS pdf01 (1.25.10); FILE MERGED
2004/08/06 15:10:35 pl 1.25.10.2: RESYNC: (1.25-1.27); FILE MERGED
2004/06/17 10:34:57 fme 1.25.10.1: #i12836# - Enhanced pdf export - Notes, links, references, outline
2004-09-08 15:52:50 +00:00
Jens-Heiner Rechtien
9cc4a097d0 INTEGRATION: CWS pdf01 (1.37.10); FILE MERGED
2004/08/06 15:13:45 pl 1.37.10.2: RESYNC: (1.37-1.39); FILE MERGED
2004/06/17 10:34:58 fme 1.37.10.1: #i12836# - Enhanced pdf export - Notes, links, references, outline
2004-09-08 15:10:36 +00:00
Jens-Heiner Rechtien
c9f42ec694 INTEGRATION: CWS pdf01 (1.81.4); FILE MERGED
2004/08/13 08:36:09 fme 1.81.4.5: #i16816# tagged pdf - non struct element also for new table border paint routine
2004/08/06 15:10:44 pl 1.81.4.4: RESYNC: (1.81-1.83); FILE MERGED
2004/07/13 07:41:48 fme 1.81.4.3: #i12836# Enhanced pdf export
2004/07/12 09:59:39 fme 1.81.4.2: #i12836# Enhanced pdf export
2004/07/09 12:45:16 fme 1.81.4.1: #i12836# Enhanced pdf export
2004-09-08 15:10:21 +00:00
Jens-Heiner Rechtien
da12dc5adf INTEGRATION: CWS swundo03 (1.48.34); FILE MERGED
2004/08/12 15:01:15 hbrinkm 1.48.34.2: RESYNC: (1.48-1.49); FILE MERGED
2004/08/04 15:01:40 hbrinkm 1.48.34.1: #115575#,#115582#
2004-09-08 14:20:23 +00:00
Kurt Zenker
37f37c4b89 INTEGRATION: CWS help2 (1.43.48); FILE MERGED
2004/08/30 12:02:50 od 1.43.48.1: #117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.#117736# <SwLayAction::FormatCntnt(..)> - allow format of objects on
         interruption of the action, if it's the format for this interrupt.
2004-08-30 15:32:26 +00:00
Rüdiger Timm
bfba3d53ae INTEGRATION: CWS tune03 (1.48.6); FILE MERGED
2004/08/09 21:31:23 mhu 1.48.6.2: RESYNC: (1.48-1.49); FILE MERGED
2004/07/19 19:10:55 mhu 1.48.6.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
2004-08-23 07:44:56 +00:00
Rüdiger Timm
7668aea5f8 INTEGRATION: CWS swdrawobjapi (1.39.58); FILE MERGED
2004/08/13 06:45:58 od 1.39.58.3: #i31698# - correct syntax error introduced by merge
2004/08/12 07:13:30 od 1.39.58.2: RESYNC: (1.39-1.40); FILE MERGED
resolve merge conflict.
2004/07/29 13:22:22 od 1.39.58.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:02:37 +00:00
Rüdiger Timm
91d2414b00 INTEGRATION: CWS swdrawobjapi (1.48.58); FILE MERGED
2004/08/12 07:08:34 od 1.48.58.4: RESYNC: (1.48-1.49); FILE MERGED
resolve merge conflict.
2004/08/06 13:52:12 od 1.48.58.3: #i28749# - adjustments for transform shape position between OpenOffice.org
	   file format and OASIS Open Office file format
2004/08/06 04:46:56 od 1.48.58.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:21 od 1.48.58.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:02:24 +00:00
Rüdiger Timm
0e3bf5f613 INTEGRATION: CWS swdrawobjapi (1.2.60); FILE MERGED
2004/08/12 07:08:26 od 1.2.60.2: RESYNC: (1.2-1.4); FILE MERGED
resolve merge conflicts.
2004/07/29 13:22:21 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:02:09 +00:00
Rüdiger Timm
b1f803fdef INTEGRATION: CWS swdrawobjapi (1.2.60); FILE MERGED
2004/08/12 05:34:40 od 1.2.60.4: resolve 'conflict' introduced by inadequat merge
2004/08/10 09:31:46 od 1.2.60.3: #i28749# class <SwAnchoredDrawObject> - implementation of position
         attribute converion from OpenOffice.org file format shape position
2004/08/06 04:46:56 od 1.2.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:21 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:01:56 +00:00
Oliver Bolte
2513329487 INTEGRATION: CWS tune05 (1.7.568); FILE MERGED
2004/06/23 12:50:40 cmc 1.7.568.1: #i30554# remove unused code inside #ifdef USED guards
2004-08-12 11:31:57 +00:00
Oliver Bolte
8f61eb65ac INTEGRATION: CWS tune05 (1.34.38); FILE MERGED
2004/06/25 11:27:40 cmc 1.34.38.1: #i30554# SwSectionFrm::IsAncestorOf unused
2004-08-12 11:31:44 +00:00
Oliver Bolte
52745a0ea6 INTEGRATION: CWS tune05 (1.9.54); FILE MERGED
2004/07/23 16:08:56 mhu 1.9.54.2: RESYNC: (1.9-1.10); FILE MERGED
2004/06/24 10:38:26 cmc 1.9.54.1: #i30554# make lcl_foos static to emphasis their lclness
2004-08-12 11:31:29 +00:00
Oliver Bolte
310ead8f72 INTEGRATION: CWS tune05 (1.4.568); FILE MERGED
2004/07/21 13:32:38 cmc 1.4.568.1: #i30554# SwEndnoter::Collect unused (empty function anyway)
2004-08-12 11:31:15 +00:00
Oliver Bolte
d4024fa0d3 INTEGRATION: CWS tune05 (1.64.38); FILE MERGED
2004/07/23 16:07:59 mhu 1.64.38.2: RESYNC: (1.64-1.65); FILE MERGED
2004/06/29 10:35:39 cmc 1.64.38.1: #i30554# MA_ParkCrsr now unused
2004-08-12 11:30:51 +00:00
Oliver Bolte
d8a79c137d INTEGRATION: CWS tune05 (1.39.138); FILE MERGED
2004/07/23 16:07:26 mhu 1.39.138.2: RESYNC: (1.39-1.40); FILE MERGED
2004/06/24 10:37:59 cmc 1.39.138.1: #i30554# IsInProgress unused
2004-08-12 11:30:36 +00:00
Oliver Bolte
a816d277fe INTEGRATION: CWS tune05 (1.26.38); FILE MERGED
2004/07/23 16:07:07 mhu 1.26.38.3: RESYNC: (1.26-1.27); FILE MERGED
2004/07/22 08:39:17 cmc 1.26.38.2: #i30554# SwFtnContFrm::FindEndNote unused
2004/06/23 12:50:39 cmc 1.26.38.1: #i30554# remove unused code inside #ifdef USED guards
2004-08-12 11:30:21 +00:00
Oliver Bolte
b4cad68374 INTEGRATION: CWS tune05 (1.12.232); FILE MERGED
2004/06/24 10:36:54 cmc 1.12.232.1: #i30554# make lcl_foos static to emphasis their lclness
2004-08-12 11:30:06 +00:00
Oliver Düsterhoff
a36111f17c #i28701# integration of cws swobjpos04 into master 2004-08-03 05:05:14 +00:00
Oliver Düsterhoff
dcb4116047 #i28701# integration of cws swobjpos04 into master 2004-08-03 05:00:02 +00:00
Kurt Zenker
0e1cb1cd73 INTEGRATION: CWS swobjpos04 (1.51.30); FILE MERGED
2004/07/13 01:37:10 od 1.51.30.6: RESYNC: (1.51-1.56); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:43 od 1.51.30.5: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:30 od 1.51.30.4: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:01 od 1.51.30.3: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/05/24 13:25:07 od 1.51.30.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:44 od 1.51.30.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:13:55 +00:00
Kurt Zenker
2016a567b6 INTEGRATION: CWS swobjpos04 (1.34.30); FILE MERGED
2004/07/13 01:36:54 od 1.34.30.8: RESYNC: (1.35-1.39); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:42 od 1.34.30.7: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:29 od 1.34.30.6: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:01 od 1.34.30.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:57:57 od 1.34.30.4: #i28701# - correct comment
2004/05/24 15:33:27 od 1.34.30.3: RESYNC: (1.34-1.35); FILE MERGED
2004/05/24 13:23:47 od 1.34.30.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/07 15:31:43 od 1.34.30.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:13:41 +00:00
Kurt Zenker
c2286a8121 INTEGRATION: CWS swobjpos04 (1.55.30); FILE MERGED
2004/07/13 01:36:46 od 1.55.30.8: RESYNC: (1.57-1.63); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:41 od 1.55.30.7: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:28 od 1.55.30.6: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:00 od 1.55.30.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 14:05:13 od 1.55.30.4: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/06/14 13:38:58 od 1.55.30.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 15:33:16 od 1.55.30.2: RESYNC: (1.55-1.57); FILE MERGED
2004/05/24 13:23:28 od 1.55.30.1: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004-08-02 13:13:28 +00:00
Kurt Zenker
f62e46af6e INTEGRATION: CWS swobjpos04 (1.37.30); FILE MERGED
2004/07/13 01:36:38 od 1.37.30.5: RESYNC: (1.37-1.39); FILE MERGED
resolve merge conflicts.
2004/06/30 15:05:00 od 1.37.30.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:57:57 od 1.37.30.3: #i28701# - correct comment
2004/05/24 13:22:14 od 1.37.30.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/07 15:31:43 od 1.37.30.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:13:14 +00:00
Kurt Zenker
261eebf6e1 INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/02 14:58:27 od 1.1.2.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:00 od 1.1.2.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 13:38:57 od 1.1.2.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 13:05:14 od 1.1.2.2: #i28701# - implementation of new class <SwSortedObjs>
2004/05/07 15:28:07 od 1.1.2.1: #i28701# - implementation of class <SwSortedObjsImpl>
2004-08-02 13:13:02 +00:00
Kurt Zenker
36ca907fda INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/02 14:58:26 od 1.1.2.4: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:00 od 1.1.2.3: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/05/24 13:05:14 od 1.1.2.2: #i28701# - implementation of new class <SwSortedObjs>
2004/05/07 15:27:50 od 1.1.2.1: #i28701# - implementation of class <SwSortedObjs>
2004-08-02 13:12:51 +00:00
Kurt Zenker
a5ddfda033 INTEGRATION: CWS swobjpos04 (1.32.146); FILE MERGED
2004/07/13 01:36:28 od 1.32.146.7: RESYNC: (1.33-1.34); FILE MERGED
2004/07/12 08:15:41 od 1.32.146.6: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:26 od 1.32.146.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:59 od 1.32.146.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 13:38:55 od 1.32.146.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 15:33:07 od 1.32.146.2: RESYNC: (1.32-1.33); FILE MERGED
2004/05/24 13:21:55 od 1.32.146.1: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004-08-02 13:12:40 +00:00
Kurt Zenker
290c8b8610 INTEGRATION: CWS swobjpos04 (1.79.28); FILE MERGED
2004/06/30 15:04:59 od 1.79.28.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:56:07 od 1.79.28.4: #i28701# - correct comment
2004/05/24 15:32:58 od 1.79.28.3: RESYNC: (1.79-1.81); FILE MERGED
2004/05/24 13:21:11 od 1.79.28.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/07 15:31:42 od 1.79.28.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:12:27 +00:00
Kurt Zenker
2bea46ea46 INTEGRATION: CWS swobjpos04 (1.32.88); FILE MERGED
2004/07/13 01:36:01 od 1.32.88.7: RESYNC: (1.32-1.34); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:40 od 1.32.88.6: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:25 od 1.32.88.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:58 od 1.32.88.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:56:06 od 1.32.88.3: #i28701# - correct comment
2004/05/24 13:20:49 od 1.32.88.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:41 od 1.32.88.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:12:12 +00:00
Kurt Zenker
ca104a3cda INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/22 08:55:24 od 1.1.2.4: #i28701# - further adjustments for the new object positioning algorithm
2004/07/12 08:15:40 od 1.1.2.3: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:25 od 1.1.2.2: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:11 od 1.1.2.1: #i28701# - implementation of new class <SwObjectFormatter> and
	   declaration and implementation of its subclasses
2004-08-02 13:11:58 +00:00
Kurt Zenker
1e773f5261 INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/23 13:09:24 od 1.1.2.5: #i28701# - further adjustments for the new object positioning algorithm
2004/07/22 08:55:24 od 1.1.2.4: #i28701# - further adjustments for the new object positioning algorithm
2004/07/12 08:15:40 od 1.1.2.3: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:25 od 1.1.2.2: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:13 od 1.1.2.1: #i28701# - implementation of new class <SwObjectFormatter> and
	   declaration and implementation of its subclasses
2004-08-02 13:11:47 +00:00
Kurt Zenker
182adb6421 INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/22 08:55:23 od 1.1.2.3: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:25 od 1.1.2.2: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:11 od 1.1.2.1: #i28701# - implementation of new class <SwObjectFormatter> and
	   declaration and implementation of its subclasses
2004-08-02 13:11:37 +00:00
Kurt Zenker
cf332533ab INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/22 08:55:23 od 1.1.2.3: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:24 od 1.1.2.2: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:12 od 1.1.2.1: #i28701# - implementation of new class <SwObjectFormatter> and
	   declaration and implementation of its subclasses
2004-08-02 13:11:27 +00:00
Kurt Zenker
988264bc63 INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/07/22 08:55:23 od 1.1.2.5: #i28701# - further adjustments for the new object positioning algorithm
2004/07/14 07:54:53 od 1.1.2.4: #i28701# - syntax correction
2004/07/12 08:15:39 od 1.1.2.3: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:24 od 1.1.2.2: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:12 od 1.1.2.1: #i28701# - implementation of new class <SwObjectFormatter> and
	   declaration and implementation of its subclasses
2004-08-02 13:11:16 +00:00
Kurt Zenker
fd685257d1 INTEGRATION: CWS swobjpos04 (1.1.2); FILE ADDED
2004/06/30 15:02:59 od 1.1.2.1: #i28701# - implementation of new class <SwMovedFwdFrmsByObjPos>
2004-08-02 13:11:04 +00:00
Kurt Zenker
e427a5493b INTEGRATION: CWS swobjpos04 (1.8.112); FILE MERGED
2004/06/30 15:04:58 od 1.8.112.2: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/05/07 15:28:56 od 1.8.112.1: #i28701# - add new source files <sortedobjs.cxx> and <sortedobjsimpl.cxx>
2004-08-02 13:10:53 +00:00
Kurt Zenker
ca3e83197c INTEGRATION: CWS swobjpos04 (1.4.522); FILE MERGED
2004/06/30 15:04:58 od 1.4.522.1: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004-08-02 13:10:40 +00:00
Kurt Zenker
04430d9a7c INTEGRATION: CWS swobjpos04 (1.16.28); FILE MERGED
2004/06/30 15:04:58 od 1.16.28.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:56:06 od 1.16.28.4: #i28701# - correct comment
2004/05/24 15:32:45 od 1.16.28.3: RESYNC: (1.16-1.17); FILE MERGED
2004/05/24 13:20:16 od 1.16.28.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/07 15:31:40 od 1.16.28.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:10:26 +00:00
Kurt Zenker
805b5e9aac INTEGRATION: CWS swobjpos04 (1.39.86); FILE MERGED
2004/07/23 13:09:23 od 1.39.86.10: #i28701# - further adjustments for the new object positioning algorithm
2004/07/22 08:55:23 od 1.39.86.9: #i28701# - further adjustments for the new object positioning algorithm
2004/07/13 01:35:37 od 1.39.86.8: RESYNC: (1.40-1.42); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:39 od 1.39.86.7: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:23 od 1.39.86.6: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:57 od 1.39.86.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 13:38:53 od 1.39.86.4: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 15:32:38 od 1.39.86.3: RESYNC: (1.39-1.40); FILE MERGED
resolve merge conflict.
2004/05/24 13:19:52 od 1.39.86.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:38 od 1.39.86.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:10:13 +00:00
Kurt Zenker
2722db6aa3 INTEGRATION: CWS swobjpos04 (1.16.90); FILE MERGED
2004/07/13 01:35:27 od 1.16.90.5: RESYNC: (1.16-1.17); FILE MERGED
2004/07/02 14:58:23 od 1.16.90.4: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:57 od 1.16.90.3: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:56:05 od 1.16.90.2: #i28701# - correct comment
2004/05/24 13:04:43 od 1.16.90.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:09:57 +00:00
Kurt Zenker
18dab4e82a INTEGRATION: CWS swobjpos04 (1.62.54); FILE MERGED
2004/07/13 01:35:11 od 1.62.54.8: RESYNC: (1.62-1.65); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:38 od 1.62.54.7: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:23 od 1.62.54.6: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:57 od 1.62.54.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 14:05:12 od 1.62.54.4: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/06/14 13:38:50 od 1.62.54.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 13:14:35 od 1.62.54.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:37 od 1.62.54.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:09:45 +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
Kurt Zenker
05212aa2c7 INTEGRATION: CWS swobjpos04 (1.7.88); FILE MERGED
2004/07/13 01:34:56 od 1.7.88.2: RESYNC: (1.7-1.9); FILE MERGED
2004/06/30 15:04:56 od 1.7.88.1: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004-08-02 13:09:20 +00:00