2004/01/19 23:53:23 mba 1.120.10.2: RESYNC: (1.120-1.123); FILE MERGED
2003/11/28 18:03:09 mba 1.120.10.1: #i22972#: FilterOptions moved to svtools; htmloptions moved to svx
2004/01/19 23:51:28 mba 1.59.10.2: RESYNC: (1.59-1.61); FILE MERGED
2003/11/28 18:03:08 mba 1.59.10.1: #i22972#: FilterOptions moved to svtools; htmloptions moved to svx
2004/01/20 00:05:17 mba 1.24.64.2: RESYNC: (1.24-1.25); FILE MERGED
2003/11/28 18:03:07 mba 1.24.64.1: #i22972#: FilterOptions moved to svtools; htmloptions moved to svx
2004/01/20 00:03:38 mba 1.14.276.2: RESYNC: (1.14-1.15); FILE MERGED
2003/11/28 18:03:06 mba 1.14.276.1: #i22972#: FilterOptions moved to svtools; htmloptions moved to svx
2004/01/14 08:07:28 od 1.34.18.3: complete solution of merge conflict
2004/01/13 11:48:22 od 1.34.18.2: RESYNC: (1.34-1.35); FILE MERGED
resolve merge conflicts.
2003/10/02 11:28:13 od 1.34.18.1: #i18732# - *draft* strings and presentation for new option 'FollowTextFlow'
2004/01/21 08:17:47 od 1.12.106.2: RESYNC: (1.12-1.13); FILE MERGED
2003/10/02 11:28:15 od 1.12.106.1: #i18732# - *draft* strings and presentation for new option 'FollowTextFlow'
2003/10/14 10:54:07 od 1.3.146.1: #i18732# <SwSvxUnoDrawPool::getModelPool(..)> - return writer default
pool instead of drawing pool in order get default value of
new option 'FollowTextFlow' load/saved.
2004/01/13 12:18:31 od 1.53.18.4: RESYNC: (1.53-1.54); FILE MERGED
2003/11/19 17:20:18 od 1.53.18.3: #i18732# - adjust german string for checkbox 'FollowTextFlow'
2003/11/18 11:18:35 od 1.53.18.2: #i18732# - adjustment german string for option 'FollowTextFlow'
2003/10/02 11:18:36 od 1.53.18.1: #i18732# - add *draft* strings for new checkbox 'FollowTextFlow'
2004/01/13 12:18:17 od 1.36.146.3: RESYNC: (1.36-1.38); FILE MERGED
resolve merge conflicts.
2003/11/06 11:39:06 od 1.36.146.2: #i18732# - enable/disable of check box for 'Follow text flow'
2003/10/02 11:16:23 od 1.36.146.1: #i18732# class <SwFrmPage> - add handling for new checkbox 'FollowTextFlow'
2003/10/02 11:21:29 od 1.8.146.1: #i17567#, #i18732# <SwFlyFrmAttrMgr::ValidateMetrics(..)
- consider negative positions and new option 'FollowTextFlow'
2004/01/13 12:40:51 od 1.40.54.2: RESYNC: (1.40-1.41); FILE MERGED
2003/10/14 10:51:39 od 1.40.54.1: #i18732# <SwDocShell::InitNew(..)> - change default value of new option
'FollowTextFlow' to FALSE for new documents.
2004/01/21 08:28:13 od 1.117.2.5: RESYNC: (1.122-1.123); FILE MERGED
2004/01/13 12:50:08 od 1.117.2.4: RESYNC: (1.120-1.122); FILE MERGED
2003/11/18 15:57:53 od 1.117.2.3: RESYNC: (1.118-1.120); FILE MERGED
2003/10/15 12:43:06 od 1.117.2.2: RESYNC: (1.117-1.118); FILE MERGED
resolved conflicts.
2003/10/14 15:34:08 od 1.117.2.1: #i18732# <SwWW8ImplReader::ImportDop()> - set default value of new
option 'FollowTextFlow' to FALSE for imported MS Word documents.
2004/01/21 08:23:20 od 1.105.2.9: RESYNC: (1.109-1.110); FILE MERGED
resolve merge conflict.
2004/01/13 12:49:13 od 1.105.2.8: RESYNC: (1.107-1.109); FILE MERGED
resolve merge conflicts.
2003/11/18 15:57:34 od 1.105.2.7: RESYNC: (1.106-1.107); FILE MERGED
2003/11/18 11:05:49 od 1.105.2.6: #i18732# - correction is setting new option 'FollowTextFlow'
2003/10/29 10:43:50 cmc 1.105.2.5: #i18732# the aligned to line is positive in word and negative in writer
2003/10/29 10:14:46 cmc 1.105.2.4: #i18732# we might have a bit more success with the new anchoring options if we actually set the vertical alignment after painstakingly calculating it :-)
2003/10/27 12:02:41 od 1.105.2.3: #i18732# - complete resolving conflicts on 'cwsresync'
2003/10/15 12:42:47 od 1.105.2.2: RESYNC: (1.105-1.106); FILE MERGED
resolved conficts.
2003/10/14 15:42:12 od 1.105.2.1: #i18732# - adjustments to consider new option 'FollowTextFlow' and the
alignments to page areas.
