diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
| commit | 2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch) | |
| tree | 1c918787691e9d69e1f952768a08406931cd34e9 /sw/source/core/unocore/unomap.cxx | |
| parent | a3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff) | |
| parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) | |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/source/core/unocore/unomap.cxx')
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 765b1ae37485..b0ef867efe71 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -1150,6 +1150,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { SW_PROP_NMID(UNO_NAME_GRAPHIC_URL), FN_UNO_REPLACEMENT_GRAPHIC_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NMID(UNO_NAME_COMPONENT),FN_UNO_COMPONENT, CPPU_E2T(CPPUTYPE_REFCOMPONENT), PropertyAttribute::READONLY, 0}, + { SW_PROP_NMID(UNO_NAME_EMBEDDED_OBJECT),FN_EMBEDDED_OBJECT, CPPU_E2T(CPPUTPYE_REFEMBEDDEDOBJECT), PropertyAttribute::READONLY, 0}, // { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), FN_UNO_ALTERNATIVE_TEXT,CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 }, {0,0,0,0,0,0} }; @@ -2499,7 +2500,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s for( ; p->pName; ++p, ++i ) { // set the name - const SwPropNameLen& rPropNm = GetPropName( (USHORT)(long)p->pName ); + const SwPropNameLen& rPropNm = GetPropName( (sal_uInt16)(long)p->pName ); p->pName = rPropNm.pName; p->nNameLen = rPropNm.nNameLen; // get the cppu type from the comphelper |