2004/08/13 06:46:42 od 1.54.12.6: remove merge conflict marker
2004/08/12 07:16:13 od 1.54.12.5: RESYNC: (1.54-1.55); FILE MERGED
resolve merge conflicts.
2004/08/10 09:33:05 od 1.54.12.4: #i28749# <SwFmDrawPage::_CreateShape(..)> - correction: do not throw
RuntimeException. Instead assert and don't create shape.
2004/08/06 13:53:02 od 1.54.12.3: #i28749# - adjustments for transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/08/06 04:47:28 od 1.54.12.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:21:28 od 1.54.12.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/12 07:17:01 od 1.98.10.2: RESYNC: (1.98-1.101); FILE MERGED
resolve merge conflict.
2004/08/06 13:53:03 od 1.98.10.1: #i28749# - adjustments for transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/08/12 07:16:42 od 1.163.10.3: RESYNC: (1.163-1.165); FILE MERGED
resolve merge conflict.
2004/08/10 09:35:37 od 1.163.10.2: #i28749# - correct property map entry for <TransformationInHoriL2R>
2004/08/06 13:53:02 od 1.163.10.1: #i28749# - adjustments for transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/08/06 04:47:13 od 1.4.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:54 od 1.4.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/12 07:14:16 od 1.4.60.3: RESYNC: (1.4-1.6); FILE MERGED
2004/08/06 04:47:13 od 1.4.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:54 od 1.4.60.1: #i31698# - adjustments for changed drawing object API in Writer
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/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/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/12 07:04:16 od 1.27.50.2: RESYNC: (1.27-1.29); FILE MERGED
2004/08/06 04:46:36 od 1.27.50.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/12 06:59:41 od 1.94.10.2: RESYNC: (1.94-1.97); FILE MERGED
resolve merge conflict.
2004/08/06 13:49:28 od 1.94.10.1: #i28749# - adjustments to transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/08/06 04:45:26 od 1.10.640.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:20:05 od 1.10.640.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/06 13:49:28 od 1.3.770.2: #i28749# - adjustments to transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/07/29 13:20:05 od 1.3.770.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/12 06:56:24 od 1.52.118.2: RESYNC: (1.52-1.53); FILE MERGED
2004/08/06 13:49:28 od 1.52.118.1: #i28749# - adjustments to transform shape position between OpenOffice.org
file format and OASIS Open Office file format
2004/08/12 06:56:40 od 1.2.60.2: RESYNC: (1.2-1.4); FILE MERGED
resolve merge conflicts.
2004/07/29 13:20:05 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/12 06:56:31 od 1.2.60.4: RESYNC: (1.2-1.3); FILE MERGED
resolve merge conflict.
2004/08/10 09:30:33 od 1.2.60.3: #i28749# class <SwAnchoredDrawObject> - new member <mbNotYetPositioned>
and new method <_ConvertPositioningAttr()> for the conversion
of the OpenOffice.org file format shape positioning attributes.
2004/08/06 04:45:25 od 1.2.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:20:05 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004/08/11 13:56:08 mmaher 1.15.118.2: RESYNC: (1.15-1.17); FILE MERGED
2004/05/07 09:26:48 mmaher 1.15.118.1: #i17371# Workaround for a nested field (pageref in a hyperlink)
2004/08/11 13:55:57 mmaher 1.36.36.2: RESYNC: (1.36-1.41); FILE MERGED
2004/05/07 09:26:47 mmaher 1.36.36.1: #i17371# Workaround for a nested field (pageref in a hyperlink)
2004/08/11 13:54:54 mmaher 1.20.120.2: RESYNC: (1.20-1.21); FILE MERGED
2004/05/07 09:26:46 mmaher 1.20.120.1: #i17371# Workaround for a nested field (pageref in a hyperlink)
2004/08/11 13:54:43 mmaher 1.46.112.2: RESYNC: (1.46-1.49); FILE MERGED
2004/05/05 09:47:41 mmaher 1.46.112.1: #115882# Added escape clause in case there is no graphic