summaryrefslogtreecommitdiff
path: root/sw/inc/cmdid.h
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-02-11 15:41:40 +0100
committerMichael Stahl <mst@openoffice.org>2011-02-11 15:41:40 +0100
commit2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch)
tree1c918787691e9d69e1f952768a08406931cd34e9 /sw/inc/cmdid.h
parenta3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff)
parentc50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff)
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/inc/cmdid.h')
-rw-r--r--sw/inc/cmdid.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index ac4222ab1ce9..c07652eed352 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -911,6 +911,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
// #i972: bool items to be passed to SwFrmPage for evaluation
#define FN_OLE_IS_MATH (FN_EXTRA2 + 114)
#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115)
+
+#define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116)
+
/*--------------------------------------------------------------------
Bereich: Hilfe
--------------------------------------------------------------------*/
@@ -1167,7 +1170,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* Fuer ShadowCursor Optionen */
-#define FN_PARAM_ACT_NUMLEVEL (FN_PARAM2+9) /* BYTE-Item mit aktuellen NumLevel */
+#define FN_PARAM_ACT_NUMLEVEL (FN_PARAM2+9) /* sal_uInt8-Item mit aktuellen NumLevel */
#define FN_PARAM_9 (FN_PARAM2+10)
#define FN_PARAM_10 (FN_PARAM2+11)