diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:32:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:32:21 +0000 |
| commit | bf44b1d91e41d68ec60f4e5b5ac25b3cf5383807 (patch) | |
| tree | 474517c3b1318f7300d810678d000e9c611b7d75 /sw/inc/hintids.hxx | |
| parent | c991a3b0d91b205055323a6f3e177cdb23e849f7 (diff) | |
INTEGRATION: CWS swautomatic01 (1.30.326); FILE MERGED
2006/08/18 09:01:29 fme 1.30.326.6: #i65476# Automatic paragraph styles
2006/08/10 09:12:27 fme 1.30.326.5: #i65476# Automatic paragraph styles
2006/07/07 19:57:11 fme 1.30.326.4: #i65476# Automatic styles
2006/06/15 11:53:59 ama 1.30.326.3: #i65476#: Automatic Styles
2006/06/07 14:49:36 fme 1.30.326.2: #i64576# Automatic styles
2006/05/17 13:37:31 ama 1.30.326.1: #i64576# Automatic styles
Diffstat (limited to 'sw/inc/hintids.hxx')
| -rw-r--r-- | sw/inc/hintids.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index ce29d09315f7..47955a3e753b 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -4,9 +4,9 @@ * * $RCSfile: hintids.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:57:15 $ + * last change: $Author: rt $ $Date: 2006-12-01 15:32:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,8 +119,8 @@ RES_TXTATR_BEGIN = RES_CHRATR_END, // merkt sich die Ids immer als Offset zum Start der Gruppe!!! // Aus dem RES_TXTATR_NOLINEBREAK ist jetzt RES_TXTATR_INETFMT geworden. RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN , - RES_TXTATR_INETFMT = RES_TXTATR_WITHEND_BEGIN, // 38 - RES_TXTATR_DUMMY4, // 39 + RES_TXTATR_AUTOFMT = RES_TXTATR_WITHEND_BEGIN, // 38 + RES_TXTATR_INETFMT, // 39 RES_TXTATR_REFMARK, // 40 RES_TXTATR_TOXMARK, // 41 RES_TXTATR_CHARFMT, // 42 @@ -216,9 +216,9 @@ RES_FRMATR_BEGIN = RES_PARATR_END, // <-- collapsing // OD 2004-05-04 #i28701# - use dummy1 for new item RES_WRAP_INFLUENCE_ON_OBJPOS, // 112 - RES_FRMATR_DUMMY3, // 113 - RES_FRMATR_DUMMY4, // 114 - RES_FRMATR_DUMMY5, // 115 + RES_AUTO_STYLE, // 113 + RES_FRMATR_STYLE_NAME, // 114 + RES_FRMATR_CONDITIONAL_STYLE_NAME, // 115 RES_FRMATR_END }; |