summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-03-10 17:03:01 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-03-10 17:12:27 +0100
commitfc46b5acc4ae354f712f5afcb6a42c2f09e03e96 (patch)
tree02b78a40d0518767496227f152022af2af3c9dae /include/editeng
parent1959431528686bd1b73b73c2664c8c161c2194f5 (diff)
editeng: Add CharInteropGrabBag to editeng.
Change-Id: I91c816499f463febc536d79e4a9fd9804f74df00
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/eeitem.hxx18
-rw-r--r--include/editeng/unotext.hxx4
2 files changed, 12 insertions, 10 deletions
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index 5a2399272732..5d90714d01f2 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -79,17 +79,17 @@
#define EE_CHAR_XMLATTRIBS (EE_ITEMS_START+46)
#define EE_CHAR_OVERLINE (EE_ITEMS_START+47)
#define EE_CHAR_CASEMAP (EE_ITEMS_START+48)
-#define EE_CHAR_END (EE_ITEMS_START+48)
+#define EE_CHAR_GRABBAG (EE_ITEMS_START+49)
+#define EE_CHAR_END (EE_ITEMS_START+49)
+#define EE_FEATURE_START (EE_ITEMS_START+50)
+#define EE_FEATURE_TAB (EE_ITEMS_START+50)
+#define EE_FEATURE_LINEBR (EE_ITEMS_START+51)
+#define EE_FEATURE_NOTCONV (EE_ITEMS_START+52)
+#define EE_FEATURE_FIELD (EE_ITEMS_START+53)
+#define EE_FEATURE_END (EE_ITEMS_START+53)
-#define EE_FEATURE_START (EE_ITEMS_START+49)
-#define EE_FEATURE_TAB (EE_ITEMS_START+49)
-#define EE_FEATURE_LINEBR (EE_ITEMS_START+50)
-#define EE_FEATURE_NOTCONV (EE_ITEMS_START+51)
-#define EE_FEATURE_FIELD (EE_ITEMS_START+52)
-#define EE_FEATURE_END (EE_ITEMS_START+52)
-
-#define EE_ITEMS_END (EE_ITEMS_START+52)
+#define EE_ITEMS_END (EE_ITEMS_START+53)
#define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 )
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 5c1f11c5142d..b8c758c8d2f7 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -125,7 +125,9 @@ class SvxItemPropertySet;
{ OUString(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
{ OUString(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \
{ OUString(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
- { OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }
+ { OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }, \
+ { OUString("CharInteropGrabBag"), EE_CHAR_GRABBAG, ::getCppuType((css::uno::Sequence<css::beans::PropertyValue >*)0), 0, 0}
+
#define SVX_UNOEDIT_FONT_PROPERTIES \
{OUString(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, ::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME }