diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:35:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:35:07 +0000 |
| commit | 4a8ecec8917497f40edb76ceb0877729a4add33d (patch) | |
| tree | 705f02c5092705db138ffeee96dc5d348af4aa89 /sw/inc/unoprnms.hxx | |
| parent | 741a4c993fd110bfca8059c714ddf604734fa83c (diff) | |
INTEGRATION: CWS swautomatic01 (1.114.70); FILE MERGED
2006/08/10 16:11:09 fme 1.114.70.3: RESYNC: (1.115-1.116); FILE MERGED
2006/06/30 11:38:30 ama 1.114.70.2: Resolve merge conflicts
2006/06/15 12:03:39 ama 1.114.70.1: #i65476#: Automatic Styles
Diffstat (limited to 'sw/inc/unoprnms.hxx')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 609f29870d10..5bb51c390bf2 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.116 $ + * $Revision: 1.117 $ * - * last change: $Author: obo $ $Date: 2006-07-14 08:29:55 $ + * last change: $Author: rt $ $Date: 2006-12-01 15:35:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -773,11 +773,13 @@ enum SwPropNameIds // <-- /* 0705 */ UNO_NAME_FIELD_CODE, /* 0706 */ UNO_NAME_HAS_VALID_SIGNATURES, +// --> AMA #i65476# automatic styles +/* 0707 */ UNO_NAME_CHAR_AUTO_STYLE_NAME, +/* 0708 */ UNO_NAME_PARA_AUTO_STYLE_NAME, // --> OD 2006-03-21 #b6375613# -/* 0707 */ UNO_NAME_APPLY_WORKAROUND_FOR_B6375613, -// <-- -/* 0708 */ UNO_NAME_LAYOUT_SIZE, -/* 0709 */ SW_PROPNAME_END +/* 0709 */ UNO_NAME_APPLY_WORKAROUND_FOR_B6375613, +/* 0710 */ UNO_NAME_LAYOUT_SIZE, +/* 0711 */ SW_PROPNAME_END }; |