summaryrefslogtreecommitdiff
path: root/sw/inc/unomap.hxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-11-11 12:15:11 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-11-11 12:15:11 +0000
commit6c5e95803a1dbbd48d71011405205b0a57f9e989 (patch)
tree76e17c5afaa3b48503a7ed18905b5de325065eae /sw/inc/unomap.hxx
parent9cb9e81c587a3499bfdcbc51e65a773949c4ab09 (diff)
INTEGRATION: CWS tl14 (1.51.148); FILE MERGED
2005/09/22 13:18:00 tl 1.51.148.3: RESYNC: (1.51-1.52); FILE MERGED 2005/08/01 11:17:18 tl 1.51.148.2: #106739# properperty set/map for conditional paragraph styles fixed 2005/07/20 14:32:40 tl 1.51.148.1: #106739# new property 'ParaStyleConditions' for conditional paragraph styles added
Diffstat (limited to 'sw/inc/unomap.hxx')
-rw-r--r--sw/inc/unomap.hxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 679a28e2d916..271ff78af35e 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unomap.hxx,v $
*
- * $Revision: 1.53 $
+ * $Revision: 1.54 $
*
- * last change: $Author: rt $ $Date: 2005-11-10 16:40:15 $
+ * last change: $Author: rt $ $Date: 2005-11-11 13:15:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -132,13 +132,17 @@
#define PROPERTY_MAP_MAILMERGE 89
#define PROPERTY_MAP_FLDTYP_DROPDOWN 90
#define PROPERTY_MAP_TEXT_VIEW 91
-#define PROPERTY_MAP_END 92
+#define PROPERTY_MAP_CONDITIONAL_PARA_STYLE 92
+#define PROPERTY_MAP_END 93
#define PROPERTY_SET_CHAR_STYLE 1
#define PROPERTY_SET_PARA_STYLE 2
#define PROPERTY_SET_FRAME_STYLE 3
#define PROPERTY_SET_PAGE_STYLE 4
#define PROPERTY_SET_NUM_STYLE 5
+// basically the same as PROPERTY_SET_PARA_STYLE with additional property
+// that is only available for conditional para styles
+#define PROPERTY_SET_CONDITIONAL_PARA_STYLE 6
//S&E
#define WID_WORDS 0
@@ -339,6 +343,7 @@ class SwUnoPropertyMapProvider
SfxItemPropertySet* pFrameStyleMap;
SfxItemPropertySet* pPageStyleMap;
SfxItemPropertySet* pNumStyleMap;
+ SfxItemPropertySet* pConditionalParaStyleMap;
void Sort(sal_uInt16 nId);
public: