diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-11-25 18:52:24 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-11-29 13:27:44 +0100 |
| commit | 1c58ec8e3d1f9fe282d66a5be6671cd674766ff6 (patch) | |
| tree | 1a852314db56f1a3b719913e835c9e5f567c8c0b /sw | |
| parent | a4f73a0ba4e8cd42c0f895d7418bbccff951af3c (diff) | |
fix unoprms content mismatch (gee, it even had a FIXME comment)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoprnms.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 3a92a6f5b8b5..8df75ee59bfb 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -799,16 +799,16 @@ enum SwPropNameIds /* 0736 */ UNO_NAME_OUTLINE_LEVEL, /* 0737 */ UNO_NAME_DESCRIPTION, -/* 0740 */ UNO_NAME_EMBEDDED_OBJECT, - -// FIXME: these number comments cannot be right post merge - fix them up ... /* 0738 */ UNO_NAME_META, /* 0739 */ UNO_NAME_IS_TEMPLATE, /* 0740 */ UNO_NAME_VBA_DOCOBJ, /* 0741 */ UNO_NAME_NESTED_TEXT_CONTENT, /* 0742 */ UNO_NAME_SEPARATOR_LINE_STYLE, /* 0743 */ UNO_NAME_FOOTNOTE_LINE_STYLE, -/* 0744 */ SW_PROPNAME_END +/* 0744 */ UNO_NAME_EMBEDDED_OBJECT, +/* 0745 */ SW_PROPNAME_END + +// new items in this array must match SwPropNameTab aPropNameTab }; struct SwPropNameLen diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx index e67f8c338cb4..28e9d48c31fd 100644 --- a/sw/source/core/unocore/unoprnms.cxx +++ b/sw/source/core/unocore/unoprnms.cxx @@ -775,14 +775,14 @@ const SwPropNameTab aPropNameTab = { /* 0736 UNO_NAME_OUTLINE_LEVEL */ {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel /* 0737 UNO_NAME_DESCRIPTION */ {MAP_CHAR_LEN("Description")}, /* 0738 UNO_NAME_META */ {MAP_CHAR_LEN("InContentMetadata")}, -// FIXME: these numbers are not correct post merge ... /* 0739 UNO_NAME_IS_TEMPLATE */ {MAP_CHAR_LEN("IsTemplate")}, -/* 0740 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")}, /* 0740 UNO_NAME_VBA_DOCOBJ */ {MAP_CHAR_LEN("ThisVBADocObj")}, - /* 0741 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")}, /* 0742 UNO_NAME_SEPARATOR_LINE_STYLE */ {MAP_CHAR_LEN("SeparatorLineStyle")}, /* 0743 UNO_NAME_FOOTNOTE_LINE_STYLE */ {MAP_CHAR_LEN("FootnoteLineStyle")}, +/* 0744 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")}, + +// new items in this array must match enum SwPropNameIds }; const SwPropNameLen& SwGetPropName( sal_uInt16 nId ) |