diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 12:34:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 12:34:39 +0000 |
| commit | f8e9144bd9f0ea77d8eb05f4b8f4c07d61e1a8f1 (patch) | |
| tree | 65d8b7faac279ab158cbf9c7b6e27ecc145530b1 /sw/inc/unoprnms.hxx | |
| parent | c83c4693cc872541a36924ed6348274c19e5245f (diff) | |
INTEGRATION: CWS tl14 (1.107.148); FILE MERGED
2005/10/26 12:48:01 tl 1.107.148.4: #106739# double entry of 'SW_PROPNAME_END' fixed
2005/10/25 13:35:24 tl 1.107.148.3: RESYNC: (1.108-1.109); FILE MERGED
2005/09/22 13:19:30 tl 1.107.148.2: RESYNC: (1.107-1.108); FILE MERGED
2005/07/20 14:32:40 tl 1.107.148.1: #106739# new property 'ParaStyleConditions' for conditional paragraph styles added
Diffstat (limited to 'sw/inc/unoprnms.hxx')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index d99371cc40ba..170f8a59c1e4 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.110 $ + * $Revision: 1.111 $ * - * last change: $Author: rt $ $Date: 2005-11-10 16:40:30 $ + * last change: $Author: rt $ $Date: 2005-11-11 13:34:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -767,7 +767,8 @@ enum SwPropNameIds /* 0700 */ UNO_NAME_IS_FIELD_USED, /* 0701 */ UNO_NAME_IS_FIELD_DISPLAYED, /* 0702 */ UNO_NAME_BUILDID, -/* 0703 */ SW_PROPNAME_END +/* 0703 */ UNO_NAME_PARA_STYLE_CONDITIONS, +/* 0704 */ SW_PROPNAME_END }; |