diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-22 10:17:18 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-22 10:17:18 +0100 |
| commit | 391c3457c667e1f11e2a99097b9f8a9356cd19e8 (patch) | |
| tree | 719372d1185e292b1071fbe54d6d3b8f1215e26b /sw/inc/cmdid.h | |
| parent | 50c061f1fa79790bacb44c8d04745310ab5dda18 (diff) | |
| parent | f1dc19695c083ec5f1356a2c082f2c4feb53aa33 (diff) | |
undoapi: merge after pulling DEV300.m94
Diffstat (limited to 'sw/inc/cmdid.h')
| -rw-r--r-- | sw/inc/cmdid.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index f87a418dd5fe..5e0e3c4eeddb 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -908,7 +908,11 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_UNO_META (FN_EXTRA2 + 112) #define FN_UNO_NESTED_TEXT_CONTENT (FN_EXTRA2 + 113) -#define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 114) +// #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 @@ -1060,7 +1064,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_ENVELOP (FN_ENVELP ) -#define FN_DELETE_NOTE (FN_NOTES+0) + #define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1) #define FN_DELETE_ALL_NOTES (FN_NOTES+2) #define FN_HIDE_NOTE (FN_NOTES+3) |